Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

pull/4/head
Timothy Pearson 12 years ago
parent 5b19d3d9a6
commit 135b621d92

@ -70,7 +70,7 @@ int KerryApplication::newInstance()
if (!hitListWindow) if (!hitListWindow)
init(KGlobal::instance()->aboutData()); init(KGlobal::instance()->aboutData());
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->isSet("show-searchdialog")) { if (args->isSet("show-searchdialog")) {
hitListWindow->showSearchDialog(); hitListWindow->showSearchDialog();
} }

@ -28,7 +28,7 @@
#define MAX_HISTORY_ITEMS 10 #define MAX_HISTORY_ITEMS 10
class kerry; class kerry;
class KCmdLineArgs; class TDECmdLineArgs;
class SearchDlg; class SearchDlg;
class KHelpMenu; class KHelpMenu;
class KAboutData; class KAboutData;

@ -91,8 +91,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
"(c) 2005,2006 Novell, Inc.", "(c) 2005,2006 Novell, Inc.",
0, "http://opensuse.org/kerry"); 0, "http://opensuse.org/kerry");
about.addAuthor("Stephan Binner", 0, "binner@kde.org"); about.addAuthor("Stephan Binner", 0, "binner@kde.org");
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KUniqueApplication::addCmdLineOptions(); KUniqueApplication::addCmdLineOptions();
KSessionManaged ksm; KSessionManaged ksm;

Loading…
Cancel
Save