diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:45:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:45:16 -0600 |
| commit | f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7 (patch) | |
| tree | b312fd7d5b7a34b88941b2fc50661431637b78b4 /kmahjongg | |
| parent | 23a5c62758c4898e3afc1b8bb4c3ae78f4b526ac (diff) | |
| download | tdegames-f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7.tar.gz tdegames-f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmahjongg')
| -rw-r--r-- | kmahjongg/Editor.cpp | 2 | ||||
| -rw-r--r-- | kmahjongg/HighScore.cpp | 2 | ||||
| -rw-r--r-- | kmahjongg/main.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kmahjongg/Editor.cpp b/kmahjongg/Editor.cpp index b1da62b0..c6ab4b9b 100644 --- a/kmahjongg/Editor.cpp +++ b/kmahjongg/Editor.cpp @@ -105,7 +105,7 @@ Editor::~Editor() void Editor::setupToolbar() { - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); topToolbar = new KToolBar( this, "editToolBar" ); KToolBarRadioGroup *radio = new KToolBarRadioGroup(topToolbar); diff --git a/kmahjongg/HighScore.cpp b/kmahjongg/HighScore.cpp index 637fdf25..fab8d8f2 100644 --- a/kmahjongg/HighScore.cpp +++ b/kmahjongg/HighScore.cpp @@ -127,7 +127,7 @@ HighScore::HighScore resetBtn->setAutoRepeat( false ); resetBtn->setAutoResize( false ); - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); resetBtn->setPixmap(loader->loadIcon("editdelete", KIcon::Toolbar)); diff --git a/kmahjongg/main.cpp b/kmahjongg/main.cpp index ca432466..7a65959f 100644 --- a/kmahjongg/main.cpp +++ b/kmahjongg/main.cpp @@ -23,7 +23,7 @@ int main( int argc, char** argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication a; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); KImageIO::registerFormats(); if (a.isRestored()) |