diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:50:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:50:05 -0600 |
| commit | 2178da111f72dc574457d5242d120b4d10ea5edd (patch) | |
| tree | 3f1a143f751c624ab24c35d67229121c98c7cefa /amor | |
| parent | f39ce360454f118af0d94b215b83dbd950276ff7 (diff) | |
| download | tdetoys-2178da111f72dc574457d5242d120b4d10ea5edd.tar.gz tdetoys-2178da111f72dc574457d5242d120b4d10ea5edd.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'amor')
| -rw-r--r-- | amor/amor.cpp | 4 | ||||
| -rw-r--r-- | amor/amorbubble.cpp | 4 | ||||
| -rw-r--r-- | amor/amordialog.cpp | 2 | ||||
| -rw-r--r-- | amor/amortips.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/amor/amor.cpp b/amor/amor.cpp index 34358f8..8bb0130 100644 --- a/amor/amor.cpp +++ b/amor/amor.cpp @@ -314,7 +314,7 @@ bool Amor::readConfig() TQStringList files; // Store relative paths into files to avoid storing absolute pathnames. - KGlobal::dirs()->findAllResources("appdata", "*rc", false, false, files); + TDEGlobal::dirs()->findAllResources("appdata", "*rc", false, false, files); int randomTheme = kapp->random() % files.count(); mConfig.mTheme = (TQString)*files.at(randomTheme); } @@ -606,7 +606,7 @@ void Amor::slotMouseClicked(const TQPoint &pos) if (!mMenu) { - KHelpMenu* help = new KHelpMenu(0, KGlobal::instance()->aboutData(), false); + KHelpMenu* help = new KHelpMenu(0, TDEGlobal::instance()->aboutData(), false); KPopupMenu* helpMnu = help->menu(); mMenu = new KPopupMenu(); mMenu->insertTitle("Amor"); // I really don't want this i18n'ed diff --git a/amor/amorbubble.cpp b/amor/amorbubble.cpp index 0af3c90..d5a2fc7 100644 --- a/amor/amorbubble.cpp +++ b/amor/amorbubble.cpp @@ -64,8 +64,8 @@ AmorBubble::AmorBubble() mBrowser->setHScrollBarMode( TQTextBrowser::AlwaysOff ); mBrowser->viewport()->installEventFilter( this ); - mBrowser->mimeSourceFactory()->addFilePath(KGlobal::dirs()->findResourceDir("data", "kdewizard/pics")+"kdewizard/pics/"); - TQStringList icons = KGlobal::dirs()->resourceDirs("icon"); + mBrowser->mimeSourceFactory()->addFilePath(TDEGlobal::dirs()->findResourceDir("data", "kdewizard/pics")+"kdewizard/pics/"); + TQStringList icons = TDEGlobal::dirs()->resourceDirs("icon"); TQStringList::Iterator it; for (it = icons.begin(); it != icons.end(); ++it) mBrowser->mimeSourceFactory()->addFilePath(*it); diff --git a/amor/amordialog.cpp b/amor/amordialog.cpp index 981200b..56f035d 100644 --- a/amor/amordialog.cpp +++ b/amor/amordialog.cpp @@ -115,7 +115,7 @@ void AmorDialog::readThemes() // Non-recursive search for theme files, with the relative paths stored // in files so that absolute paths are not used. - KGlobal::dirs()->findAllResources("appdata", "*rc", false, false, files); + TDEGlobal::dirs()->findAllResources("appdata", "*rc", false, false, files); for (TQStringList::ConstIterator it = files.begin(); it != files.end(); diff --git a/amor/amortips.cpp b/amor/amortips.cpp index 798657e..377de01 100644 --- a/amor/amortips.cpp +++ b/amor/amortips.cpp @@ -37,7 +37,7 @@ // AmorTips::AmorTips() { - KGlobal::locale()->insertCatalogue("ktip"); // For ktip tip translations + TDEGlobal::locale()->insertCatalogue("ktip"); // For ktip tip translations } //--------------------------------------------------------------------------- |