summaryrefslogtreecommitdiffstats
path: root/src/kreplacements
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-06 19:33:18 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-06 19:33:18 -0600
commit64eaa62d202fd64fe08f77487e14c2ed9a4a01a3 (patch)
tree718dc5d6eec7745b1449942359e79173721c809e /src/kreplacements
parent4e2575b1e7a28448cea0bad1bc70e43f4b486d61 (diff)
downloadkdiff3-64eaa62d202fd64fe08f77487e14c2ed9a4a01a3.tar.gz
kdiff3-64eaa62d202fd64fe08f77487e14c2ed9a4a01a3.zip
Rename KCmd to avoid conflicts with KDE4
Diffstat (limited to 'src/kreplacements')
-rw-r--r--src/kreplacements/kreplacements.cpp4
-rw-r--r--src/kreplacements/kreplacements.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/kreplacements/kreplacements.cpp b/src/kreplacements/kreplacements.cpp
index 499ceac..94e62a4 100644
--- a/src/kreplacements/kreplacements.cpp
+++ b/src/kreplacements/kreplacements.cpp
@@ -886,7 +886,7 @@ void TDEAboutData::addCredit(const char* name, const char* task, const char* ema
static TDECmdLineArgs s_cmdLineArgs;
static int s_argc;
static char** s_argv;
-static KCmdLineOptions* s_pOptions;
+static TDECmdLineOptions* s_pOptions;
static std::vector<QCStringList> s_vOption;
static std::vector<const char*> s_vArg;
@@ -903,7 +903,7 @@ void TDECmdLineArgs::init( int argc, char**argv, TDEAboutData* pAboutData ) //
s_pAboutData = pAboutData;
}
-void TDECmdLineArgs::addCmdLineOptions( KCmdLineOptions* options ) // static
+void TDECmdLineArgs::addCmdLineOptions( TDECmdLineOptions* options ) // static
{
s_pOptions = options;
}
diff --git a/src/kreplacements/kreplacements.h b/src/kreplacements/kreplacements.h
index 5f4e811..a96f2fa 100644
--- a/src/kreplacements/kreplacements.h
+++ b/src/kreplacements/kreplacements.h
@@ -316,14 +316,14 @@ public:
TQString findResource(const TQString& resource, const TQString& appName);
};
-struct KCmdLineOptions
+struct TDECmdLineOptions
{
const char* name;
const char* description;
int def;
};
-#define KCmdLineLastOption {0,0,0}
+#define TDECmdLineLastOption {0,0,0}
class TDEAboutData
{
@@ -358,7 +358,7 @@ class TDECmdLineArgs
public:
static TDECmdLineArgs* parsedArgs();
static void init( int argc, char**argv, TDEAboutData* );
- static void addCmdLineOptions( KCmdLineOptions* options ); // Add our own options.
+ static void addCmdLineOptions( TDECmdLineOptions* options ); // Add our own options.
int count();
TQString arg(int);