summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:25 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:25 -0600
commit4ff6dfc573c9413a887afd35ec2d6825e60067bc (patch)
tree6941953c2c61cbf7ba41bf1286caa34e6b880b38 /src
parent2138755a6d3541c379814d61eeaf80804051ed03 (diff)
downloadgwenview-4ff6dfc573c9413a887afd35ec2d6825e60067bc.tar.gz
gwenview-4ff6dfc573c9413a887afd35ec2d6825e60067bc.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r--src/app/main.cpp8
-rw-r--r--src/app/testvtabwidget.cpp2
-rw-r--r--src/imageutils/testjpegcontent.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 4401193..0200a0d 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -46,7 +46,7 @@ static KCmdLineOptions options[] = {
static const char version[] = "1.4.2";
-void applyFilterArgs(KCmdLineArgs* args, FileViewController* controller) {
+void applyFilterArgs(TDECmdLineArgs* args, FileViewController* controller) {
TQString filterType = args->getOption("filter-type");
TQString filterName = args->getOption("filter-name");
TQString filterFrom = args->getOption("filter-from");
@@ -126,15 +126,15 @@ KDE_EXPORT int kdemain (int argc, char *argv[]) {
aboutData.addCredit("Michael Spanier", I18N_NOOP("Patch for mouse navigation (v0.7.0)"), "mail@michael-spanier.de");
aboutData.addCredit("Christian A Strømmen", I18N_NOOP("Integration in Konqueror folder context menu"), "number1@realityx.net");
- KCmdLineArgs::init( argc, argv, &aboutData );
- KCmdLineArgs::addCmdLineOptions( options );
+ TDECmdLineArgs::init( argc, argv, &aboutData );
+ TDECmdLineArgs::addCmdLineOptions( options );
KApplication kapplication;
if (kapplication.isRestored()) {
RESTORE(MainWindow)
} else {
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
MainWindow *mainWindow = new MainWindow;
applyFilterArgs(args, mainWindow->fileViewController());
diff --git a/src/app/testvtabwidget.cpp b/src/app/testvtabwidget.cpp
index 9491280..a607b55 100644
--- a/src/app/testvtabwidget.cpp
+++ b/src/app/testvtabwidget.cpp
@@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
int main(int argc, char* argv[]) {
KAboutData aboutData("testvtabwidget", "testvtabwidget", "0");
- KCmdLineArgs::init( argc, argv, &aboutData );
+ TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication app;
Gwenview::VTabWidget tabWidget(0);
diff --git a/src/imageutils/testjpegcontent.cpp b/src/imageutils/testjpegcontent.cpp
index a46ef70..50e35f6 100644
--- a/src/imageutils/testjpegcontent.cpp
+++ b/src/imageutils/testjpegcontent.cpp
@@ -202,7 +202,7 @@ int main(int argc, char* argv[]) {
TestEnvironment testEnv;
bool result;
KAboutData aboutData("testjpegcontent", "testjpegcontent", "0");
- KCmdLineArgs::init( argc, argv, &aboutData );
+ TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication kapplication;
// Reading info