sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sdl include fix

Browse Source
This commit is contained in:
doitux
2007-09-02 11:30:48 +00:00
parent 3677a2b4b4
commit ba586fd751
3 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/mainwindow/mainwindowimpl.cpp
+8 -8
View File
@@ -419,22 +419,22 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
//Schriftart und Schriftgrößen für Widgets festlegen //Schriftart und Schriftgrößen für Widgets festlegen
#ifdef _WIN32 #ifdef _WIN32
tmpFont1.setPixelSize(11); tmpFont1.setPixelSize(11);
textBrowser_Log->setStyleSheet("QTextBrowser { font-family: \"Nimbus Sans L\"; font-size: 11px; font-color: white; background-color: #285200;}"); textBrowser_Log->setStyleSheet("QTextBrowser { font-family: \"Nimbus Sans L\"; font-size: 11px; color: white; background-color: #285200; border-color: #669900;}");
#else #else
tmpFont1.setPixelSize(10); tmpFont1.setPixelSize(10);
textBrowser_Log->setStyleSheet("QTextBrowser { font-family: \"Nimbus Sans L\"; font-size: 10px; font-color: white; background-color: #285200; }"); textBrowser_Log->setStyleSheet("QTextBrowser { font-family: \"Nimbus Sans L\"; font-size: 10px; color: white; background-color: #285200; border-color: #669900; }");
textBrowser_Chat->setStyleSheet("QTextBrowser { font-family: \"Nimbus Sans L\"; font-size: 10px; font-color: white; background-color: #285200; }"); textBrowser_Chat->setStyleSheet("QTextBrowser { font-family: \"Nimbus Sans L\"; font-size: 10px; color: white; background-color: #285200; border-color: #669900; }");
lineEdit_ChatInput->setStyleSheet("QLineEdit { font-family: \"Nimbus Sans L\"; font-size: 10px; font-color: white; background-color: #285200; }"); lineEdit_ChatInput->setStyleSheet("QLineEdit { font-family: \"Nimbus Sans L\"; font-size: 10px; color: white; background-color: #285200; border-color: #669900; }");
#endif #endif
#ifdef __APPLE__ #ifdef __APPLE__
tmpFont1.setPixelSize(11); tmpFont1.setPixelSize(11);
tabWidget_Right->setStyleSheet("QTabWidget { font-family: \"Nimbus Sans L\"; font-size: 11px; font-color: white; background-color: #285200; }"); tabWidget_Right->setStyleSheet("QTabWidget { font-family: \"Nimbus Sans L\"; font-size: 11px; font-color: white; border-color: #669900; }");
tabWidget_Left->setStyleSheet("QTabWidget { font-family: \"Nimbus Sans L\"; font-size: 11px; font-color: white; background-color: #285200; }"); tabWidget_Left->setStyleSheet("QTabWidget { font-family: \"Nimbus Sans L\"; font-size: 11px; font-color: white; border-color: #669900;}");
#else #else
tmpFont1.setPixelSize(10); tmpFont1.setPixelSize(10);
tabWidget_Right->setStyleSheet("QTabWidget { font-family: \"Nimbus Sans L\"; font-size: 10px; font-color: white; background-color: #285200; }"); tabWidget_Right->setStyleSheet("QTabWidget::pane { font-family: \"Nimbus Sans L\"; font-size: 10px; border-color: #669900; }");
tabWidget_Left->setStyleSheet("QTabWidget { font-family: \"Nimbus Sans L\"; font-size: 10px; font-color: white; background-color: #285200; }"); tabWidget_Left->setStyleSheet("QTabWidget::pane { font-family: \"Nimbus Sans L\"; font-size: 10px; border-color: #669900; }");
#endif #endif
src/gui/qt/sound/sdlplayer.cpp
-11
View File
@@ -11,17 +11,6 @@
// //
#include "sdlplayer.h" #include "sdlplayer.h"
// Include SDL here and not in headers to prevent
// conflicts with QT includes.
#if (defined _WIN32) || (defined __APPLE__)
#include <SDL.h>
#include <SDL_mixer.h>
#else
#include <SDL/SDL.h>
#include <SDL/SDL_mixer.h>
#endif
#include <iostream>
using namespace std; using namespace std;
src/gui/qt/sound/sdlplayer.h
+14 -2
View File
@@ -14,11 +14,23 @@
#ifndef SDLPLAYER_H #ifndef SDLPLAYER_H
#define SDLPLAYER_H #define SDLPLAYER_H
#include <string>
#include "configfile.h" #include "configfile.h"
#include "qthelper.h" #include "qthelper.h"
struct Mix_Chunk; // Include SDL here and not in headers to prevent
// conflicts with QT includes.
#if (defined _WIN32) || (defined __APPLE__)
#include <SDL.h>
#include <SDL_mixer.h>
#else
#include <SDL/SDL.h>
#include <SDL/SDL_mixer.h>
#endif
#include <iostream>
#include <string>
// struct Mix_Chunk;
/** /**
@author FThauer FHammer <webmaster@pokerth.net> @author FThauer FHammer <webmaster@pokerth.net>