Rename KInstance and KAboutData to avoid conflicts with KDE4

r14.0.x
Timothy Pearson 11 years ago
parent 3db357dc5a
commit 1aa54874cf

@ -159,8 +159,8 @@ Qt4TDEStyle::Qt4TDEStyle() : m_aboutData(NULL), m_tqApplication(NULL), m_tdeAppl
m_qt4ApplicationName = convertQt4ToTQt3String(qApp->applicationName());
m_aboutData = new KAboutData("Qt4TDEStyle", I18N_NOOP(m_qt4ApplicationName.ascii()), "v0.1",
"TDE Qt4 theme engine", KAboutData::License_GPL,
m_aboutData = new TDEAboutData("Qt4TDEStyle", I18N_NOOP(m_qt4ApplicationName.ascii()), "v0.1",
"TDE Qt4 theme engine", TDEAboutData::License_GPL,
"(c) 2012, Timothy Pearson",
"message goes here", 0 /* TODO: Website */, "kb9vqf@pearsoncomputing.net");
TDECmdLineArgs::init(argc, argv, m_aboutData);

@ -45,7 +45,7 @@ class TQMenuBar;
class TQToolBox;
class TQToolButton;
class KAboutData;
class TDEAboutData;
class TDEApplication;
class TQPixmapCache;
@ -106,7 +106,7 @@ private:
mutable const QWidget* m_previousQt4InterfaceWidget;
mutable TQWidget* m_previousTQt3InterfaceWidget;
KAboutData* m_aboutData;
TDEAboutData* m_aboutData;
TQApplication* m_tqApplication;
TDEApplication* m_tdeApplication;
TQString m_qt4ApplicationName;

Loading…
Cancel
Save