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 /kpat | |
parent | 23a5c62758c4898e3afc1b8bb4c3ae78f4b526ac (diff) | |
download | tdegames-f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7.tar.gz tdegames-f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kpat')
-rw-r--r-- | kpat/cardmaps.cpp | 2 | ||||
-rw-r--r-- | kpat/main.cpp | 2 | ||||
-rw-r--r-- | kpat/pwidget.cpp | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/kpat/cardmaps.cpp b/kpat/cardmaps.cpp index a7461daa..9b50c356 100644 --- a/kpat/cardmaps.cpp +++ b/kpat/cardmaps.cpp @@ -104,7 +104,7 @@ bool cardMap::setCardDir( const TQString &dir) if( animate ) { t1 = TQTime::currentTime(); w = new TQWidget( 0, "", TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_Tool ); - TQRect dg = KGlobalSettings::splashScreenDesktopGeometry(); + TQRect dg = TDEGlobalSettings::splashScreenDesktopGeometry(); w->setBackgroundColor( TQt::darkGreen ); w->setGeometry( dg.left() + ( dg.width() - greeting_width ) / 2, dg.top() + ( dg.height() - 180 ) / 2, greeting_width, 180); w->show(); diff --git a/kpat/main.cpp b/kpat/main.cpp index 69dbe391..caee083b 100644 --- a/kpat/main.cpp +++ b/kpat/main.cpp @@ -58,7 +58,7 @@ int main( int argc, char **argv ) TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); TDEApplication a; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); if (a.isRestored()) RESTORE(pWidget) diff --git a/kpat/pwidget.cpp b/kpat/pwidget.cpp index 4901d75f..288ebc6a 100644 --- a/kpat/pwidget.cpp +++ b/kpat/pwidget.cpp @@ -70,7 +70,7 @@ pWidget::pWidget() actionCollection(), "open"); recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openGame(const KURL&)), actionCollection(), "open_recent"); - recent->loadEntries(KGlobal::config()); + recent->loadEntries(TDEGlobal::config()); (void)KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveGame()), actionCollection(), "save"); (void)new KAction(i18n("&Choose Game..."), 0, TQT_TQOBJECT(this), TQT_SLOT(chooseGame()), @@ -102,14 +102,14 @@ pWidget::pWidget() } games->setItems(list); - KGlobal::dirs()->addResourceType("wallpaper", KStandardDirs::kde_default("data") + "kpat/backgrounds/"); - KGlobal::dirs()->addResourceType("wallpaper", KStandardDirs::kde_default("data") + "ksnake/backgrounds/"); + TDEGlobal::dirs()->addResourceType("wallpaper", KStandardDirs::kde_default("data") + "kpat/backgrounds/"); + TDEGlobal::dirs()->addResourceType("wallpaper", KStandardDirs::kde_default("data") + "ksnake/backgrounds/"); wallpapers = new KSelectAction(i18n("&Change Background"), 0, TQT_TQOBJECT(this), TQT_SLOT(changeWallpaper()), actionCollection(), "wallpaper"); list.clear(); wallpaperlist.clear(); - TQStringList wallpaperlist2 = KGlobal::dirs()->findAllResources("wallpaper", TQString(), + TQStringList wallpaperlist2 = TDEGlobal::dirs()->findAllResources("wallpaper", TQString(), false, true, list); TQStringList list2; for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { @@ -470,7 +470,7 @@ void pWidget::gameLost() KConfig *config = 0; TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); - config = KGlobal::config(); + config = TDEGlobal::config(); KConfigGroupSaver saver(config, TQString::fromLatin1("Notification Messages")); TQString dontAsk = config->readEntry(dontAskAgainName).lower(); @@ -524,7 +524,7 @@ void pWidget::openGame(const KURL &url) setGameCaption(); KIO::NetAccess::removeTempFile( tmpFile ); recent->addURL(url); - recent->saveEntries(KGlobal::config()); + recent->saveEntries(TDEGlobal::config()); } } @@ -545,7 +545,7 @@ void pWidget::saveGame() file.close(); KIO::NetAccess::upload(file.name(), url, this); recent->addURL(url); - recent->saveEntries(KGlobal::config()); + recent->saveEntries(TDEGlobal::config()); } void pWidget::showStats() |