Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 15a642e75c
commit 5c0390ebaa

@ -859,8 +859,8 @@ by selecting the "Global Functions" folder.
3 KAboutData about("kscribble", I18N_NOOP("KScribble"), version, description, 3 KAboutData about("kscribble", I18N_NOOP("KScribble"), version, description,
4 KAboutData::License_GPL, "(C) 2002 Your Name", 0, 0, "you@you.com"); 4 KAboutData::License_GPL, "(C) 2002 Your Name", 0, 0, "you@you.com");
5 about.addAuthor( "Your Name", 0, "you@you.com" ); 5 about.addAuthor( "Your Name", 0, "you@you.com" );
6 KCmdLineArgs::init(argc, argv, &about); 6 TDECmdLineArgs::init(argc, argv, &about);
7 KCmdLineArgs::addCmdLineOptions(options); 7 TDECmdLineArgs::addCmdLineOptions(options);
8 TDEApplication app; 8 TDEApplication app;
9 9
10 // register ourselves as a dcop client 10 // register ourselves as a dcop client
@ -872,7 +872,7 @@ by selecting the "Global Functions" folder.
16 else 16 else
17 { 17 {
18 // no session.. just start up normally 18 // no session.. just start up normally
19 KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); 19 TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
20 if (args->count() == 0) 20 if (args->count() == 0)
21 { 21 {
22 KScribble *widget = new KScribble; 22 KScribble *widget = new KScribble;

@ -128,7 +128,7 @@ Holds information for the about box.
</para> </para>
</formalpara></listitem> </formalpara></listitem>
<listitem><formalpara><title><ulink url="kdeapi:tdecore/KCmdLineArgs">KCmdLineArgs</ulink></title> <listitem><formalpara><title><ulink url="kdeapi:tdecore/TDECmdLineArgs">TDECmdLineArgs</ulink></title>
<para> <para>
Command line argument processing. Command line argument processing.
</para> </para>

@ -240,8 +240,8 @@ static void main(String[] cmdLineArgs)
KAboutData about = new KAboutData("%{APPNAMELC}", "%{APPNAME}", version, description, KAboutData about = new KAboutData("%{APPNAMELC}", "%{APPNAME}", version, description,
KAboutData.License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", null, null, "%{EMAIL}"); KAboutData.License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", null, null, "%{EMAIL}");
about.addAuthor( "%{AUTHOR}", null, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", null, "%{EMAIL}" );
KCmdLineArgs.init(cmdLineArgs, about); TDECmdLineArgs.init(cmdLineArgs, about);
KCmdLineArgs.addCmdLineOptions(options); TDECmdLineArgs.addCmdLineOptions(options);
TDEApplication app = new TDEApplication(); TDEApplication app = new TDEApplication();
// see if we are starting with session management // see if we are starting with session management
@ -250,7 +250,7 @@ static void main(String[] cmdLineArgs)
else else
{ {
// no session.. just start up normally // no session.. just start up normally
KCmdLineArgs args = KCmdLineArgs.parsedArgs(); TDECmdLineArgs args = TDECmdLineArgs.parsedArgs();
if (args.count() == 0) if (args.count() == 0)
{ {
%{APPNAME} widget = new %{APPNAME}(); %{APPNAME} widget = new %{APPNAME}();

@ -48,8 +48,8 @@ Example:
"", "http://www.myapp.org"); "", "http://www.myapp.org");
aboutData.addAuthor("Me", I18N_NOOP("Creator"), "me@myapp.org"); aboutData.addAuthor("Me", I18N_NOOP("Creator"), "me@myapp.org");
KCmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
TDEApplication app; TDEApplication app;

Loading…
Cancel
Save