diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:26 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:26 -0600 |
commit | c8fc7b9d459cfe043934f86dd3e0af7bf8ecccf7 (patch) | |
tree | ba4582053cae58a3f204da2df88d680c84141696 /src/main.cpp | |
parent | 4ede6a1bdb01c6143bfdb23593633131c02051ab (diff) | |
download | kdiff3-c8fc7b9d459cfe043934f86dd3e0af7bf8ecccf7.tar.gz kdiff3-c8fc7b9d459cfe043934f86dd3e0af7bf8ecccf7.zip |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); |