From 64df902cf71a8ee258fb85f6be26248f399aa01f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:05:15 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kode/kodemain.cpp | 18 +++++++++--------- kode/kwsdl/converter.cpp | 2 +- kode/kwsdl/kung/binaryinputfield.cpp | 4 ++-- kode/kwsdl/kung/transport.h | 2 +- kode/kwsdl/schema/fileprovider.cpp | 2 +- kode/kwsdl/tests/google/transport.h | 2 +- kode/kxml_compiler/creator.cpp | 2 +- kode/kxml_compiler/creator.h | 2 +- kode/kxml_compiler/kxml_compiler.cpp | 2 +- kode/kxml_compiler/parser.cpp | 2 +- kode/kxml_compiler/parser.h | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) (limited to 'kode') diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp index 4f513757..288b9ac5 100644 --- a/kode/kodemain.cpp +++ b/kode/kodemain.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -52,7 +52,7 @@ static const KCmdLineOptions options[] = { "create-class", I18N_NOOP("Create class"), 0 }, { "d", 0, 0 }, { "create-dialog", I18N_NOOP("Create dialog"), 0 }, - { "create-kioslave", I18N_NOOP("Create kioslave"), 0 }, + { "create-tdeioslave", I18N_NOOP("Create tdeioslave"), 0 }, { "create-main", I18N_NOOP("Create main function template"), 0 }, { "y", 0, 0 }, { "codify", I18N_NOOP("Create generator code for given source"), 0 }, @@ -68,7 +68,7 @@ static const KCmdLineOptions options[] = { "warning", I18N_NOOP("Create warning about code generation"), 0 }, { "qt-exception", I18N_NOOP("Add TQt exception to GPL"), 0 }, { "singleton", I18N_NOOP("Create a singleton class"), 0 }, - { "protocol", I18N_NOOP("kioslave protocol"), 0 }, + { "protocol", I18N_NOOP("tdeioslave protocol"), 0 }, { "+[filename]", I18N_NOOP("Source code file name"), 0 }, KCmdLineLastOption }; @@ -325,7 +325,7 @@ int create( TDECmdLineArgs *args ) KODE::Printer p; if ( args->isSet( "warning" ) ) p.setCreationWarning( true ); - bool createKioslave = args->isSet( "create-kioslave" ); + bool createKioslave = args->isSet( "create-tdeioslave" ); bool createMain = args->isSet( "create-main" ); TQString filename = args->getOption( "filename" ); @@ -353,7 +353,7 @@ int create( TDECmdLineArgs *args ) if ( createKioslave ) { if ( !args->isSet( "protocol" ) ) { protocol = className.lower(); - kdWarning() << "Warning: No protocol for kioslave given. Assuming '" + kdWarning() << "Warning: No protocol for tdeioslave given. Assuming '" << protocol << "'" << endl; } else { protocol = args->getOption( "protocol" ); @@ -441,10 +441,10 @@ int create( TDECmdLineArgs *args ) c.addBaseClass( KODE::Class( "KDialogBase" ) ); c.addInclude( "kdialogbase.h" ); } else if ( createKioslave ) { - c.setDocs( "This class implements a kioslave for ..." ); + c.setDocs( "This class implements a tdeioslave for ..." ); c.addBaseClass( KODE::Class( "SlaveBase", "KIO" ) ); - c.addHeaderInclude( "kio/slavebase.h" ); + c.addHeaderInclude( "tdeio/slavebase.h" ); KODE::Function get( "get", "void" ); get.addArgument( "const KURL &url" ); @@ -599,7 +599,7 @@ int create( TDECmdLineArgs *args ) protocolFile.writeEntry( "input", "none" ); protocolFile.writeEntry( "output", "filesystem" ); protocolFile.writeEntry( "reading", "true" ); - protocolFile.writeEntry( "DocPath", "kioslave/" + protocol + ".html" ); + protocolFile.writeEntry( "DocPath", "tdeioslave/" + protocol + ".html" ); protocolFile.sync(); } @@ -620,7 +620,7 @@ int main(int argc,char **argv) TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->isSet( "create-class" ) || args->isSet( "create-dialog" ) || - args->isSet( "create-kioslave" ) || args->isSet( "create-main" ) ) { + args->isSet( "create-tdeioslave" ) || args->isSet( "create-main" ) ) { return create( args ); } else if ( args->isSet( "codify" ) ) { return codify( args ); diff --git a/kode/kwsdl/converter.cpp b/kode/kwsdl/converter.cpp index 253b6bd2..f5d90478 100644 --- a/kode/kwsdl/converter.cpp +++ b/kode/kwsdl/converter.cpp @@ -907,7 +907,7 @@ void Converter::createTransportClass() KODE::Class transport( "Transport" ); transport.addBaseClass( mTQObject ); transport.addHeaderInclude( "tqobject.h" ); - transport.addHeaderInclude( "kio/job.h" ); + transport.addHeaderInclude( "tdeio/job.h" ); transport.addInclude( "kdebug.h" ); diff --git a/kode/kwsdl/kung/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp index 4512edbe..95ea292e 100644 --- a/kode/kwsdl/kung/binaryinputfield.cpp +++ b/kode/kwsdl/kung/binaryinputfield.cpp @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include #include #include diff --git a/kode/kwsdl/kung/transport.h b/kode/kwsdl/kung/transport.h index 71c4fa9d..46355525 100644 --- a/kode/kwsdl/kung/transport.h +++ b/kode/kwsdl/kung/transport.h @@ -21,7 +21,7 @@ #define TRANSPORT_H #include -#include +#include class Transport : public TQObject { diff --git a/kode/kwsdl/schema/fileprovider.cpp b/kode/kwsdl/schema/fileprovider.cpp index d12d4eee..945f7261 100644 --- a/kode/kwsdl/schema/fileprovider.cpp +++ b/kode/kwsdl/schema/fileprovider.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include "fileprovider.h" diff --git a/kode/kwsdl/tests/google/transport.h b/kode/kwsdl/tests/google/transport.h index 0b5b49fa..a0873e26 100644 --- a/kode/kwsdl/tests/google/transport.h +++ b/kode/kwsdl/tests/google/transport.h @@ -25,7 +25,7 @@ #define TRANSPORT_H #include -#include +#include class Transport : public TQObject { diff --git a/kode/kxml_compiler/creator.cpp b/kode/kxml_compiler/creator.cpp index 3d4983f9..b297cc78 100644 --- a/kode/kxml_compiler/creator.cpp +++ b/kode/kxml_compiler/creator.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/kode/kxml_compiler/creator.h b/kode/kxml_compiler/creator.h index 2103f928..33ab410c 100644 --- a/kode/kxml_compiler/creator.h +++ b/kode/kxml_compiler/creator.h @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/kode/kxml_compiler/kxml_compiler.cpp b/kode/kxml_compiler/kxml_compiler.cpp index bb4b2425..4f3fe3ed 100644 --- a/kode/kxml_compiler/kxml_compiler.cpp +++ b/kode/kxml_compiler/kxml_compiler.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/kode/kxml_compiler/parser.cpp b/kode/kxml_compiler/parser.cpp index 9a123581..9881aff5 100644 --- a/kode/kxml_compiler/parser.cpp +++ b/kode/kxml_compiler/parser.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/kode/kxml_compiler/parser.h b/kode/kxml_compiler/parser.h index 6efd6f74..ce5d65e2 100644 --- a/kode/kxml_compiler/parser.h +++ b/kode/kxml_compiler/parser.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include -- cgit v1.2.3