diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:45:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:45:16 -0600 |
| commit | f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7 (patch) | |
| tree | b312fd7d5b7a34b88941b2fc50661431637b78b4 /atlantik/client | |
| parent | 23a5c62758c4898e3afc1b8bb4c3ae78f4b526ac (diff) | |
| download | tdegames-f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7.tar.gz tdegames-f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'atlantik/client')
| -rw-r--r-- | atlantik/client/atlantik.cpp | 2 | ||||
| -rw-r--r-- | atlantik/client/main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp index 8cd33f2c..fbdba102 100644 --- a/atlantik/client/atlantik.cpp +++ b/atlantik/client/atlantik.cpp @@ -147,7 +147,7 @@ Atlantik::Atlantik () // Mix code and XML into GUI KMainWindow::createGUI(); - applyMainWindowSettings( KGlobal::config(), "AtlantikMainWindow" ); + applyMainWindowSettings( TDEGlobal::config(), "AtlantikMainWindow" ); KMainWindow::statusBar()->insertItem("Atlantik " ATLANTIK_VERSION_STRING, 0); KMainWindow::statusBar()->insertItem(TQString(), 1); connect(statusBar(), TQT_SIGNAL(released(int)), TQT_TQOBJECT(this), TQT_SLOT(statusBarClick(int))); diff --git a/atlantik/client/main.cpp b/atlantik/client/main.cpp index ec677a57..21a3f0ed 100644 --- a/atlantik/client/main.cpp +++ b/atlantik/client/main.cpp @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) TDEApplication::addCmdLineOptions(); TDEApplication kapplication; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); if (kapplication.isRestored()) RESTORE(Atlantik) |