Rename a number of libraries and executables to avoid conflicts with KDE4

2 files changed, 15 insertions, 15 deletions

diff --git a/qtruby/ChangeLog b/qtruby/ChangeLog
index 2c5b3013..1b276ab5 100644
--- a/qtruby/ChangeLog
+++ b/qtruby/ChangeLog
@@ -493,7 +493,7 @@
 
 2005-01-27  Richard Dale  <[email protected]>
 
-	* Made some changes to get code generated by the rbkconfig_compiler
+	* Made some changes to get code generated by the rbtdeconfig_compiler
 	  to work. When an argument is a non-const reference to a primitive 
 	  type, or a TQString or TQStringList, then don't delete it after the
 	  method call. This is because a class like TDEConfigSkeleton takes
@@ -510,7 +510,7 @@
 
 	* rbuic was giving widgets names containing a '@' to match the ruby instance variable
 	  name. However, this doesn't work with KDE::ConfigDialog which expects the names to
-	  match the ones generated in a KDE::ConfigSkeleton by rbkconfig_compiler so '@' is no
+	  match the ones generated in a KDE::ConfigSkeleton by rbtdeconfig_compiler so '@' is no
 	  longer added.
 
 2005-01-20  Richard Dale  <[email protected]>
diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp
index 90cd759e..ac48ce88 100644
--- a/qtruby/rubylib/qtruby/Qt.cpp
+++ b/qtruby/rubylib/qtruby/Qt.cpp
@@ -110,9 +110,9 @@ VALUE qt_internal_module = Qnil;
 VALUE qt_base_class = Qnil;
 VALUE qmetaobject_class = Qnil;
 VALUE qvariant_class = Qnil;
-VALUE kconfigskeleton_class = Qnil;
-VALUE kconfigskeleton_itemenum_class = Qnil;
-VALUE kconfigskeleton_itemenum_choice_class = Qnil;
+VALUE tdeconfigskeleton_class = Qnil;
+VALUE tdeconfigskeleton_itemenum_class = Qnil;
+VALUE tdeconfigskeleton_itemenum_choice_class = Qnil;
 VALUE kio_udsatom_class = Qnil;
 VALUE twin_class = Qnil;
 VALUE konsole_part_class = Qnil;
@@ -123,7 +123,7 @@ bool application_terminated = false;
 void rb_str_catf_1(VALUE self, const char *format, ...) __attribute__ ((format (printf, 2, 3)));
 
 static VALUE (*_new_kde)(int, VALUE *, VALUE) = 0;
-static VALUE (*_kconfigskeletonitem_immutable)(VALUE) = 0;
+static VALUE (*_tdeconfigskeletonitem_immutable)(VALUE) = 0;
 
 Smoke::Index _current_method = 0;
 
@@ -2675,14 +2675,14 @@ static TQRegExp * scope_op = 0;
 	 }
 
 	if (packageName.startsWith("KDE::ConfigSkeleton::ItemEnum::")) {
-		klass = rb_define_class_under(kconfigskeleton_itemenum_class, package+strlen("KDE::ConfigSkeleton::EnumItem::"), base_class);
+		klass = rb_define_class_under(tdeconfigskeleton_itemenum_class, package+strlen("KDE::ConfigSkeleton::EnumItem::"), base_class);
 		rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1);
-		kconfigskeleton_itemenum_choice_class = klass;
+		tdeconfigskeleton_itemenum_choice_class = klass;
 	} else if (packageName.startsWith("KDE::ConfigSkeleton::")) {
-		klass = rb_define_class_under(kconfigskeleton_class, package+strlen("KDE::ConfigSkeleton::"), base_class);
+		klass = rb_define_class_under(tdeconfigskeleton_class, package+strlen("KDE::ConfigSkeleton::"), base_class);
 		rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1);
-		rb_define_method(klass, "immutable?", (VALUE (*) (...)) _kconfigskeletonitem_immutable, 0);
-		rb_define_method(klass, "isImmutable", (VALUE (*) (...)) _kconfigskeletonitem_immutable, 0);
+		rb_define_method(klass, "immutable?", (VALUE (*) (...)) _tdeconfigskeletonitem_immutable, 0);
+		rb_define_method(klass, "isImmutable", (VALUE (*) (...)) _tdeconfigskeletonitem_immutable, 0);
 	} else if (packageName.startsWith("KDE::Win::")) {
 		klass = rb_define_class_under(twin_class, package+strlen("KDE::Win::"), base_class);
 		rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1);
@@ -2867,12 +2867,12 @@ set_new_kde(VALUE (*new_kde) (int, VALUE *, VALUE))
 }
 
 void
-set_kconfigskeletonitem_immutable(VALUE (*kconfigskeletonitem_immutable) (VALUE))
+set_tdeconfigskeletonitem_immutable(VALUE (*tdeconfigskeletonitem_immutable) (VALUE))
 {
-	_kconfigskeletonitem_immutable = kconfigskeletonitem_immutable;
+	_tdeconfigskeletonitem_immutable = tdeconfigskeletonitem_immutable;
 
-	kconfigskeleton_class = rb_define_class_under(kde_module, "ConfigSkeleton", qt_base_class);
-	kconfigskeleton_itemenum_class = rb_define_class_under(kconfigskeleton_class, "ItemEnum", qt_base_class);
+	tdeconfigskeleton_class = rb_define_class_under(kde_module, "ConfigSkeleton", qt_base_class);
+	tdeconfigskeleton_itemenum_class = rb_define_class_under(tdeconfigskeleton_class, "ItemEnum", qt_base_class);
 }
 
 static VALUE