From d41050ea3f6904e5156d35f664346b816b9e4d12 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 19 Jan 2013 18:46:43 -0600
Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

---
 ksplashml/main.cpp                    | 6 +++---
 ksplashml/themeengine/objkstheme.cpp  | 4 ++--
 ksplashml/themeengine/objkstheme.h    | 2 +-
 ksplashml/themeengine/themeengine.cpp | 2 +-
 ksplashml/wndmain.cpp                 | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'ksplashml')

diff --git a/ksplashml/main.cpp b/ksplashml/main.cpp
index 995cf8a2a..daa07bd1a 100644
--- a/ksplashml/main.cpp
+++ b/ksplashml/main.cpp
@@ -50,9 +50,9 @@ int main( int argc, char **argv )
   about.addAuthor( "Ravikiran Rajagopal", I18N_NOOP("Author and maintainer"), "ravi@ee.eng.ohio-state.edu" );
   about.addAuthor( "Brian Ledbetter", I18N_NOOP("Original author"), "brian@shadowcom.net" );
 
-  KCmdLineArgs::init(argc, argv, &about);
-  KCmdLineArgs::addCmdLineOptions(options);
-  KCmdLineArgs *arg = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs::init(argc, argv, &about);
+  TDECmdLineArgs::addCmdLineOptions(options);
+  TDECmdLineArgs *arg = TDECmdLineArgs::parsedArgs();
 
   if ( !( arg->isSet( "dcop" ) ) )
     KApplication::disableAutoDcopRegistration();
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()
diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp
index 39a786b5d..2efe5bb83 100644
--- a/ksplashml/wndmain.cpp
+++ b/ksplashml/wndmain.cpp
@@ -90,7 +90,7 @@ KSplash::~KSplash()
 
 void KSplash::slotReadProperties( KConfig *config )
 {
-  KCmdLineArgs *arg = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *arg = TDECmdLineArgs::parsedArgs();
   mTheme = arg->getOption("theme");
   if (mTheme.isEmpty())
   {
@@ -357,7 +357,7 @@ ThemeEngine *KSplash::_loadThemeEngine( const TQString& pluginName, const TQStri
   TQString libName;
   TQString objName;
   // Replace this test by a "nodcop" command line option.
-  if ( /*!mKsTheme->managedMode() ||*/ !KCmdLineArgs::parsedArgs()->isSet( "dcop" ) )
+  if ( /*!mKsTheme->managedMode() ||*/ !TDECmdLineArgs::parsedArgs()->isSet( "dcop" ) )
   {
     libName = TQString("ksplash%1").arg(pluginName.lower());
     objName = TQString("Theme%1").arg(pluginName);
-- 
cgit v1.2.3