From c705f8f0619865875d6247d9470dced55241bc79 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:45 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- kghostview/displayoptions.cpp | 2 +- kghostview/displayoptions.h | 4 ++-- kghostview/main.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'kghostview') diff --git a/kghostview/displayoptions.cpp b/kghostview/displayoptions.cpp index f2e0fa4b..6e4dddc7 100644 --- a/kghostview/displayoptions.cpp +++ b/kghostview/displayoptions.cpp @@ -41,7 +41,7 @@ namespace { const size_t numberOfMagnifications = ( sizeof( allowedMagnifications ) / sizeof( allowedMagnifications[ 0 ] ) ); } -DisplayOptions DisplayOptions::parse( KCmdLineArgs* args ) +DisplayOptions DisplayOptions::parse( TDECmdLineArgs* args ) { DisplayOptions res; #define CHECK_ORIENTATION( tag, value ) \ diff --git a/kghostview/displayoptions.h b/kghostview/displayoptions.h index 8ceaf56e..7767da48 100644 --- a/kghostview/displayoptions.h +++ b/kghostview/displayoptions.h @@ -21,7 +21,7 @@ #include #include "dscparse_adapter.h" #include -class KCmdLineArgs; +class TDECmdLineArgs; class KConfig; class KDE_EXPORT DisplayOptions @@ -67,7 +67,7 @@ class KDE_EXPORT DisplayOptions /** * Parses command line options. */ - static DisplayOptions parse ( KCmdLineArgs * ); + static DisplayOptions parse ( TDECmdLineArgs * ); /** * Transforms the object in a string representation. * Useful for storing in config files, for example. diff --git a/kghostview/main.cpp b/kghostview/main.cpp index 327a5be5..05e0f23b 100644 --- a/kghostview/main.cpp +++ b/kghostview/main.cpp @@ -45,10 +45,10 @@ static KCmdLineOptions options[] = int main( int argc, char** argv ) { - KCmdLineArgs::init( argc, argv, KGVPart::createAboutData() ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, KGVPart::createAboutData() ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); if( kapp->isRestored() ) RESTORE( KGVShell ) -- cgit v1.2.3