diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:20:12 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:20:12 -0600 |
| commit | 67e97e92622b5f6bab7ad6aa2e188bdcf6e4428d (patch) | |
| tree | 07b85c0ecb70077c87f3b52207393a92c180f413 /korundum | |
| parent | ae2858133ebe92da16e5aab05f0b138de7cf514c (diff) | |
| download | tdebindings-67e97e92622b5f6bab7ad6aa2e188bdcf6e4428d.tar.gz tdebindings-67e97e92622b5f6bab7ad6aa2e188bdcf6e4428d.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'korundum')
| -rw-r--r-- | korundum/rubylib/examples/xmlmenudemo.rb | 2 | ||||
| -rw-r--r-- | korundum/rubylib/korundum/kdehandlers.cpp | 4 | ||||
| -rwxr-xr-x | korundum/rubylib/rbtdeconfig_compiler/checkkcfg.pl | 6 |
3 files changed, 6 insertions, 6 deletions
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; |