summaryrefslogtreecommitdiffstats
path: root/src/kreplacements
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:26 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:26 -0600
commitc8fc7b9d459cfe043934f86dd3e0af7bf8ecccf7 (patch)
treeba4582053cae58a3f204da2df88d680c84141696 /src/kreplacements
parent4ede6a1bdb01c6143bfdb23593633131c02051ab (diff)
downloadkdiff3-c8fc7b9d459cfe043934f86dd3e0af7bf8ecccf7.tar.gz
kdiff3-c8fc7b9d459cfe043934f86dd3e0af7bf8ecccf7.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'src/kreplacements')
-rw-r--r--src/kreplacements/kreplacements.cpp20
-rw-r--r--src/kreplacements/kreplacements.h4
2 files changed, 12 insertions, 12 deletions
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.