From 24b85b785334e8436c975a4323fcbb75d61f6e72 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:31:43 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 qtruby/rubylib/qtruby/Qt.cpp           | 6 +++---
 qtruby/rubylib/qtruby/handlers.cpp     | 2 +-
 qtruby/rubylib/qtruby/lib/Qt/qtruby.rb | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'qtruby/rubylib/qtruby')

diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp
index b264d446..ad0241fc 100644
--- a/qtruby/rubylib/qtruby/Qt.cpp
+++ b/qtruby/rubylib/qtruby/Qt.cpp
@@ -2698,10 +2698,10 @@ static TQRegExp * scope_op = 0;
 	} else if (packageName.startsWith("KNS::")) {
 		klass = rb_define_class_under(kns_module, package+strlen("KNS::"), base_class);
 		rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1);
-	} else if (packageName.startsWith("KIO::")) {
-		klass = rb_define_class_under(kio_module, package+strlen("KIO::"), base_class);
+	} else if (packageName.startsWith("TDEIO::")) {
+		klass = rb_define_class_under(kio_module, package+strlen("TDEIO::"), base_class);
 		rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1);
-		if (packageName == "KIO::UDSAtom") {
+		if (packageName == "TDEIO::UDSAtom") {
 			kio_udsatom_class = klass;
 		}
 	} else if (packageName.startsWith("DOM::")) {
diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp
index 46afca59..f56884ad 100644
--- a/qtruby/rubylib/qtruby/handlers.cpp
+++ b/qtruby/rubylib/qtruby/handlers.cpp
@@ -1908,7 +1908,7 @@ TypeHandler Qt_handlers[] = {
     { "TTQ_INT64&", marshall_longlong },
     { "TTQ_LLONG", marshall_longlong },
     { "TTQ_LLONG&", marshall_longlong },
-    { "KIO::filesize_t", marshall_longlong },
+    { "TDEIO::filesize_t", marshall_longlong },
     { "DOM::DOMTimeStamp", marshall_ulonglong },
     { "unsigned long long int", marshall_ulonglong },
     { "unsigned long long int&", marshall_ulonglong },
diff --git a/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb b/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb
index a8bb72a0..d0fd9783 100644
--- a/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb
+++ b/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb
@@ -1353,7 +1353,7 @@ module Qt
 				now = classname.sub(/^Qext(?=[A-Z])/,'Qext::')
 			elsif classname =~ /^Q/
 				now = classname.sub(/^Q(?=[A-Z])/,'TQt::')
-			elsif classname =~ /^(KConfigSkeleton|KWin)::/
+			elsif classname =~ /^(TDEConfigSkeleton|KWin)::/
 				now = classname.sub(/^K?(?=[A-Z])/,'KDE::')
 			elsif classname !~ /::/
 				now = classname.sub(/^K?(?=[A-Z])/,'KDE::')
@@ -1511,7 +1511,7 @@ module Qt
 			
 			if method == "new"
 				method = classname.dup 
-				method.gsub!(/^(KParts|KIO|KNS|DOM|Kontact|Kate|KTextEditor|KConfigSkeleton::ItemEnum|KConfigSkeleton|KWin)::/,"")
+				method.gsub!(/^(KParts|KIO|KNS|DOM|Kontact|Kate|KTextEditor|TDEConfigSkeleton::ItemEnum|TDEConfigSkeleton|KWin)::/,"")
 			end
 			method = "operator" + method.sub("@","") if method !~ /[a-zA-Z]+/
 			# Change foobar= to setFoobar()					
-- 
cgit v1.2.3