From d41050ea3f6904e5156d35f664346b816b9e4d12 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:43 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- ksplashml/themeengine/objkstheme.cpp | 4 ++-- ksplashml/themeengine/objkstheme.h | 2 +- ksplashml/themeengine/themeengine.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ksplashml/themeengine') diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp index 9aa6d2b26..533697dc4 100644 --- a/ksplashml/themeengine/objkstheme.cpp +++ b/ksplashml/themeengine/objkstheme.cpp @@ -50,7 +50,7 @@ ObjKsTheme::ObjKsTheme( const TQString& theme ) if( !loadLocalConfig( mActiveTheme, false ) ) if( !loadThemeRc( "Default", false ) ) loadLocalConfig( "Default", true ); //force: we need some defaults - loadCmdLineArgs(KCmdLineArgs::parsedArgs()); + loadCmdLineArgs(TDECmdLineArgs::parsedArgs()); mThemePrefix += ( mActiveTheme + "/" ); } @@ -141,7 +141,7 @@ bool ObjKsTheme::loadKConfig( KConfig *cfg, const TQString& activeTheme, bool fo * ObjKsTheme::loadCmdLineArgs(): Handle any overrides which the user might have * specified. */ -void ObjKsTheme::loadCmdLineArgs( KCmdLineArgs *args ) +void ObjKsTheme::loadCmdLineArgs( TDECmdLineArgs *args ) { mManagedMode = args->isSet( "managed" ); diff --git a/ksplashml/themeengine/objkstheme.h b/ksplashml/themeengine/objkstheme.h index 090b39220..4d88276ba 100644 --- a/ksplashml/themeengine/objkstheme.h +++ b/ksplashml/themeengine/objkstheme.h @@ -33,7 +33,7 @@ public: explicit ObjKsTheme( const TQString& ); virtual ~ObjKsTheme(); - void loadCmdLineArgs( KCmdLineArgs * ); + void loadCmdLineArgs( TDECmdLineArgs * ); TQString theme() const { return( mActiveTheme ); } TQString themeEngine() const { return( mThemeEngine ); } diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp index cb3566588..b9a7c208f 100644 --- a/ksplashml/themeengine/themeengine.cpp +++ b/ksplashml/themeengine/themeengine.cpp @@ -59,7 +59,7 @@ ThemeEngine::ThemeEngine( TQWidget *, const char *, const TQStringList& args ) if (args.first() == "Unified") { mUseWM = true; } - mTheme->loadCmdLineArgs( KCmdLineArgs::parsedArgs() ); + mTheme->loadCmdLineArgs( TDECmdLineArgs::parsedArgs() ); } ThemeEngine::~ThemeEngine() -- cgit v1.2.1