From 67e97e92622b5f6bab7ad6aa2e188bdcf6e4428d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:20:12 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 korundum/rubylib/examples/xmlmenudemo.rb           | 2 +-
 korundum/rubylib/korundum/kdehandlers.cpp          | 4 ++--
 korundum/rubylib/rbtdeconfig_compiler/checkkcfg.pl | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'korundum')

diff --git a/korundum/rubylib/examples/xmlmenudemo.rb b/korundum/rubylib/examples/xmlmenudemo.rb
index fbdb51fb..8d9d5c94 100644
--- a/korundum/rubylib/examples/xmlmenudemo.rb
+++ b/korundum/rubylib/examples/xmlmenudemo.rb
@@ -173,7 +173,7 @@ class MainWin < KDE::MainWindow
         # in the rc file
 
         # Just fake some filenames for now
-        fakeFiles = ["kaction.sip", "kxmlguiclient.sip"]
+        fakeFiles = ["tdeaction.sip", "kxmlguiclient.sip"]
 
         # Clear the old entries, so we don't end up accumulating entries in the menu
         unplugActionList("recent");
diff --git a/korundum/rubylib/korundum/kdehandlers.cpp b/korundum/rubylib/korundum/kdehandlers.cpp
index bf2107ce..7236fc9b 100644
--- a/korundum/rubylib/korundum/kdehandlers.cpp
+++ b/korundum/rubylib/korundum/kdehandlers.cpp
@@ -27,12 +27,12 @@
 #include <kservicegroup.h>
 #include <kservice.h>
 #include <tdesycocatype.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tdefile.h>
 #include <tdefileview.h>
 #include <kurl.h>
 #include <kcmdlineargs.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdockwidget.h>
 #include <tdefiletreebranch.h>
 #include <tdefiletreeviewitem.h>
diff --git a/korundum/rubylib/rbtdeconfig_compiler/checkkcfg.pl b/korundum/rubylib/rbtdeconfig_compiler/checkkcfg.pl
index 26b12bad..8d066b81 100755
--- a/korundum/rubylib/rbtdeconfig_compiler/checkkcfg.pl
+++ b/korundum/rubylib/rbtdeconfig_compiler/checkkcfg.pl
@@ -24,12 +24,12 @@ if ( system( $cmd ) != 0 ) {
   exit 1;
 }
 
-chectdefile( $file_h );
-chectdefile( $file_cpp );
+checkfile( $file_h );
+checkfile( $file_cpp );
 
 exit 0;
 
-sub chectdefile()
+sub checkfile()
 {
   my $file = shift;
 
-- 
cgit v1.2.1