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 /katomic | |
| parent | 23a5c62758c4898e3afc1b8bb4c3ae78f4b526ac (diff) | |
| download | tdegames-f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7.tar.gz tdegames-f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'katomic')
| -rw-r--r-- | katomic/gamewidget.cpp | 6 | ||||
| -rw-r--r-- | katomic/main.cpp | 2 | ||||
| -rw-r--r-- | katomic/toplevel.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/katomic/gamewidget.cpp b/katomic/gamewidget.cpp index 194ff3f6..c3a7e3f8 100644 --- a/katomic/gamewidget.cpp +++ b/katomic/gamewidget.cpp @@ -171,7 +171,7 @@ GameWidget::GameWidget ( TQWidget *parent, const char* name ) : TQWidget( parent, name ) { level = 1; - nlevels = KGlobal::dirs()->findAllResources("appdata", "levels/level_*", + nlevels = TDEGlobal::dirs()->findAllResources("appdata", "levels/level_*", false, true).count(); TQHBoxLayout *top = new TQHBoxLayout(this, 10); @@ -210,7 +210,7 @@ GameWidget::GameWidget ( TQWidget *parent, const char* name ) slay->addWidget(new TQLabel(i18n("Highscore:"), bg)); - TQFont headerFont = KGlobalSettings::generalFont(); + TQFont headerFont = TDEGlobalSettings::generalFont(); headerFont.setBold(true); hs = new TQLabel (highest, bg); @@ -229,7 +229,7 @@ GameWidget::GameWidget ( TQWidget *parent, const char* name ) updateLevel(1); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Options"); settings.anim_speed = config->readNumEntry("Animation Speed", 1); if (settings.anim_speed < 1 || settings.anim_speed > MAX_SPEED) diff --git a/katomic/main.cpp b/katomic/main.cpp index 2b4d9fd9..d359617e 100644 --- a/katomic/main.cpp +++ b/katomic/main.cpp @@ -54,7 +54,7 @@ int main(int argc, char **argv) TQApplication::setColorSpec(TQApplication::ManyColor); TDEApplication a; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); if ( a.isRestored() ) RESTORE(AtomTopLevel) diff --git a/katomic/toplevel.cpp b/katomic/toplevel.cpp index e2d9e745..56244c3a 100644 --- a/katomic/toplevel.cpp +++ b/katomic/toplevel.cpp @@ -70,12 +70,12 @@ void AtomTopLevel::configopts() void AtomTopLevel::initConfig() { - config = KGlobal::config(); + config = TDEGlobal::config(); } void AtomTopLevel::saveConfig() { - config = KGlobal::config(); + config = TDEGlobal::config(); if (settings.changed) { config->setGroup("Options"); |