From 50d6569cdef5f0aac099f5d01864bd0e14f82ae3 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:46 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- kppp/kpppwidget.cpp | 4 ++-- kppp/logview/main.cpp | 6 +++--- kppp/main.cpp | 6 +++--- kppp/modem.cpp | 2 +- kppp/modem.h | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'kppp') diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp index 0009750b..3d1515f7 100644 --- a/kppp/kpppwidget.cpp +++ b/kppp/kpppwidget.cpp @@ -285,7 +285,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) move(desk.center().x()-width()/2, desk.center().y()-height()/2); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); m_strCmdlAccount = args->getOption("c"); m_strCmdlModem = args->getOption("m"); @@ -722,7 +722,7 @@ void KPPPWidget::beginConnect() { } #endif - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TQString device = ""; if (args->isSet("dev")) device = args->getOption("dev"); diff --git a/kppp/logview/main.cpp b/kppp/logview/main.cpp index f034c462..bd56c7fe 100644 --- a/kppp/logview/main.cpp +++ b/kppp/logview/main.cpp @@ -49,7 +49,7 @@ static KCmdLineOptions option[] = TopWidget::TopWidget() : KMainWindow(0, "") { // Check command line args for "-kppp" - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); bool kpppmode = args->isSet("kppp"); args->clear(); @@ -109,9 +109,9 @@ int main(int argc, char **argv) { aboutData.addAuthor("Bernd Wuebben",0, "wuebben@kde.org"); aboutData.addAuthor("Mario Weilguni",0, ""); aboutData.addAuthor("Harri Porten",0, "porten@kde.org"); - KCmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions( option ); + TDECmdLineArgs::addCmdLineOptions( option ); KApplication a; diff --git a/kppp/main.cpp b/kppp/main.cpp index 753291ba..d922c4c5 100644 --- a/kppp/main.cpp +++ b/kppp/main.cpp @@ -207,8 +207,8 @@ int main( int argc, char **argv ) { aboutData.addAuthor("Bernd Wuebben", I18N_NOOP("Original author"), "wuebben@kde.org"); aboutData.addAuthor("Mario Weilguni",0, ""); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); @@ -222,7 +222,7 @@ int main( int argc, char **argv ) { kdDebug(5002) << "helperPid: " << (int) helperPid << endl; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); bool terminate_connection = args->isSet("k"); if (args->isSet("r")) diff --git a/kppp/modem.cpp b/kppp/modem.cpp index 4d31fe59..7b464cc9 100644 --- a/kppp/modem.cpp +++ b/kppp/modem.cpp @@ -53,7 +53,7 @@ Modem::Modem() : { assert(modem==0); modem = this; - args = KCmdLineArgs::parsedArgs(); + args = TDECmdLineArgs::parsedArgs(); } diff --git a/kppp/modem.h b/kppp/modem.h index 933ef4cf..9ec28b37 100644 --- a/kppp/modem.h +++ b/kppp/modem.h @@ -37,7 +37,7 @@ #include -class KCmdLineArgs; +class TDECmdLineArgs; void alarm_handler(int); @@ -78,7 +78,7 @@ private slots: private: void escape_to_command_mode(); - KCmdLineArgs *args; + TDECmdLineArgs *args; private: int modemfd; -- cgit v1.2.1