diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 19:59:19 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 19:59:19 -0600 |
| commit | 309f69628bc95098c4e5bfe0516b1941810c31b8 (patch) | |
| tree | cc93f3c8f246d9003c991b6d7abdca5b95552a34 | |
| parent | db098d691587150843f58a9eac31d752c2b40fb9 (diff) | |
| download | tde-systemsettings-309f69628bc95098c4e5bfe0516b1941810c31b8.tar.gz tde-systemsettings-309f69628bc95098c4e5bfe0516b1941810c31b8.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
| -rw-r--r-- | systemsettings/main.cpp | 4 | ||||
| -rw-r--r-- | systemsettings/mainwindow.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/systemsettings/main.cpp b/systemsettings/main.cpp index 77b18df..41576f2 100644 --- a/systemsettings/main.cpp +++ b/systemsettings/main.cpp @@ -38,9 +38,9 @@ int main( int argc, char *argv[] ) { KLocale::setMainCatalogue("systemsettings"); // About data - KAboutData aboutData("systemsettings", I18N_NOOP("System Settings"), + TDEAboutData aboutData("systemsettings", I18N_NOOP("System Settings"), SYSTEM_SETTINGS_VERSION, I18N_NOOP("System Settings"), - KAboutData::License_LGPL, "(c) 2005, Benjamin C. Meyer", 0, 0); + TDEAboutData::License_LGPL, "(c) 2005, Benjamin C. Meyer", 0, 0); aboutData.addAuthor("Benjamin C. Meyer", I18N_NOOP("Author & Maintainer"), TDECmdLineArgs::init(argc, argv, &aboutData); diff --git a/systemsettings/mainwindow.h b/systemsettings/mainwindow.h index 1328ca6..37a81f8 100644 --- a/systemsettings/mainwindow.h +++ b/systemsettings/mainwindow.h @@ -105,7 +105,7 @@ private: * against a module with no about data * we construct one for him **/ - KAboutData *dummyAbout; + TDEAboutData *dummyAbout; }; #endif |