diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:58:36 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:58:36 -0600 |
| commit | 1aa54874cfcc571f8f9f4969843a2605593f0317 (patch) | |
| tree | 223f7fbacf68510bb5db402cd9ff67140ea4ffd9 | |
| parent | 3db357dc5a0f44a267e13d21a6b91ad68b055807 (diff) | |
| download | qt4-tqt-theme-engine-1aa54874cfcc571f8f9f4969843a2605593f0317.tar.gz qt4-tqt-theme-engine-1aa54874cfcc571f8f9f4969843a2605593f0317.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
| -rw-r--r-- | plugin/simplestyle.cpp | 4 | ||||
| -rw-r--r-- | plugin/simplestyle.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugin/simplestyle.cpp b/plugin/simplestyle.cpp index dc498be..8c7e9fe 100644 --- a/plugin/simplestyle.cpp +++ b/plugin/simplestyle.cpp @@ -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); diff --git a/plugin/simplestyle.h b/plugin/simplestyle.h index ec09b78..f4c5ac0 100644 --- a/plugin/simplestyle.h +++ b/plugin/simplestyle.h @@ -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; |