From da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:21:47 -0600 Subject: Rename many classes and header files to avoid conflicts with KDE4 --- kget/main.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'kget/main.cpp') diff --git a/kget/main.cpp b/kget/main.cpp index ea6ab350..824bd9e6 100644 --- a/kget/main.cpp +++ b/kget/main.cpp @@ -37,7 +37,7 @@ #include #include #include -#include "kmainwidget.h" +#include "tdemainwidget.h" #include "version.h" @@ -64,9 +64,9 @@ static void signalHandler(int sigId) { fprintf(stderr, "*** KGet got signal %d\n", sigId); - if (sigId != SIGSEGV && kmain) { + if (sigId != SIGSEGV && tdemain) { fprintf(stderr, "*** KGet saving data\n"); - delete kmain; + delete tdemain; } // If Kget crashes again below this line we consider the data lost :-| // Otherwise Kget will end in an infinite loop. @@ -101,7 +101,7 @@ static void cleanup(void) class KGetApp : public KUniqueApplication { private: - TDEMainWidget *kmainwidget; + TDEMainWidget *tdemainwidget; public: KGetApp() : KUniqueApplication() @@ -110,7 +110,7 @@ public: sDebugIn << endl; #endif - kmainwidget=0; + tdemainwidget=0; #ifdef _DEBUG sDebugOut << endl; @@ -122,7 +122,7 @@ public: #ifdef _DEBUG sDebugIn << endl; #endif - delete kmainwidget; + delete tdemainwidget; #ifdef _DEBUG sDebugOut << endl; #endif @@ -132,26 +132,26 @@ public: int newInstance() { #ifdef _DEBUG - sDebugIn <<"kmainwidget="<activateDropTarget(); + tdemain->activateDropTarget(); if (args->count()==1) { @@ -160,9 +160,9 @@ public: #endif TQString txt(args->arg(0)); if ( txt.endsWith( ".kgt" ) ) - kmain->readTransfersEx(KURL::fromPathOrURL( txt )); + tdemain->readTransfersEx(KURL::fromPathOrURL( txt )); else - kmain->addTransferEx( KURL::fromPathOrURL( txt ), + tdemain->addTransferEx( KURL::fromPathOrURL( txt ), KURL()); } else if(args->count()>=2) @@ -175,11 +175,11 @@ public: // Sometimes valid filenames are not recognised by KURL::isLocalFile(), they are marked as invalid then if ( args->count()==2 && ( urls.last().isLocalFile() || !urls.last().isValid())) { - kmain->addTransferEx( urls.first(), urls.last() ); + tdemain->addTransferEx( urls.first(), urls.last() ); } else { - kmain->addTransfers( urls, TQString() ); + tdemain->addTransfers( urls, TQString() ); } } args->clear(); -- cgit v1.2.1