Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

8 files changed, 29 insertions, 29 deletions

diff --git a/korundum/rubylib/examples/uimodules/uimisc.rb b/korundum/rubylib/examples/uimodules/uimisc.rb
index 1fda5fd9..88903594 100644
--- a/korundum/rubylib/examples/uimodules/uimisc.rb
+++ b/korundum/rubylib/examples/uimodules/uimisc.rb
@@ -207,7 +207,7 @@ def UIMisc.miscKAlphaPainter(parent)
     parent.currentPageObj = PageNotImpl.new(parent)
 end
 
-def UIMisc.miscKCModule(parent)
+def UIMisc.miscTDECModule(parent)
     parent.currentPageObj = PageNotImpl.new(parent)
 end
 
diff --git a/korundum/rubylib/korundum/Korundum.cpp b/korundum/rubylib/korundum/Korundum.cpp
index da9f0997..c07c29c5 100644
--- a/korundum/rubylib/korundum/Korundum.cpp
+++ b/korundum/rubylib/korundum/Korundum.cpp
@@ -1057,7 +1057,7 @@ static VALUE
 kconfigskeletonitem_immutable(VALUE self)
 {
 	smokeruby_object *o = value_obj_info(self);
-	KConfigSkeletonItem * item = (KConfigSkeletonItem *) o->ptr;
+	TDEConfigSkeletonItem * item = (TDEConfigSkeletonItem *) o->ptr;
 	return item->isImmutable() ? Qtrue : Qfalse;
 }
 
@@ -1065,7 +1065,7 @@ static VALUE
 config_additem(int argc, VALUE * argv, VALUE self)
 {
 	smokeruby_object *o = value_obj_info(self);
-	KConfigSkeleton * config = (KConfigSkeleton *) o->ptr;
+	TDEConfigSkeleton * config = (TDEConfigSkeleton *) o->ptr;
 	
 	if (argc < 1 || argc > 2) {
 		rb_raise(rb_eArgError, "wrong number of arguments(%d for 2)\n", argc);
@@ -1076,7 +1076,7 @@ config_additem(int argc, VALUE * argv, VALUE self)
 	}
 	
 	smokeruby_object *c = value_obj_info(argv[0]);
-	KConfigSkeletonItem * item = (KConfigSkeletonItem *) c->ptr;
+	TDEConfigSkeletonItem * item = (TDEConfigSkeletonItem *) c->ptr;
 	
 	if (argc == 1) {
 		config->addItem(item);
diff --git a/korundum/rubylib/korundum/kdehandlers.cpp b/korundum/rubylib/korundum/kdehandlers.cpp
index 11b97b52..1e4eb3a4 100644
--- a/korundum/rubylib/korundum/kdehandlers.cpp
+++ b/korundum/rubylib/korundum/kdehandlers.cpp
@@ -924,11 +924,11 @@ void marshall_UDSEntryList(Marshall *m) {
 			break;
 		}
 		
-		KIO::UDSEntryList *cpplist = new KIO::UDSEntryList;
+		TDEIO::UDSEntryList *cpplist = new TDEIO::UDSEntryList;
 		
 		for(long i = 0; i < RARRAY_LEN(list); i++) {
 			VALUE item = rb_ary_entry(list, i);
-			KIO::UDSEntry *cppsublist = new KIO::UDSEntry;
+			TDEIO::UDSEntry *cppsublist = new TDEIO::UDSEntry;
 			
 			for (int j = 0; j < RARRAY_LEN(item); j++) {
 				VALUE subitem = rb_ary_entry(item, j);
@@ -936,8 +936,8 @@ void marshall_UDSEntryList(Marshall *m) {
 				if(!o || !o->ptr)
 					continue;
 				void *ptr = o->ptr;
-				ptr = o->smoke->cast(ptr, o->classId, o->smoke->idClass("KIO::UDSAtom"));
-				cppsublist->append(*(KIO::UDSAtom*)ptr);
+				ptr = o->smoke->cast(ptr, o->classId, o->smoke->idClass("TDEIO::UDSAtom"));
+				cppsublist->append(*(TDEIO::UDSAtom*)ptr);
 			}
 			
 			cpplist->append(*cppsublist);
@@ -949,7 +949,7 @@ void marshall_UDSEntryList(Marshall *m) {
 	break;
 	case Marshall::ToVALUE:
 	{
-	  	KIO::UDSEntryList *valuelist = (KIO::UDSEntryList*)m->item().s_voidp;
+	  	TDEIO::UDSEntryList *valuelist = (TDEIO::UDSEntryList*)m->item().s_voidp;
 		if (!valuelist) {
 			*(m->var()) = Qnil;
 			break;
@@ -957,16 +957,16 @@ void marshall_UDSEntryList(Marshall *m) {
 
 		VALUE av = rb_ary_new();
 
-		int ix = m->smoke()->idClass("KIO::UDSAtom");
+		int ix = m->smoke()->idClass("TDEIO::UDSAtom");
 
-		for (	KIO::UDSEntryList::Iterator it = valuelist->begin();
+		for (	TDEIO::UDSEntryList::Iterator it = valuelist->begin();
 				it != valuelist->end();
 				++it ) 
 		{
-			KIO::UDSEntry * udsentry = &(*it);
+			TDEIO::UDSEntry * udsentry = &(*it);
 			VALUE subav = rb_ary_new();
 
-			for (	KIO::UDSEntry::Iterator it = udsentry->begin();
+			for (	TDEIO::UDSEntry::Iterator it = udsentry->begin();
 					it != udsentry->end();
 					++it ) 
 			{
@@ -978,7 +978,7 @@ void marshall_UDSEntryList(Marshall *m) {
 					o->classId = ix;
 					o->ptr = p;
 					o->allocated = false;
-					obj = set_obj_info("KIO::UDSAtom", o);
+					obj = set_obj_info("TDEIO::UDSAtom", o);
 				}
 				
 				rb_ary_push(subav, obj);
@@ -1197,13 +1197,13 @@ void marshall_ValueItemList(Marshall *m) {
         Marshall::HandlerFn marshall_##ListIdent = marshall_ValueItemList<Item,ItemList,Itr,ListIdent##STR>;
 
 #if TDE_VERSION >= 0x030200
-DEF_VALUELIST_MARSHALLER( ChoicesList, TQValueList<KConfigSkeleton::ItemEnum::Choice>, KConfigSkeleton::ItemEnum::Choice, TQValueList<KConfigSkeleton::ItemEnum::Choice>::Iterator )
+DEF_VALUELIST_MARSHALLER( ChoicesList, TQValueList<TDEConfigSkeleton::ItemEnum::Choice>, TDEConfigSkeleton::ItemEnum::Choice, TQValueList<TDEConfigSkeleton::ItemEnum::Choice>::Iterator )
 #endif
 DEF_VALUELIST_MARSHALLER( KAboutPersonList, TQValueList<KAboutPerson>, KAboutPerson, TQValueList<KAboutPerson>::Iterator )
 DEF_VALUELIST_MARSHALLER( KAboutTranslatorList, TQValueList<KAboutTranslator>, KAboutTranslator, TQValueList<KAboutTranslator>::Iterator )
-DEF_VALUELIST_MARSHALLER( KIOCopyInfoList, TQValueList<KIO::CopyInfo>, KIO::CopyInfo, TQValueList<KIO::CopyInfo>::Iterator )
+DEF_VALUELIST_MARSHALLER( KIOCopyInfoList, TQValueList<TDEIO::CopyInfo>, TDEIO::CopyInfo, TQValueList<TDEIO::CopyInfo>::Iterator )
 DEF_VALUELIST_MARSHALLER( KServiceOfferList, TQValueList<KServiceOffer>, KServiceOffer, TQValueList<KServiceOffer>::Iterator )
-DEF_VALUELIST_MARSHALLER( UDSEntry, TQValueList<KIO::UDSAtom>, KIO::UDSAtom, TQValueList<KIO::UDSAtom>::Iterator )
+DEF_VALUELIST_MARSHALLER( UDSEntry, TQValueList<TDEIO::UDSAtom>, TDEIO::UDSAtom, TQValueList<TDEIO::UDSAtom>::Iterator )
 
 template <class Key, class Value, class ItemMapIterator, const char *KeySTR, const char *ValueSTR >
 void marshall_Map(Marshall *m) {
@@ -1401,8 +1401,8 @@ TypeHandler KDE_handlers[] = {
 #if TDE_VERSION >= 0x030200
     { "KMountPoint::List", marshall_KMountPointList },
     { "KPluginInfo::List", marshall_KPluginInfoList },
-    { "TQValueList<KConfigSkeleton::ItemEnum::Choice>", marshall_ChoicesList },
-    { "TQValueList<KConfigSkeleton::ItemEnum::Choice>&", marshall_ChoicesList },
+    { "TQValueList<TDEConfigSkeleton::ItemEnum::Choice>", marshall_ChoicesList },
+    { "TQValueList<TDEConfigSkeleton::ItemEnum::Choice>&", marshall_ChoicesList },
 #endif
     { "KServiceType::List", marshall_KServiceTypeList },
     { "KTrader::OfferList", marshall_KTraderOfferList },
@@ -1424,9 +1424,9 @@ TypeHandler KDE_handlers[] = {
     { "KActionPtrList", marshall_KActionPtrList },
     { "TQValueList<KAboutPerson>", marshall_KAboutPersonList },
     { "TQValueList<KAboutTranslator>", marshall_KAboutTranslatorList },
-    { "TQValueList<KIO::CopyInfo>&", marshall_KIOCopyInfoList },
-	{ "KIO::UDSEntry&", marshall_UDSEntry },
-    { "KIO::UDSEntryList&", marshall_UDSEntryList },
+    { "TQValueList<TDEIO::CopyInfo>&", marshall_KIOCopyInfoList },
+	{ "TDEIO::UDSEntry&", marshall_UDSEntry },
+    { "TDEIO::UDSEntryList&", marshall_UDSEntryList },
     { "KServiceTypeProfile::OfferList", marshall_KServiceOfferList },
     { "KEntryMap", marshall_TQMapKEntryKeyKEntry },
     { "KEntryMap&", marshall_TQMapKEntryKeyKEntry },
diff --git a/korundum/rubylib/rbkconfig_compiler/README.dox b/korundum/rubylib/rbkconfig_compiler/README.dox
index e345c46a..5eb9bd17 100644
--- a/korundum/rubylib/rbkconfig_compiler/README.dox
+++ b/korundum/rubylib/rbkconfig_compiler/README.dox
@@ -91,9 +91,9 @@ The following options are read from the kcfgc file:
 <tr>
   <td><b>Inherits</b></td>
   <td>string</td>
-  <td>KConfigSkeleton</td>
+  <td>TDEConfigSkeleton</td>
   <td>Class the generated class inherits from. This class must inherit
-  KConfigSkeleton.</td>
+  TDEConfigSkeleton.</td>
 </tr>
 <tr>
   <td><b>Visibility</b></td>
@@ -139,7 +139,7 @@ The following options are read from the kcfgc file:
   <td><b>ItemAccessors</b></td>
   <td>bool</td>
   <td>false</td>
-  <td>Generate accessor functions for the KConfigSkeletonItem objects
+  <td>Generate accessor functions for the TDEConfigSkeletonItem objects
   corresponding to the configuration options. If <b>SetUserTexts</b> is set,
   <b>ItemAccessors</b> also has to be set.</td>
 </tr>
diff --git a/korundum/rubylib/rbkconfig_compiler/exampleprefs_base.kcfgc b/korundum/rubylib/rbkconfig_compiler/exampleprefs_base.kcfgc
index 829ec2e2..a9ac98dc 100644
--- a/korundum/rubylib/rbkconfig_compiler/exampleprefs_base.kcfgc
+++ b/korundum/rubylib/rbkconfig_compiler/exampleprefs_base.kcfgc
@@ -3,7 +3,7 @@ ClassName=ExamplePrefsBase
 #
 # Singleton=false
 #
-# Inherits=KConfigSkeleton
+# Inherits=TDEConfigSkeleton
 #
 # IncludeFiles=libtdepim/kpimprefs.h
 #
diff --git a/korundum/rubylib/rbkconfig_compiler/kcfg.xsd b/korundum/rubylib/rbkconfig_compiler/kcfg.xsd
index 61450d25..d505a514 100644
--- a/korundum/rubylib/rbkconfig_compiler/kcfg.xsd
+++ b/korundum/rubylib/rbkconfig_compiler/kcfg.xsd
@@ -29,7 +29,7 @@
     <xsd:annotation>
         <xsd:documentation>
             
-            A Schema for KDE's KConfigXT XML format. It is similar to the DTD
+            A Schema for KDE's TDEConfigXT XML format. It is similar to the DTD
             found at:
             
             http://www.kde.org/standards/kcfg/1.0/kcfg.dtd    
diff --git a/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp b/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp
index 9dd04565..c29cb838 100644
--- a/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp
+++ b/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp
@@ -802,7 +802,7 @@ TQString userTextsFunctions( CfgEntry *e, TQString itemVarStr=TQString::null, TQ
 int main( int argc, char **argv )
 {
   TDEAboutData aboutData( "rbkconfig_compiler", I18N_NOOP("TDE .kcfg compiler"), "0.3",
-    I18N_NOOP("Ruby KConfig Compiler") , TDEAboutData::License_LGPL );
+    I18N_NOOP("Ruby TDEConfig Compiler") , TDEAboutData::License_LGPL );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
   aboutData.addAuthor( "Waldo Bastian", 0, "bastian@kde.org" );
   aboutData.addAuthor( "Zack Rusin", 0, "zack@kde.org" );
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/test1.kcfgc b/korundum/rubylib/rbkconfig_compiler/tests/test1.kcfgc
index 3b74d7c5..ecab7b85 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/test1.kcfgc
+++ b/korundum/rubylib/rbkconfig_compiler/tests/test1.kcfgc
@@ -3,7 +3,7 @@ ClassName=Test1
 #
 # Singleton=false
 #
-# Inherits=KConfigSkeleton
+# Inherits=TDEConfigSkeleton
 #
 # IncludeFiles=libtdepim/kpimprefs.h
 #