summaryrefslogtreecommitdiffstats
path: root/languages/ruby
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:06:29 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:06:29 -0600
commitc0b24fe164924298d7e6ae33964b3c65fadbcba3 (patch)
tree2ba50375d78b077b266b224e4413150ef3e60a15 /languages/ruby
parent33d15e862e09fbcbb05e209f832414bd8a01291e (diff)
downloadtdevelop-c0b24fe164924298d7e6ae33964b3c65fadbcba3.tar.gz
tdevelop-c0b24fe164924298d7e6ae33964b3c65fadbcba3.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'languages/ruby')
-rw-r--r--languages/ruby/app_templates/kapp/README2
-rw-r--r--languages/ruby/app_templates/kxt/settings.kcfgc2
-rw-r--r--languages/ruby/app_templates/kxt/src-Makefile.am2
-rw-r--r--languages/ruby/debugger/debuggerpart.cpp2
-rw-r--r--languages/ruby/debugger/rdbcontroller.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/languages/ruby/app_templates/kapp/README b/languages/ruby/app_templates/kapp/README
index f7d35069..39de8b2f 100644
--- a/languages/ruby/app_templates/kapp/README
+++ b/languages/ruby/app_templates/kapp/README
@@ -46,7 +46,7 @@ http://developer.kde.org/documentation/tutorials/xmlui/preface.html
them more maintainable.
For more details, consult :
-http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html
+http://developer.kde.org/documentation/tutorials/tdeconfigxt/tdeconfigxt.html
* With KParts, you can embed other kde components in your program, or make your program
embeddable in other apps. For example, the kmplayer kpart can be called to play videos
diff --git a/languages/ruby/app_templates/kxt/settings.kcfgc b/languages/ruby/app_templates/kxt/settings.kcfgc
index 384510cd..402fad09 100644
--- a/languages/ruby/app_templates/kxt/settings.kcfgc
+++ b/languages/ruby/app_templates/kxt/settings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=%{APPNAMELC}.kcfg
ClassName=Settings
Singleton=true
diff --git a/languages/ruby/app_templates/kxt/src-Makefile.am b/languages/ruby/app_templates/kxt/src-Makefile.am
index 6351533d..1e51351e 100644
--- a/languages/ruby/app_templates/kxt/src-Makefile.am
+++ b/languages/ruby/app_templates/kxt/src-Makefile.am
@@ -41,7 +41,7 @@ rubyuidir = $(kde_datadir)/%{APPNAMELC}
%.rb: %.ui
$(RBUIC) -tr ${UIC_TR} -kde $< -o $@
-RBKCONFIG_COMPILER = rbkconfig_compiler
+RBKCONFIG_COMPILER = rbtdeconfig_compiler
settings.rb: %{APPNAMELC}.kcfg settings.kcfgc
$(RBKCONFIG_COMPILER) ./%{APPNAMELC}.kcfg ./settings.kcfgc
diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp
index 091649e1..3daefeff 100644
--- a/languages/ruby/debugger/debuggerpart.cpp
+++ b/languages/ruby/debugger/debuggerpart.cpp
@@ -25,7 +25,7 @@
#include <kaction.h>
#include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kdevgenericfactory.h>
#include <kiconloader.h>
#include <klocale.h>
diff --git a/languages/ruby/debugger/rdbcontroller.cpp b/languages/ruby/debugger/rdbcontroller.cpp
index 278d0ff2..5f1aacfe 100644
--- a/languages/ruby/debugger/rdbcontroller.cpp
+++ b/languages/ruby/debugger/rdbcontroller.cpp
@@ -38,7 +38,7 @@
#include "settings.h"
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kglobal.h>
#include <klocale.h>