From 8cda419a4110210e8a8634230895af1aa165a7c4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:27 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- kiosktool/kioskrun.cpp | 2 +- kiosktool/kiosktool-tdedirs.cpp | 6 +++--- kiosktool/main.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kiosktool/kioskrun.cpp b/kiosktool/kioskrun.cpp index 064f93d..bfc46e0 100644 --- a/kiosktool/kioskrun.cpp +++ b/kiosktool/kioskrun.cpp @@ -60,7 +60,7 @@ KioskRun::KioskRun( TQObject* parent, const char* name) m_saveConfigCache.setAutoDelete(true); m_immutableStatusCache.setAutoDelete(true); m_homeDir = TQDir::homeDirPath()+"/.trinity-test"; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); m_kderc = TQFile::decodeName(args->getOption("kderc")); m_isRoot = (getuid() == 0); } diff --git a/kiosktool/kiosktool-tdedirs.cpp b/kiosktool/kiosktool-tdedirs.cpp index 43d4fed..79baeec 100644 --- a/kiosktool/kiosktool-tdedirs.cpp +++ b/kiosktool/kiosktool-tdedirs.cpp @@ -123,9 +123,9 @@ int main(int argc, char **argv) { KLocale::setMainCatalogue("kiosktool"); KAboutData about("kiosktool-tdedirs", "kiosktool-tdedirs", "1.0", description, KAboutData::License_GPL, "(C) 2004 Waldo Bastian"); - KCmdLineArgs::init( argc, argv, &about); - KCmdLineArgs::addCmdLineOptions(options); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs::init( argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KInstance a("kiosktool-tdedirs"); diff --git a/kiosktool/main.cpp b/kiosktool/main.cpp index c86bb6a..7dafa98 100644 --- a/kiosktool/main.cpp +++ b/kiosktool/main.cpp @@ -51,9 +51,9 @@ int main(int argc, char *argv[]) "(c) 2003,2004 Waldo Bastian"); aboutData.addAuthor("Waldo Bastian",I18N_NOOP("Author"), "bastian@kde.org"); - KCmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication a; -- cgit v1.2.1