summaryrefslogtreecommitdiffstats
path: root/kopete/kopete
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:46 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:46 -0600
commit50d6569cdef5f0aac099f5d01864bd0e14f82ae3 (patch)
treec1df4e69800be09a5873c527831b700268dd7cdf /kopete/kopete
parent9598af160810ee4dccabad48563ddecd071c6065 (diff)
downloadtdenetwork-50d6569cdef5f0aac099f5d01864bd0e14f82ae3.tar.gz
tdenetwork-50d6569cdef5f0aac099f5d01864bd0e14f82ae3.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'kopete/kopete')
-rw-r--r--kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp2
-rw-r--r--kopete/kopete/kopeteapplication.cpp6
-rw-r--r--kopete/kopete/main.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
index 6dee7e6a..7e6e3132 100644
--- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
+++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
@@ -184,7 +184,7 @@ void ChatWindowStyleRendering_Test::allTests()
setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true );
KApplication::disableAutoDcopRegistration();
- //KCmdLineArgs::init(argc,argv,"testkopetemessage", 0, 0, 0, 0);
+ //TDECmdLineArgs::init(argc,argv,"testkopetemessage", 0, 0, 0, 0);
KApplication app;
chatPart = new ChatMessagePart(d->fakeChatSession, 0, 0);
diff --git a/kopete/kopete/kopeteapplication.cpp b/kopete/kopete/kopeteapplication.cpp
index a2c88990..ef8160c1 100644
--- a/kopete/kopete/kopeteapplication.cpp
+++ b/kopete/kopete/kopeteapplication.cpp
@@ -121,7 +121,7 @@ void KopeteApplication::slotLoadPlugins()
KConfig *config = KGlobal::config();
// Parse command-line arguments
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
bool showConfigDialog = false;
@@ -208,7 +208,7 @@ void KopeteApplication::slotLoadPlugins()
void KopeteApplication::slotAllPluginsLoaded()
{
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
// --noconnect not specified?
if ( args->isSet( "connect" ) && KopetePrefs::prefs()->autoConnect() )
@@ -293,7 +293,7 @@ int KopeteApplication::newInstance()
void KopeteApplication::handleURLArgs()
{
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
// kdDebug(14000) << k_funcinfo << "called with " << args->count() << " arguments to handle." << endl;
if ( args->count() > 0 )
diff --git a/kopete/kopete/main.cpp b/kopete/kopete/main.cpp
index 559fdbbb..eaa0ff68 100644
--- a/kopete/kopete/main.cpp
+++ b/kopete/kopete/main.cpp
@@ -96,8 +96,8 @@ int main( int argc, char *argv[] )
aboutData.setTranslator( I18N_NOOP("_: NAME OF TRANSLATORS\nYour names"),
I18N_NOOP("_: EMAIL OF TRANSLATORS\nYour emails") );
- KCmdLineArgs::init( argc, argv, &aboutData );
- KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
+ TDECmdLineArgs::init( argc, argv, &aboutData );
+ TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KUniqueApplication::addCmdLineOptions();
KopeteApplication kopete;