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

---
 src/kdiff3.cpp                      |  2 +-
 src/kreplacements/kreplacements.cpp | 20 ++++++++++----------
 src/kreplacements/kreplacements.h   |  4 ++--
 src/main.cpp                        |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp
index ef1a843..b58ddaa 100644
--- a/src/kdiff3.cpp
+++ b/src/kdiff3.cpp
@@ -133,7 +133,7 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par
    m_pOptionDialog->readOptions( isPart() ? m_pKDiff3Part->instance()->config() : kapp->config() );
 
    // Option handling: Only when pParent==0 (no parent)
-   KCmdLineArgs *args = isPart() ? 0 : KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs *args = isPart() ? 0 : TDECmdLineArgs::parsedArgs();
 
    if (args)
    {
diff --git a/src/kreplacements/kreplacements.cpp b/src/kreplacements/kreplacements.cpp
index c49adaf..084faf6 100644
--- a/src/kreplacements/kreplacements.cpp
+++ b/src/kreplacements/kreplacements.cpp
@@ -883,7 +883,7 @@ void KAboutData::addCredit(const char* name, const char* task, const char* email
   { "+[File3]", I18N_NOOP("file3 to open"), 0 },
 */
 ////////////////
-static KCmdLineArgs s_cmdLineArgs;
+static TDECmdLineArgs s_cmdLineArgs;
 static int s_argc;
 static char** s_argv;
 static KCmdLineOptions* s_pOptions;
@@ -891,38 +891,38 @@ static KCmdLineOptions* s_pOptions;
 static std::vector<QCStringList> s_vOption;
 static std::vector<const char*> s_vArg;
 
-KCmdLineArgs* KCmdLineArgs::parsedArgs()  // static
+TDECmdLineArgs* TDECmdLineArgs::parsedArgs()  // static
 {
    return &s_cmdLineArgs;
 }
 
-void KCmdLineArgs::init( int argc, char**argv, KAboutData* pAboutData )  // static
+void TDECmdLineArgs::init( int argc, char**argv, KAboutData* pAboutData )  // static
 {
    s_argc = argc;
    s_argv = argv;
    s_pAboutData = pAboutData;
 }
 
-void KCmdLineArgs::addCmdLineOptions( KCmdLineOptions* options ) // static
+void TDECmdLineArgs::addCmdLineOptions( KCmdLineOptions* options ) // static
 {
    s_pOptions = options;
 }
 
-int KCmdLineArgs::count()
+int TDECmdLineArgs::count()
 {
    return s_vArg.size();
 }
 
-TQString KCmdLineArgs::arg(int idx)
+TQString TDECmdLineArgs::arg(int idx)
 {
    return TQString::fromLocal8Bit( s_vArg[idx] );
 }
 
-void KCmdLineArgs::clear()
+void TDECmdLineArgs::clear()
 {
 }
 
-TQString KCmdLineArgs::getOption( const TQString& s )
+TQString TDECmdLineArgs::getOption( const TQString& s )
 {
    // Find the option
    int j=0;
@@ -941,7 +941,7 @@ TQString KCmdLineArgs::getOption( const TQString& s )
    return TQString();
 }
 
-QCStringList KCmdLineArgs::getOptionList( const TQString& s )
+QCStringList TDECmdLineArgs::getOptionList( const TQString& s )
 {   
    // Find the option
    int j=0;
@@ -961,7 +961,7 @@ QCStringList KCmdLineArgs::getOptionList( const TQString& s )
    return QCStringList();
 }
 
-bool KCmdLineArgs::isSet(const TQString& s)
+bool TDECmdLineArgs::isSet(const TQString& s)
 {
    // Find the option
    int j=0;
diff --git a/src/kreplacements/kreplacements.h b/src/kreplacements/kreplacements.h
index 054e3c3..e56f9bd 100644
--- a/src/kreplacements/kreplacements.h
+++ b/src/kreplacements/kreplacements.h
@@ -353,10 +353,10 @@ public:
 
 typedef TQValueList<TQCString> QCStringList;
 
-class KCmdLineArgs
+class TDECmdLineArgs
 {
 public:
-   static KCmdLineArgs* parsedArgs();
+   static TDECmdLineArgs* parsedArgs();
    static void init( int argc, char**argv, KAboutData* );
    static void addCmdLineOptions( KCmdLineOptions* options ); // Add our own options.
 
diff --git a/src/main.cpp b/src/main.cpp
index 2556c0e..e0c1629 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -105,7 +105,7 @@ void initialiseCmdLineArgs(std::vector<KCmdLineOptions>& vOptions, TQStringList&
 
    KCmdLineOptions last = KCmdLineLastOption;
    vOptions.push_back(last);
-   KCmdLineArgs::addCmdLineOptions( &vOptions[0] ); // Add our own options.
+   TDECmdLineArgs::addCmdLineOptions( &vOptions[0] ); // Add our own options.
 }
 
 
@@ -190,7 +190,7 @@ int main(int argc, char *argv[])
 
    aboutData.addCredit(I18N_NOOP("+ Many thanks to those who reported bugs and contributed ideas!"));
 
-   KCmdLineArgs::init( argc, argv, &aboutData );
+   TDECmdLineArgs::init( argc, argv, &aboutData );
    std::vector<KCmdLineOptions> vOptions;
    TQStringList ignorableOptions;
    initialiseCmdLineArgs(vOptions, ignorableOptions);
-- 
cgit v1.2.1