Rename KInstance and KAboutData to avoid conflicts with KDE4

feat/lzip-support
Timothy Pearson 12 years ago
parent d94d4c7cd9
commit 64a52553d8

@ -60,7 +60,7 @@ extern "C" { int kdemain(int argc, char **argv); }
int kdemain( int argc, char **argv ) int kdemain( int argc, char **argv )
{ {
KInstance instance( "kio_iso" ); TDEInstance instance( "kio_iso" );
kdDebug() << "Starting " << getpid() << endl; kdDebug() << "Starting " << getpid() << endl;

@ -61,7 +61,7 @@ using namespace KIO;
extern "C" { extern "C" {
int kdemain( int argc, char **argv ){ int kdemain( int argc, char **argv ){
KInstance instance( "kio_krarc" ); TDEInstance instance( "kio_krarc" );
if (argc != 4) { if (argc != 4) {
kdWarning() << "Usage: kio_krarc protocol domain-socket1 domain-socket2" << endl; kdWarning() << "Usage: kio_krarc protocol domain-socket1 domain-socket2" << endl;

@ -109,9 +109,9 @@ int main(int argc, char *argv[]) {
#else #else
TQString versionName = VERSION; TQString versionName = VERSION;
#endif #endif
KAboutData aboutData( "krusader", ( geteuid() ? I18N_NOOP("Krusader") : TDEAboutData aboutData( "krusader", ( geteuid() ? I18N_NOOP("Krusader") :
I18N_NOOP("Krusader - ROOT PRIVILEGES")), I18N_NOOP("Krusader - ROOT PRIVILEGES")),
versionName.latin1(), description, KAboutData::License_GPL, versionName.latin1(), description, TDEAboutData::License_GPL,
"(c) 2000-2003, Shie Erlich, Rafi Yanai\n(c) 2004-2007, Krusader Krew", "(c) 2000-2003, Shie Erlich, Rafi Yanai\n(c) 2004-2007, Krusader Krew",
I18N_NOOP("Feedback\nhttp://www.krusader.org/phpBB/\n\n" I18N_NOOP("Feedback\nhttp://www.krusader.org/phpBB/\n\n"
"IRC\nserver: irc.freenode.net, channel: #krusader"), "IRC\nserver: irc.freenode.net, channel: #krusader"),

@ -35,7 +35,7 @@ int main( int argc, char** argv )
usage(); usage();
return 1; return 1;
} }
KInstance instance("ktartest"); TDEInstance instance("ktartest");
TQString command = argv[1]; TQString command = argv[1];
kdDebug() << "main: command=" << command << endl; kdDebug() << "main: command=" << command << endl;

@ -30,7 +30,7 @@ extern "C" { int kdemain( int argc, char **argv ); }
#endif #endif
int kdemain( int argc, char **argv ) { int kdemain( int argc, char **argv ) {
KInstance instance( "kio_tar" ); TDEInstance instance( "kio_tar" );
kdDebug( 7109 ) << "Starting " << getpid() << endl; kdDebug( 7109 ) << "Starting " << getpid() << endl;

@ -51,7 +51,7 @@ TQDict<KURL::List> VirtProtocol::kioVirtDict;
KConfig* VirtProtocol::kio_virt_db; KConfig* VirtProtocol::kio_virt_db;
int kdemain( int argc, char **argv ) { int kdemain( int argc, char **argv ) {
KInstance instance( "kio_virt" ); TDEInstance instance( "kio_virt" );
if ( argc != 4 ) { if ( argc != 4 ) {
fprintf( stderr, "Usage: kio_virt protocol domain-socket1 domain-socket2\n" ); fprintf( stderr, "Usage: kio_virt protocol domain-socket1 domain-socket2\n" );

Loading…
Cancel
Save