From 949de8193689ca683656ae666fda3e89f115567e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 31 Jan 2013 13:27:40 -0600 Subject: [PATCH] Rename KStandard for enhanced compatibility with KDE4 --- khangman/khangman/khangman.cpp | 2 +- khangman/khangman/khnewstuff.cpp | 4 ++-- kiten/asyndeta.cpp | 2 +- kiten/deinf.cpp | 2 +- kiten/dict.cpp | 2 +- kiten/kromajiedit.cpp | 2 +- kiten/rad.cpp | 2 +- kiten/widgets.cpp | 2 +- klettres/klettres/klnewstuff.cpp | 4 ++-- kmplot/kmplot/kmplot.cpp | 2 +- kstars/kstars/ksnewstuff.cpp | 2 +- kstars/kstars/kstarsactions.cpp | 2 +- kstars/kstars/kstarsdata.cpp | 2 +- kstars/kstars/kstarsdata.h | 4 ++-- ktouch/src/ktouch.cpp | 2 +- kverbos/kverbos/kfeedercontrol.cpp | 2 +- kvoctrain/kvoctrain/kvtnewstuff.cpp | 4 ++-- kwordquiz/src/kwordquiz.cpp | 2 +- kwordquiz/src/kwqnewstuff.cpp | 4 ++-- 19 files changed, 24 insertions(+), 24 deletions(-) diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp index 4cc68c3b..4b8075a6 100644 --- a/khangman/khangman/khangman.cpp +++ b/khangman/khangman/khangman.cpp @@ -284,7 +284,7 @@ void KHangMan::loadLevels() { //build the Level combobox menu dynamically depending of the data for each language levels.clear();//initialize TQStringList levels - KStandardDirs *dirs = TDEGlobal::dirs(); + TDEStandardDirs *dirs = TDEGlobal::dirs(); TQStringList mfiles = dirs->findAllResources("data","khangman/data/" + Prefs::selectedLanguage() + "/*.kvtml"); bool levelBool = false; if (!mfiles.isEmpty()) diff --git a/khangman/khangman/khnewstuff.cpp b/khangman/khangman/khnewstuff.cpp index b4eaa512..37874973 100644 --- a/khangman/khangman/khnewstuff.cpp +++ b/khangman/khangman/khnewstuff.cpp @@ -46,9 +46,9 @@ bool KHNewStuff::install( const TQString &fileName ) if ( !archive.open( IO_ReadOnly ) ) return false; const KArchiveDirectory *archiveDir = archive.directory(); - KStandardDirs myStdDir; + TDEStandardDirs myStdDir; const TQString destDir =myStdDir.saveLocation("data", kapp->instanceName() + "/data/", true); - KStandardDirs::makeDir( destDir ); + TDEStandardDirs::makeDir( destDir ); archiveDir->copyTo(destDir); archive.close(); //look for languages dirs installed diff --git a/kiten/asyndeta.cpp b/kiten/asyndeta.cpp index 277a537e..07b57c70 100644 --- a/kiten/asyndeta.cpp +++ b/kiten/asyndeta.cpp @@ -59,7 +59,7 @@ Dict::Index *Asyndeta::retrieveIndex() void Asyndeta::readKitenConfiguration() { - KStandardDirs *dirs = TDEGlobal::dirs(); + TDEStandardDirs *dirs = TDEGlobal::dirs(); TDEConfig config(dirs->findResource("config", "kitenrc")); TQString globaledict = dirs->findResource("data", "kiten/edict"); diff --git a/kiten/deinf.cpp b/kiten/deinf.cpp index e92fcd1d..a7a19033 100644 --- a/kiten/deinf.cpp +++ b/kiten/deinf.cpp @@ -37,7 +37,7 @@ void Deinf::Index::load() if (loaded) return; - KStandardDirs *dirs = TDEGlobal::dirs(); + TDEStandardDirs *dirs = TDEGlobal::dirs(); TQString vconj = dirs->findResource("data", "kiten/vconj"); if (vconj.isNull()) { diff --git a/kiten/dict.cpp b/kiten/dict.cpp index 22aace41..cab509b4 100644 --- a/kiten/dict.cpp +++ b/kiten/dict.cpp @@ -105,7 +105,7 @@ File::File(TQString path, TQString n) //kdDebug() << "creating " << indexFile.name() << endl; // find the index generator executable TDEProcess proc; - proc << KStandardDirs::findExe("kitengen") << path << indexFile.name(); + proc << TDEStandardDirs::findExe("kitengen") << path << indexFile.name(); // TODO: put up a status dialog and event loop instead of blocking proc.start(TDEProcess::Block, TDEProcess::NoCommunication); } diff --git a/kiten/kromajiedit.cpp b/kiten/kromajiedit.cpp index 46167376..59dc49c2 100644 --- a/kiten/kromajiedit.cpp +++ b/kiten/kromajiedit.cpp @@ -33,7 +33,7 @@ KRomajiEdit::KRomajiEdit(TQWidget *parent, const char *name) { kana = "unset"; - KStandardDirs *dirs = TDEGlobal::dirs(); + TDEStandardDirs *dirs = TDEGlobal::dirs(); TQString romkana = dirs->findResource("data", "kiten/romkana.cnv"); if (romkana.isNull()) { diff --git a/kiten/rad.cpp b/kiten/rad.cpp index 8c56fadc..54fa4025 100644 --- a/kiten/rad.cpp +++ b/kiten/rad.cpp @@ -51,7 +51,7 @@ void Rad::load() if (loaded) return; - KStandardDirs *dirs = TDEGlobal::dirs(); + TDEStandardDirs *dirs = TDEGlobal::dirs(); TQString radtdefile = dirs->findResource("data", "kiten/radtdefile"); if (radtdefile.isNull()) { diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp index 05cde4f5..f7fec883 100644 --- a/kiten/widgets.cpp +++ b/kiten/widgets.cpp @@ -404,7 +404,7 @@ void eEdit::save() // find the index generator executable TDEProcess proc; - proc << KStandardDirs::findExe("kitengen") << filename << TDEGlobal::dirs()->saveLocation("data", "kiten/xjdx/", true) + TQFileInfo(filename).baseName() + ".xjdx"; + proc << TDEStandardDirs::findExe("kitengen") << filename << TDEGlobal::dirs()->saveLocation("data", "kiten/xjdx/", true) + TQFileInfo(filename).baseName() + ".xjdx"; // TODO: put up a status dialog and event loop instead of blocking proc.start(TDEProcess::Block, TDEProcess::NoCommunication); diff --git a/klettres/klettres/klnewstuff.cpp b/klettres/klettres/klnewstuff.cpp index ed6061ba..18bca5fd 100644 --- a/klettres/klettres/klnewstuff.cpp +++ b/klettres/klettres/klnewstuff.cpp @@ -39,9 +39,9 @@ bool KLNewStuff::install( const TQString &fileName ) if ( !archive.open( IO_ReadOnly ) ) return false; const KArchiveDirectory *archiveDir = archive.directory(); - KStandardDirs myStdDir; + TDEStandardDirs myStdDir; const TQString destDir =myStdDir.saveLocation("data", kapp->instanceName() + "/", true); - KStandardDirs::makeDir( destDir ); + TDEStandardDirs::makeDir( destDir ); archiveDir->copyTo(destDir); archive.close(); //look for languages dirs installed diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp index deffa8df..07cd3042 100644 --- a/kmplot/kmplot/kmplot.cpp +++ b/kmplot/kmplot/kmplot.cpp @@ -249,7 +249,7 @@ void KmPlot::fileOpen(const KURL &url) // says that it should open a new window if the document is _not_ // in its initial state. This is what we do here.. if ( m_part->url().isEmpty() && !isModified() ) - load( KStandardDirs::realFilePath(url.url())); // we open the file in this window... + load( TDEStandardDirs::realFilePath(url.url())); // we open the file in this window... else openFileInNewWindow(url); // we open the file in a new window... } diff --git a/kstars/kstars/ksnewstuff.cpp b/kstars/kstars/ksnewstuff.cpp index 3332b58c..695ce191 100644 --- a/kstars/kstars/ksnewstuff.cpp +++ b/kstars/kstars/ksnewstuff.cpp @@ -55,7 +55,7 @@ bool KSNewStuff::install( const TQString &fileName ) const KArchiveDirectory *archiveDir = archive.directory(); const TQString destDir = TDEGlobal::dirs()->saveLocation("data", kapp->instanceName(), true); - KStandardDirs::makeDir( destDir ); + TDEStandardDirs::makeDir( destDir ); //monitor destDir for changes; inform updateData when files are created. connect( kdw, TQT_SIGNAL( dirty( const TQString & ) ), this, TQT_SLOT( updateData( const TQString & ) ) ); diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp index 05309f25..aa403e9b 100644 --- a/kstars/kstars/kstarsactions.cpp +++ b/kstars/kstars/kstarsactions.cpp @@ -345,7 +345,7 @@ void KStars::slotGeoLocator() { } void KStars::slotViewOps() { - KStandardDirs stdDirs; + TDEStandardDirs stdDirs; //An instance of your dialog could be already created and could be cached, //in which case you want to display the cached dialog instead of creating diff --git a/kstars/kstars/kstarsdata.cpp b/kstars/kstars/kstarsdata.cpp index 5bd888e7..93a2c0f4 100644 --- a/kstars/kstars/kstarsdata.cpp +++ b/kstars/kstars/kstarsdata.cpp @@ -70,7 +70,7 @@ KStarsData::KStarsData() : stdDirs(0), locale(0), objects++; //standard directories and locale objects - stdDirs = new KStandardDirs(); + stdDirs = new TDEStandardDirs(); locale = new KLocale( "kstars" ); //Check to see if config file already exists. If not, set diff --git a/kstars/kstars/kstarsdata.h b/kstars/kstars/kstarsdata.h index e529e0f0..22f9b273 100644 --- a/kstars/kstars/kstarsdata.h +++ b/kstars/kstars/kstarsdata.h @@ -53,7 +53,7 @@ class TQDataPump; class TQFile; class TQTimer; -class KStandardDirs; +class TDEStandardDirs; class dms; class SkyMap; @@ -735,7 +735,7 @@ private: bool TimeRunsForward, temporaryTrail, snapToFocus; TQString cnameFile; - KStandardDirs *stdDirs; + TDEStandardDirs *stdDirs; KLocale *locale; dms *LST, *HourAngle; diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp index 4a3fa700..4e9ba2da 100644 --- a/ktouch/src/ktouch.cpp +++ b/ktouch/src/ktouch.cpp @@ -747,7 +747,7 @@ void KTouch::updateFontFromLecture() { // This function populates the file lists with the installed training, keyboard and // examination files. void KTouch::updateFileLists() { - KStandardDirs *dirs = TDEGlobal::dirs(); + TDEStandardDirs *dirs = TDEGlobal::dirs(); // first search for all installed keyboard files // TODO : search in i18n() directories diff --git a/kverbos/kverbos/kfeedercontrol.cpp b/kverbos/kverbos/kfeedercontrol.cpp index 9a5ad2f1..749debe5 100644 --- a/kverbos/kverbos/kfeedercontrol.cpp +++ b/kverbos/kverbos/kfeedercontrol.cpp @@ -22,7 +22,7 @@ KFeederControl::KFeederControl(int ID, bool splash, bool automatic) { - TQString f = KStandardDirs::findExe("kfeeder"); + TQString f = TDEStandardDirs::findExe("kfeeder"); TQString s; s.setNum(ID); childFeeder << f; diff --git a/kvoctrain/kvoctrain/kvtnewstuff.cpp b/kvoctrain/kvoctrain/kvtnewstuff.cpp index 792ca63c..83bdd14a 100644 --- a/kvoctrain/kvoctrain/kvtnewstuff.cpp +++ b/kvoctrain/kvoctrain/kvtnewstuff.cpp @@ -57,7 +57,7 @@ TQString KVTNewStuff::destinationPath(KNS::Entry * entry) else { file = TQDir::home().path() + "/" + path + "/"; - KStandardDirs::makeDir(file); //ensure the directory exists + TDEStandardDirs::makeDir(file); //ensure the directory exists file += fileName; } return file; @@ -71,7 +71,7 @@ TQString KVTNewStuff::downloadDestination(KNS::Entry * entry) { TQString file = destinationPath(entry); - if (KStandardDirs::exists(file)) + if (TDEStandardDirs::exists(file)) { int result = KMessageBox::warningContinueCancel(parentWidget(), i18n("The file '%1' already exists. Do you want to overwrite it?") diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp index fd4abfcb..8dc0c2ef 100644 --- a/kwordquiz/src/kwordquiz.cpp +++ b/kwordquiz/src/kwordquiz.cpp @@ -1084,7 +1084,7 @@ TQString KWordQuizApp::charIcon(const TQChar & c) TQString s = locateLocal("icon", "char" + TQString::number(c.unicode()) + ".png"); ///No need to redraw if it already exists - if (KStandardDirs::exists(s)) + if (TDEStandardDirs::exists(s)) return s; TQRect r(4, 4, 120, 120); diff --git a/kwordquiz/src/kwqnewstuff.cpp b/kwordquiz/src/kwqnewstuff.cpp index 64d620cd..c2af5aae 100644 --- a/kwordquiz/src/kwqnewstuff.cpp +++ b/kwordquiz/src/kwqnewstuff.cpp @@ -61,7 +61,7 @@ TQString KWQNewStuff::destinationPath(KNS::Entry * entry) else { file = TQDir::home().path() + "/" + path + "/"; - KStandardDirs::makeDir(file); //ensure the directory exists + TDEStandardDirs::makeDir(file); //ensure the directory exists file += fileName; } return file; @@ -75,7 +75,7 @@ TQString KWQNewStuff::downloadDestination(KNS::Entry * entry) { TQString file = destinationPath(entry); - if (KStandardDirs::exists(file)) + if (TDEStandardDirs::exists(file)) { int result = KMessageBox::questionYesNo(parentWidget(), i18n("The file '%1' already exists. Do you want to overwrite it?")