Rename KApplication to TDEApplication to avoid conflicts with KDE4

r14.0.x
Timothy Pearson 12 years ago
parent b6d9d4f185
commit 3db357dc5a

@ -149,10 +149,10 @@ Qt4TDEStyle::Qt4TDEStyle() : m_aboutData(NULL), m_tqApplication(NULL), m_tdeAppl
#ifdef INTEGRATE_WITH_TDE
if (!tqApp) {
// Initialize KApplication required data structures
// Initialize TDEApplication required data structures
int argc = 1;
char** argv;
// Supply it with fake data to keep KApplication happy
// Supply it with fake data to keep TDEApplication happy
argv = (char**) malloc(sizeof(char*));
argv[0] = (char*) malloc(sizeof(char) * 19);
strncpy(argv[0], "Qt4TDEStyle", 19);
@ -167,7 +167,7 @@ Qt4TDEStyle::Qt4TDEStyle() : m_aboutData(NULL), m_tqApplication(NULL), m_tdeAppl
// Qt4 can be SO STUPID sometimes...why can't I get the X11 display directly from qApp?!?!??
QWidget myhackedwidget;
m_tdeApplication = new KApplication(myhackedwidget.x11Info().display());
m_tdeApplication = new TDEApplication(myhackedwidget.x11Info().display());
}
// Set the Qt4 icon set to the TDE icon set

@ -46,7 +46,7 @@ class TQToolBox;
class TQToolButton;
class KAboutData;
class KApplication;
class TDEApplication;
class TQPixmapCache;
typedef TQIntCache<TQWidget> TQWidgetCache;
@ -108,7 +108,7 @@ private:
KAboutData* m_aboutData;
TQApplication* m_tqApplication;
KApplication* m_tdeApplication;
TDEApplication* m_tdeApplication;
TQString m_qt4ApplicationName;
TQPixmapCache* m_internalTQt3PixmapCache;

Loading…
Cancel
Save