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

7 files changed, 24 insertions, 24 deletions

diff --git a/korundum/bin/Makefile.am b/korundum/bin/Makefile.am
index 4c3e637c..69813941 100644
--- a/korundum/bin/Makefile.am
+++ b/korundum/bin/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
 
 bin_PROGRAMS = krubyinit
-krubyinit_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/kde/ -L$(RUBY_LIBDIR) -lkmdi -lknewstuff
+krubyinit_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/kde/ -L$(RUBY_LIBDIR) -ltdemdi -lknewstuff
 krubyinit_METASOURCES = AUTO
 krubyinit_SOURCES = krubyinit.cpp
 krubyinit_LDADD = $(LIB_KDE) $(RUBY_LIBRUBYARG) $(top_builddir)/smoke/kde/libsmokekde.la $(top_builddir)/qtruby/rubylib/qtruby/libqtrubyinternal.la
diff --git a/korundum/rubylib/examples/RubberDoc.rb b/korundum/rubylib/examples/RubberDoc.rb
index 1b196999..a5cc35cb 100755
--- a/korundum/rubylib/examples/RubberDoc.rb
+++ b/korundum/rubylib/examples/RubberDoc.rb
@@ -183,7 +183,7 @@ module MyGui
       TQt::Object.connect @listbox,  SIGNAL("clicked(TQListBoxItem*)"),
                          self,      SLOT("clicked_result(TQListBoxItem*)")
       TQt::Object.connect @viewed,   SIGNAL("completed()"),
-                         self,      SLOT("khtml_part_init_complete()")
+                         self,      SLOT("tdehtml_part_init_complete()")
 
       TQt::Object::connect @viewed,  SIGNAL("setWindowCaption(const TQString&)"),
                           @viewed.widget.topLevelWidget, 
@@ -501,7 +501,7 @@ module HTMLIndexer
 
 end
 
-# TODO - this sucks, use khtml to get the values
+# TODO - this sucks, use tdehtml to get the values
 module IDS
    A     = 1
    META  = 62
@@ -865,7 +865,7 @@ end
 
 class RubberDoc < TQt::VBox
 
-   slots "khtml_part_init_complete()", 
+   slots "tdehtml_part_init_complete()", 
          "go_back()", "go_forward()", "go_home()", "goto_url()", 
          "goto_search()", "clicked_result(TQListBoxItem*)",
          "search(const TQString&)", "update_highlight()",
@@ -926,20 +926,20 @@ class RubberDoc < TQt::VBox
    def blah_blah
       save_indexes
       init_blah
-      khtml_part_init_complete
+      tdehtml_part_init_complete
    end
 
    def quit
       @main.close
    end
 
-   def khtml_part_init_complete
+   def tdehtml_part_init_complete
       TQt::Object.disconnect @viewed,   SIGNAL("completed()"),
-                            self,      SLOT("khtml_part_init_complete()") if @init_connected
+                            self,      SLOT("tdehtml_part_init_complete()") if @init_connected
 
       @pref = File.dirname first_url.url.gsub("file:","")
 
-      init_khtml_part_settings @viewed if @init_connected
+      init_tdehtml_part_settings @viewed if @init_connected
       index_documents
 
       # maybe make a better choice as to the start page???
@@ -959,11 +959,11 @@ class RubberDoc < TQt::VBox
       save_indexes
    end
 
-   def init_khtml_part_settings khtmlpart
-      khtmlpart.setJScriptEnabled true
-      khtmlpart.setJavaEnabled    false
-      khtmlpart.setPluginsEnabled false
-      khtmlpart.setAutoloadImages false
+   def init_tdehtml_part_settings tdehtmlpart
+      tdehtmlpart.setJScriptEnabled true
+      tdehtmlpart.setJavaEnabled    false
+      tdehtmlpart.setPluginsEnabled false
+      tdehtmlpart.setAutoloadImages false
    end
 
    def load_page
@@ -1248,7 +1248,7 @@ can't get tabwidget working. umm... wonder what i'm messing up... (RECHECK)
  
 # possible BUG DOM::Text.new(node).data.string # strange that this one doesn't work... (RECHECK)
 
-wierd khtml bug
+wierd tdehtml bug
       @rightpane.setResizeMode @viewed, TQt::Splitter::KeepSize
 
 in order to use KURL's as constants one must place this TDEApplication init 
diff --git a/korundum/rubylib/examples/uikmdi.rb b/korundum/rubylib/examples/uitdemdi.rb
index e73422eb..3b67b9e1 100644
--- a/korundum/rubylib/examples/uikmdi.rb
+++ b/korundum/rubylib/examples/uitdemdi.rb
@@ -8,7 +8,7 @@ related to KMDI, and not the bindings.
 =begin
 A rough Python translation of the ideas presented in this KMDI tutorial:
 
-    http://web.tiscali.it/andreabergia/kmditutorial.html
+    http://web.tiscali.it/andreabergia/tdemditutorial.html
 
 What does work:
 
@@ -58,7 +58,7 @@ class KmdiExample < KDE::MdiMainFrm
         quitAction = StdAction.quit(self, SLOT('close()'), actionCollection())
         closeAction = StdAction.close(self, SLOT('closeActiveChild()'), actionCollection())
     	
-		uifilebase = Dir.getwd + '/uikmdi.rc'
+		uifilebase = Dir.getwd + '/uitdemdi.rc'
         createGUI(uifilebase)
 		# The task bar is created in the KMdiMainFrm constructor
 		# and then deleted in the createGUI() call above..
@@ -167,7 +167,7 @@ class KmdiExample < KDE::MdiMainFrm
 end
 
 if $0 == __FILE__
-    aname = 'uikmdi'
+    aname = 'uitdemdi'
     desc = 'A Simple Korundum KMDI Sample'
     ver = '1.0'
     lic = AboutData::License_GPL
diff --git a/korundum/rubylib/examples/uikmdi.rc b/korundum/rubylib/examples/uitdemdi.rc
index a7e21969..a7e21969 100644
--- a/korundum/rubylib/examples/uikmdi.rc
+++ b/korundum/rubylib/examples/uitdemdi.rc
diff --git a/korundum/rubylib/korundum/Korundum.cpp b/korundum/rubylib/korundum/Korundum.cpp
index c07c29c5..c6c9a548 100644
--- a/korundum/rubylib/korundum/Korundum.cpp
+++ b/korundum/rubylib/korundum/Korundum.cpp
@@ -30,7 +30,7 @@
 #include <kconfigskeleton.h>
 #endif
 #include <kio/global.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <kde_terminal_interface.h>
 
 #include <ruby.h>
@@ -916,8 +916,8 @@ extern VALUE qt_internal_module;
 extern VALUE qt_base_class;
 extern VALUE kde_module;
 extern VALUE kio_module;
-extern VALUE kparts_module;
-extern VALUE khtml_module;
+extern VALUE tdeparts_module;
+extern VALUE tdehtml_module;
 
 VALUE
 getdcopinfo(VALUE self, TQString & signalname)
diff --git a/korundum/rubylib/korundum/kdehandlers.cpp b/korundum/rubylib/korundum/kdehandlers.cpp
index 1e4eb3a4..fa696791 100644
--- a/korundum/rubylib/korundum/kdehandlers.cpp
+++ b/korundum/rubylib/korundum/kdehandlers.cpp
@@ -26,7 +26,7 @@
 #include <ktrader.h>
 #include <kservicegroup.h>
 #include <kservice.h>
-#include <ksycocatype.h>
+#include <tdesycocatype.h>
 #include <kmainwindow.h>
 #include <kfile.h>
 #include <kfileview.h>
@@ -36,8 +36,8 @@
 #include <kdockwidget.h>
 #include <kfiletreebranch.h>
 #include <kfiletreeviewitem.h>
-#include <khtml_part.h>
-#include <kparts/plugin.h>
+#include <tdehtml_part.h>
+#include <tdeparts/plugin.h>
 #include <kuserprofile.h>
 #include <kaboutdata.h>
 #include <karchive.h>
diff --git a/korundum/rubylib/rbkconfig_compiler/Makefile.am b/korundum/rubylib/rbkconfig_compiler/Makefile.am
index 7b5bd663..276e32f7 100644
--- a/korundum/rubylib/rbkconfig_compiler/Makefile.am
+++ b/korundum/rubylib/rbkconfig_compiler/Makefile.am
@@ -12,7 +12,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
 
 bin_PROGRAMS = rbkconfig_compiler
 
-rbkconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+rbkconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 rbkconfig_compiler_LDADD = $(LIB_TDECORE)
 rbkconfig_compiler_SOURCES = rbkconfig_compiler.cpp