From 01c60a267846a8712bca34218ecf7da57566c049 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 31 Jan 2013 13:26:45 -0600 Subject: Rename KStandard for enhanced compatibility with KDE4 --- kcontrol/background/bgdialog.h | 4 ++-- kcontrol/background/bgrender.cpp | 2 +- kcontrol/background/bgrender.h | 4 ++-- kcontrol/background/bgsettings.cpp | 6 +++--- kcontrol/background/bgsettings.h | 8 ++++---- kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp | 2 +- kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp | 2 +- kcontrol/input/xcursor/themepage.cpp | 2 +- kcontrol/kcontrol/modules.cpp | 2 +- kcontrol/kfontinst/lib/Misc.cpp | 2 +- kcontrol/kicker/main.cpp | 8 ++++---- kcontrol/konq/rootopts.cpp | 2 +- kcontrol/krdb/krdb.cpp | 2 +- kcontrol/kthememanager/ktheme.h | 4 ++-- kcontrol/kthememanager/kthememanager.cpp | 2 +- kcontrol/screensaver/scrnsave.cpp | 2 +- kcontrol/style/kcmstyle.cpp | 2 +- 17 files changed, 28 insertions(+), 28 deletions(-) (limited to 'kcontrol') diff --git a/kcontrol/background/bgdialog.h b/kcontrol/background/bgdialog.h index 2a76acd52..08dfe13be 100644 --- a/kcontrol/background/bgdialog.h +++ b/kcontrol/background/bgdialog.h @@ -30,7 +30,7 @@ #include "bgdefaults.h" class BGMonitorArrangement; -class KStandardDirs; +class TDEStandardDirs; class BGDialog : public BGDialog_UI { @@ -84,7 +84,7 @@ protected slots: protected: void getEScreen(); TDEGlobalBackgroundSettings *m_pGlobals; - KStandardDirs *m_pDirs; + TDEStandardDirs *m_pDirs; bool m_multidesktop; bool m_useViewports; int m_curDesk; diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp index 9c207e409..ce0dac119 100644 --- a/kcontrol/background/bgrender.cpp +++ b/kcontrol/background/bgrender.cpp @@ -990,7 +990,7 @@ void KBackgroundRenderer::saveCacheFile() if( m_Image.isNull()) fullWallpaperBlend(); // generate from m_Pixmap TQString f = cacheFileName(); - if( KStandardDirs::exists( f ) || m_Cached ) + if( TDEStandardDirs::exists( f ) || m_Cached ) utime( TQFile::encodeName( f ), NULL ); else { m_Image.save( f, "PNG" ); diff --git a/kcontrol/background/bgrender.h b/kcontrol/background/bgrender.h index b10f4033c..56317013f 100644 --- a/kcontrol/background/bgrender.h +++ b/kcontrol/background/bgrender.h @@ -27,7 +27,7 @@ class TDEConfig; class TDEProcess; class KTempFile; class KShellProcess; -class KStandardDirs; +class TDEStandardDirs; /** * This class renders a desktop background to a TQImage. The operation is @@ -109,7 +109,7 @@ private: TQPixmap m_Pixmap; TQTimer *m_pTimer; - KStandardDirs *m_pDirs; + TDEStandardDirs *m_pDirs; KShellProcess *m_pProc; }; diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp index 7bc17a215..b879d1216 100644 --- a/kcontrol/background/bgsettings.cpp +++ b/kcontrol/background/bgsettings.cpp @@ -182,7 +182,7 @@ int KBackgroundPattern::hash() /* static */ TQStringList KBackgroundPattern::list() { - KStandardDirs *dirs = TDEGlobal::dirs(); + TDEStandardDirs *dirs = TDEGlobal::dirs(); dirs->addResourceType("dtop_pattern", dirs->kde_default("data") + "kdesktop/patterns"); TQStringList lst = dirs->findAllResources("dtop_pattern", "*.desktop", @@ -393,7 +393,7 @@ int KBackgroundProgram::hash() /* static */ TQStringList KBackgroundProgram::list() { - KStandardDirs *dirs = TDEGlobal::dirs(); + TDEStandardDirs *dirs = TDEGlobal::dirs(); dirs->addResourceType("dtop_program", dirs->kde_default("data") + "kdesktop/programs"); TQStringList lst = dirs->findAllResources("dtop_program", "*.desktop", @@ -651,7 +651,7 @@ void KBackgroundSettings::setWallpaperMode(int mode) void KBackgroundSettings::setWallpaperList(TQStringList list) { - KStandardDirs *d = TDEGlobal::dirs(); + TDEStandardDirs *d = TDEGlobal::dirs(); if (m_WallpaperList == list) return; diff --git a/kcontrol/background/bgsettings.h b/kcontrol/background/bgsettings.h index d007f5753..0e16a87e9 100644 --- a/kcontrol/background/bgsettings.h +++ b/kcontrol/background/bgsettings.h @@ -17,7 +17,7 @@ #include template class TQMap; -class KStandardDirs; +class TDEStandardDirs; class KSimpleConfig; class TDEConfig; class TQString; @@ -66,7 +66,7 @@ private: int m_Hash; TQString m_Name, m_Comment; TQString m_Pattern, m_File; - KStandardDirs *m_pDirs; + TDEStandardDirs *m_pDirs; KSimpleConfig *m_pConfig; }; @@ -137,7 +137,7 @@ private: TQString m_Name, m_Command; TQString m_PreviewCommand, m_Comment; TQString m_Executable, m_File; - KStandardDirs *m_pDirs; + TDEStandardDirs *m_pDirs; KSimpleConfig *m_pConfig; }; @@ -283,7 +283,7 @@ private: TQString m_CurrentWallpaperName; TDEConfig *m_pConfig; - KStandardDirs *m_pDirs; + TDEStandardDirs *m_pDirs; bool m_bDeleteConfig; bool m_bEnabled; diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp index 1fc6ad629..c2e3af8fa 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp +++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp @@ -76,7 +76,7 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const if( !(host == last_host && last_time > time( NULL ) - 5 ) ) { - TQString helper = KStandardDirs::findExe(TQString::fromLatin1( "klocaldomainurifilterhelper" )); + TQString helper = TDEStandardDirs::findExe(TQString::fromLatin1( "klocaldomainurifilterhelper" )); if( helper.isEmpty()) return last_result = false; diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp index 57bc2e92f..89310a137 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp +++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp @@ -441,7 +441,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const // line arguments or options that might have been supplied. TQString exe = removeArgs( cmd ); //kdDebug() << k_funcinfo << "findExe with " << exe << endl; - if( data.checkForExecutables() && !KStandardDirs::findExe( exe ).isNull() ) + if( data.checkForExecutables() && !TDEStandardDirs::findExe( exe ).isNull() ) { //kdDebug() << "EXECUTABLE exe=" << exe << endl; setFilteredURI( data, KURL( exe )); diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp index 0aa1224ec..e8a918512 100644 --- a/kcontrol/input/xcursor/themepage.cpp +++ b/kcontrol/input/xcursor/themepage.cpp @@ -298,7 +298,7 @@ bool ThemePage::installThemes( const TQString &file ) return false; const TQString destDir = TQDir::homeDirPath() + "/.icons/"; - KStandardDirs::makeDir( destDir ); // Make sure the directory exists + TDEStandardDirs::makeDir( destDir ); // Make sure the directory exists for ( TQStringList::ConstIterator it = themeDirs.begin(); it != themeDirs.end(); ++it ) { diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp index 4c3ccbbc1..73ed1896e 100644 --- a/kcontrol/kcontrol/modules.cpp +++ b/kcontrol/kcontrol/modules.cpp @@ -186,7 +186,7 @@ void ConfigModule::runAsRoot() } // run the process - TQString tdesu = KStandardDirs::findExe("tdesu"); + TQString tdesu = TDEStandardDirs::findExe("tdesu"); if (!tdesu.isEmpty()) { _rootProcess = new TDEProcess; diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp index 5f39afec8..1a5952ce4 100644 --- a/kcontrol/kfontinst/lib/Misc.cpp +++ b/kcontrol/kfontinst/lib/Misc.cpp @@ -125,7 +125,7 @@ bool createDir(const TQString &dir) // // Clear any umask before dir is created mode_t oldMask=umask(0000); - bool status=KStandardDirs::makeDir(dir, DIR_PERMS); + bool status=TDEStandardDirs::makeDir(dir, DIR_PERMS); // Reset umask ::umask(oldMask); return status; diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp index 035451e46..75f2baa90 100644 --- a/kcontrol/kicker/main.cpp +++ b/kcontrol/kicker/main.cpp @@ -383,14 +383,14 @@ extern "C" KDE_EXPORT TDECModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/) { - TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + + TDEGlobal::dirs()->addResourceType("extensions", TDEStandardDirs::kde_default("data") + "kicker/extensions"); return new PositionConfig(parent, "kcmkicker"); } KDE_EXPORT TDECModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/) { - TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + + TDEGlobal::dirs()->addResourceType("extensions", TDEStandardDirs::kde_default("data") + "kicker/extensions"); return new HidingConfig(parent, "kcmkicker"); } @@ -403,9 +403,9 @@ extern "C" KDE_EXPORT TDECModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/) { KImageIO::registerFormats(); - TDEGlobal::dirs()->addResourceType("tiles", KStandardDirs::kde_default("data") + + TDEGlobal::dirs()->addResourceType("tiles", TDEStandardDirs::kde_default("data") + "kicker/tiles"); - TDEGlobal::dirs()->addResourceType("hb_pics", KStandardDirs::kde_default("data") + + TDEGlobal::dirs()->addResourceType("hb_pics", TDEStandardDirs::kde_default("data") + "kcmkicker/pics"); return new LookAndFeelConfig(parent, "kcmkicker"); } diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp index f2a15fd65..52e8a07cb 100644 --- a/kcontrol/konq/rootopts.cpp +++ b/kcontrol/konq/rootopts.cpp @@ -230,7 +230,7 @@ void DesktopPathConfig::save() TQString path = urDocument->url(); if (!TQDir(path).exists()) { - if (!KStandardDirs::makeDir(path)) + if (!TDEStandardDirs::makeDir(path)) { KMessageBox::sorry(this, TDEIO::buildErrorString(TDEIO::ERR_COULD_NOT_MKDIR, path)); urDocument->setURL(documentURL.path()); diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index 613816f84..d8a2b026d 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -444,7 +444,7 @@ void runRdb( uint flags ) // Export colors to non-(KDE/Qt) apps (e.g. Motif, GTK+ apps) if (exportColors) { - TDEGlobal::dirs()->addResourceType("appdefaults", KStandardDirs::kde_default("data") + "kdisplay/app-defaults/"); + TDEGlobal::dirs()->addResourceType("appdefaults", TDEStandardDirs::kde_default("data") + "kdisplay/app-defaults/"); TQColorGroup cg = newPal.active(); TDEGlobal::locale()->insertCatalogue("krdb"); createGtkrc( true, cg, 1 ); diff --git a/kcontrol/kthememanager/ktheme.h b/kcontrol/kthememanager/ktheme.h index 4efad8527..11fa6b056 100644 --- a/kcontrol/kthememanager/ktheme.h +++ b/kcontrol/kthememanager/ktheme.h @@ -27,7 +27,7 @@ #include -class KStandardDirs; +class TDEStandardDirs; class TDEConfig; /// defines the syntax version used by the XML @@ -216,7 +216,7 @@ private: /// "general" section TQDomElement m_general; - KStandardDirs * m_kgd; + TDEStandardDirs * m_kgd; TQGuardedPtr m_parent; }; diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index a72766837..950d40ad8 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -106,7 +106,7 @@ kthememanager::~kthememanager() void kthememanager::init() { - TDEGlobal::dirs()->addResourceType( "themes", KStandardDirs::kde_default("data") + + TDEGlobal::dirs()->addResourceType( "themes", TDEStandardDirs::kde_default("data") + "kthememanager/themes/" ); } diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index ba3c0eb66..74d76d652 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -66,7 +66,7 @@ K_EXPORT_COMPONENT_FACTORY (kcm_screensaver, KSSFactory("kcmscreensaver") ) static TQString findExe(const TQString &exe) { TQString result = locate("exe", exe); if (result.isEmpty()) - result = KStandardDirs::findExe(exe); + result = TDEStandardDirs::findExe(exe); return result; } diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index 5c274d3cc..ea6c11a08 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -128,7 +128,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) m_bToolbarsDirty = false; TDEGlobal::dirs()->addResourceType("themes", - KStandardDirs::kde_default("data") + "kstyle/themes"); + TDEStandardDirs::kde_default("data") + "kstyle/themes"); TDEAboutData *about = new TDEAboutData( I18N_NOOP("kcmstyle"), -- cgit v1.2.3