summaryrefslogtreecommitdiffstats
path: root/korundum
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:53 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:53 -0600
commit545706afdcf29b8f584e78275452cca715e284db (patch)
treefdbfaa34f2d633372ba4ab3e46d22cf10f38b40b /korundum
parent9d4971a2ffb5be9c6fc1b6d6bc74020c37fb2169 (diff)
downloadtdebindings-545706afdcf29b8f584e78275452cca715e284db.tar.gz
tdebindings-545706afdcf29b8f584e78275452cca715e284db.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'korundum')
-rw-r--r--korundum/ChangeLog12
-rw-r--r--korundum/rubylib/Makefile.am2
-rw-r--r--korundum/rubylib/korundum/Korundum.cpp16
-rw-r--r--korundum/rubylib/korundum/kdehandlers.cpp12
-rw-r--r--korundum/rubylib/rbkconfig_compiler/Makefile.am28
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/Makefile.am28
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/README.dox (renamed from korundum/rubylib/rbkconfig_compiler/README.dox)4
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/TODO (renamed from korundum/rubylib/rbkconfig_compiler/TODO)0
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/autoexample.rb (renamed from korundum/rubylib/rbkconfig_compiler/autoexample.rb)0
-rwxr-xr-xkorundum/rubylib/rbtdeconfig_compiler/checkkcfg.pl (renamed from korundum/rubylib/rbkconfig_compiler/checkkcfg.pl)10
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/example.kcfg (renamed from korundum/rubylib/rbkconfig_compiler/example.kcfg)0
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/example.rb (renamed from korundum/rubylib/rbkconfig_compiler/example.rb)0
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/exampleprefs_base.kcfgc (renamed from korundum/rubylib/rbkconfig_compiler/exampleprefs_base.kcfgc)2
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/general_base.ui (renamed from korundum/rubylib/rbkconfig_compiler/general_base.ui)0
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/kcfg.xsd (renamed from korundum/rubylib/rbkconfig_compiler/kcfg.xsd)0
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/myoptions_base.ui (renamed from korundum/rubylib/rbkconfig_compiler/myoptions_base.ui)0
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/rbtdeconfig_compiler.cpp (renamed from korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp)14
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/tests/Makefile.am (renamed from korundum/rubylib/rbkconfig_compiler/tests/Makefile.am)20
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/tests/myprefs.rb (renamed from korundum/rubylib/rbkconfig_compiler/tests/myprefs.rb)0
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/tests/test1.kcfg (renamed from korundum/rubylib/rbkconfig_compiler/tests/test1.kcfg)0
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/tests/test1.kcfgc (renamed from korundum/rubylib/rbkconfig_compiler/tests/test1.kcfgc)2
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/tests/test1main.rb (renamed from korundum/rubylib/rbkconfig_compiler/tests/test1main.rb)0
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/tests/test2.kcfg (renamed from korundum/rubylib/rbkconfig_compiler/tests/test2.kcfg)0
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/tests/test2.kcfgc (renamed from korundum/rubylib/rbkconfig_compiler/tests/test2.kcfgc)2
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/tests/test2main.rb (renamed from korundum/rubylib/rbkconfig_compiler/tests/test2main.rb)0
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/tests/test3.kcfg (renamed from korundum/rubylib/rbkconfig_compiler/tests/test3.kcfg)0
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/tests/test3.kcfgc (renamed from korundum/rubylib/rbkconfig_compiler/tests/test3.kcfgc)2
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/tests/test3main.rb (renamed from korundum/rubylib/rbkconfig_compiler/tests/test3main.rb)0
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/tests/test4.kcfg (renamed from korundum/rubylib/rbkconfig_compiler/tests/test4.kcfg)0
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/tests/test4.kcfgc (renamed from korundum/rubylib/rbkconfig_compiler/tests/test4.kcfgc)2
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/tests/test4main.rb (renamed from korundum/rubylib/rbkconfig_compiler/tests/test4main.rb)0
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/tests/test5.kcfg (renamed from korundum/rubylib/rbkconfig_compiler/tests/test5.kcfg)0
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/tests/test5.kcfgc (renamed from korundum/rubylib/rbkconfig_compiler/tests/test5.kcfgc)2
-rw-r--r--korundum/rubylib/rbtdeconfig_compiler/tests/test5main.rb (renamed from korundum/rubylib/rbkconfig_compiler/tests/test5main.rb)0
34 files changed, 79 insertions, 79 deletions
diff --git a/korundum/ChangeLog b/korundum/ChangeLog
index 7a715f39..3e60a6d6 100644
--- a/korundum/ChangeLog
+++ b/korundum/ChangeLog
@@ -135,7 +135,7 @@
2005-04-03 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
* Added some #ifdefs so the bindings build with KDE 3.1.x
- * Fixed problem with rbkconfig_compile Makefile.am
+ * Fixed problem with rbtdeconfig_compile Makefile.am
2005-03-30 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
@@ -150,7 +150,7 @@
2005-01-27 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
- * Added some fixes for the rbkconfig_compiler code generation and
+ * Added some fixes for the rbtdeconfig_compiler code generation and
example code.
* The method 'isImmutable' is added to KDE::ConfigSkeletonItems
as a special case - it's missing from the Smoke runtime as it's
@@ -158,12 +158,12 @@
2005-01-26 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
- * Translated the rbkconfig_compiler examples from C++ to ruby,
+ * Translated the rbtdeconfig_compiler examples from C++ to ruby,
and improved the build rules in the Makefile.ams
2005-01-20 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
- * The rbkconfig_compiler now uses TQt::Variants to hold the values in KDE::ConfigSkeleton
+ * The rbtdeconfig_compiler now uses TQt::Variants to hold the values in KDE::ConfigSkeleton
instance variables.
* The values of the KDE::ConfigSkeletonItems are then set as properties with the TQt::Variants.
It wasn't possible to handle references to primitive types such as 'int&' via ruby, so properties are
@@ -172,13 +172,13 @@
2005-01-20 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
- * Tidied up the rbkconfig_compiler code
+ * Tidied up the rbtdeconfig_compiler code
* Added marshaller for TDEConfigSkeleton::ItemEnum::Choice lists to and from ruby Arrays,
and accessor methods for the Item::Enum::Choice struct.
2005-01-18 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
- * Added rbkconfig_compiler for compiling .kcfg files to ruby
+ * Added rbtdeconfig_compiler for compiling .kcfg files to ruby
2004-12-29 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
diff --git a/korundum/rubylib/Makefile.am b/korundum/rubylib/Makefile.am
index 754d1b00..aea0db81 100644
--- a/korundum/rubylib/Makefile.am
+++ b/korundum/rubylib/Makefile.am
@@ -1 +1 @@
-SUBDIRS = korundum rbkconfig_compiler
+SUBDIRS = korundum rbtdeconfig_compiler
diff --git a/korundum/rubylib/korundum/Korundum.cpp b/korundum/rubylib/korundum/Korundum.cpp
index c6c9a548..24fedc82 100644
--- a/korundum/rubylib/korundum/Korundum.cpp
+++ b/korundum/rubylib/korundum/Korundum.cpp
@@ -27,9 +27,9 @@
#include <kapplication.h>
#include <kurl.h>
#if TDE_VERSION >= 0x030200
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
#endif
-#include <kio/global.h>
+#include <tdeio/global.h>
#include <tdeparts/browserextension.h>
#include <kde_terminal_interface.h>
@@ -52,8 +52,8 @@
extern "C" {
extern VALUE qt_internal_module;
-extern VALUE kconfigskeleton_class;
-extern VALUE kconfigskeleton_itemenum_choice_class;
+extern VALUE tdeconfigskeleton_class;
+extern VALUE tdeconfigskeleton_itemenum_choice_class;
extern VALUE kio_udsatom_class;
extern VALUE konsole_part_class;
extern VALUE set_obj_info(const char * className, smokeruby_object * o);
@@ -907,7 +907,7 @@ public:
extern "C" {
extern void Init_qtruby();
extern void set_new_kde(VALUE (*new_kde) (int, VALUE *, VALUE));
-extern void set_kconfigskeletonitem_immutable(VALUE (*kconfigskeletonitem_immutable) (VALUE));
+extern void set_tdeconfigskeletonitem_immutable(VALUE (*tdeconfigskeletonitem_immutable) (VALUE));
extern void set_kde_resolve_classname(const char * (*kde_resolve_classname) (Smoke*, int, void *));
extern const char * kde_resolve_classname(Smoke* smoke, int classId, void * ptr);
extern VALUE new_qt(int argc, VALUE * argv, VALUE klass);
@@ -1054,7 +1054,7 @@ new_kde(int argc, VALUE * argv, VALUE klass)
#if TDE_VERSION >= 0x030200
static VALUE
-kconfigskeletonitem_immutable(VALUE self)
+tdeconfigskeletonitem_immutable(VALUE self)
{
smokeruby_object *o = value_obj_info(self);
TDEConfigSkeletonItem * item = (TDEConfigSkeletonItem *) o->ptr;
@@ -1156,7 +1156,7 @@ Init_korundum()
set_new_kde(new_kde);
#if TDE_VERSION >= 0x030200
- set_kconfigskeletonitem_immutable(kconfigskeletonitem_immutable);
+ set_tdeconfigskeletonitem_immutable(tdeconfigskeletonitem_immutable);
#endif
set_kde_resolve_classname(kde_resolve_classname);
@@ -1174,7 +1174,7 @@ Init_korundum()
rb_define_singleton_method(kde_module, "dcop_send", (VALUE (*) (...)) dcop_send, -1);
#if TDE_VERSION >= 0x030200
- rb_define_method(kconfigskeleton_class, "addItem", (VALUE (*) (...)) config_additem, -1);
+ rb_define_method(tdeconfigskeleton_class, "addItem", (VALUE (*) (...)) config_additem, -1);
#endif
rb_define_method(konsole_part_class, "startProgram", (VALUE (*) (...)) konsole_part_startprogram, 2);
diff --git a/korundum/rubylib/korundum/kdehandlers.cpp b/korundum/rubylib/korundum/kdehandlers.cpp
index fa696791..56d7d11b 100644
--- a/korundum/rubylib/korundum/kdehandlers.cpp
+++ b/korundum/rubylib/korundum/kdehandlers.cpp
@@ -28,25 +28,25 @@
#include <kservice.h>
#include <tdesycocatype.h>
#include <kmainwindow.h>
-#include <kfile.h>
-#include <kfileview.h>
+#include <tdefile.h>
+#include <tdefileview.h>
#include <kurl.h>
#include <kcmdlineargs.h>
#include <kaction.h>
#include <kdockwidget.h>
-#include <kfiletreebranch.h>
-#include <kfiletreeviewitem.h>
+#include <tdefiletreebranch.h>
+#include <tdefiletreeviewitem.h>
#include <tdehtml_part.h>
#include <tdeparts/plugin.h>
#include <kuserprofile.h>
#include <kaboutdata.h>
#include <karchive.h>
#if TDE_VERSION >= 0x030200
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
#include <kplugininfo.h>
#include <kmountpoint.h>
#endif
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
#include <dom/dom_node.h>
#include <dom/dom_element.h>
#include <dom/dom_string.h>
diff --git a/korundum/rubylib/rbkconfig_compiler/Makefile.am b/korundum/rubylib/rbkconfig_compiler/Makefile.am
deleted file mode 100644
index 276e32f7..00000000
--- a/korundum/rubylib/rbkconfig_compiler/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-SUBDIRS = . tests
-
-RBUIC=rbuic
-
-.ui.rb:
- $(RBUIC) -tr ${UIC_TR} -kde $*.ui -o $@
-
-exampleprefs_base.rb: $(srcdir)/example.kcfg rbkconfig_compiler $(srcdir)/exampleprefs_base.kcfgc
- ./rbkconfig_compiler $(srcdir)/example.kcfg $(srcdir)/exampleprefs_base.kcfgc
-
-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) -ltdetexteditor
-rbkconfig_compiler_LDADD = $(LIB_TDECORE)
-rbkconfig_compiler_SOURCES = rbkconfig_compiler.cpp
-
-METASOURCES = AUTO
-
-TESTFILES = test1.kcfg test2.kcfg test3.kcfg test4.kcfg test5.kcfg
-
-check-local:
- for i in $(TESTFILES); \
- do xmllint --noout --schema $(srcdir)/kcfg.xsd $(srcdir)/tests/$$i; \
- perl $(top_srcdir)/korundum/rubylib/rbkconfig_compiler/checkkcfg.pl \
- $(top_srcdir)/korundum/rubylib/rbkconfig_compiler/tests/$$i; done
-
diff --git a/korundum/rubylib/rbtdeconfig_compiler/Makefile.am b/korundum/rubylib/rbtdeconfig_compiler/Makefile.am
new file mode 100644
index 00000000..8931f18a
--- /dev/null
+++ b/korundum/rubylib/rbtdeconfig_compiler/Makefile.am
@@ -0,0 +1,28 @@
+SUBDIRS = . tests
+
+RBUIC=rbuic
+
+.ui.rb:
+ $(RBUIC) -tr ${UIC_TR} -kde $*.ui -o $@
+
+exampleprefs_base.rb: $(srcdir)/example.kcfg rbtdeconfig_compiler $(srcdir)/exampleprefs_base.kcfgc
+ ./rbtdeconfig_compiler $(srcdir)/example.kcfg $(srcdir)/exampleprefs_base.kcfgc
+
+AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
+
+bin_PROGRAMS = rbtdeconfig_compiler
+
+rbtdeconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+rbtdeconfig_compiler_LDADD = $(LIB_TDECORE)
+rbtdeconfig_compiler_SOURCES = rbtdeconfig_compiler.cpp
+
+METASOURCES = AUTO
+
+TESTFILES = test1.kcfg test2.kcfg test3.kcfg test4.kcfg test5.kcfg
+
+check-local:
+ for i in $(TESTFILES); \
+ do xmllint --noout --schema $(srcdir)/kcfg.xsd $(srcdir)/tests/$$i; \
+ perl $(top_srcdir)/korundum/rubylib/rbtdeconfig_compiler/checkkcfg.pl \
+ $(top_srcdir)/korundum/rubylib/rbtdeconfig_compiler/tests/$$i; done
+
diff --git a/korundum/rubylib/rbkconfig_compiler/README.dox b/korundum/rubylib/rbtdeconfig_compiler/README.dox
index 5eb9bd17..5601395c 100644
--- a/korundum/rubylib/rbkconfig_compiler/README.dox
+++ b/korundum/rubylib/rbtdeconfig_compiler/README.dox
@@ -1,7 +1,7 @@
/**
-\page rbkconfig_compiler The KDE Configuration Compiler for Ruby
+\page rbtdeconfig_compiler The KDE Configuration Compiler for Ruby
-rbkconfig_compiler generates Ruby source code from an XML file containing
+rbtdeconfig_compiler generates Ruby source code from an XML file containing
information about configuration options (.kcfg) and a file that provides
the code generation options (.kcfgc) The generated class is based on
KDE::ConfigSkeleton and provides an API for the application to access its
diff --git a/korundum/rubylib/rbkconfig_compiler/TODO b/korundum/rubylib/rbtdeconfig_compiler/TODO
index db4137ed..db4137ed 100644
--- a/korundum/rubylib/rbkconfig_compiler/TODO
+++ b/korundum/rubylib/rbtdeconfig_compiler/TODO
diff --git a/korundum/rubylib/rbkconfig_compiler/autoexample.rb b/korundum/rubylib/rbtdeconfig_compiler/autoexample.rb
index 8526c93d..8526c93d 100644
--- a/korundum/rubylib/rbkconfig_compiler/autoexample.rb
+++ b/korundum/rubylib/rbtdeconfig_compiler/autoexample.rb
diff --git a/korundum/rubylib/rbkconfig_compiler/checkkcfg.pl b/korundum/rubylib/rbtdeconfig_compiler/checkkcfg.pl
index 2eddbeee..26b12bad 100755
--- a/korundum/rubylib/rbkconfig_compiler/checkkcfg.pl
+++ b/korundum/rubylib/rbtdeconfig_compiler/checkkcfg.pl
@@ -15,21 +15,21 @@ $file_cpp = "$filebase.cpp";
$kcfgc = $file . "c";
-$cmd = "./kconfig_compiler $file $kcfgc";
+$cmd = "./tdeconfig_compiler $file $kcfgc";
#print "CMD $cmd\n";
if ( system( $cmd ) != 0 ) {
- print STDERR "Unable to run kconfig_compiler\n";
+ print STDERR "Unable to run tdeconfig_compiler\n";
exit 1;
}
-checkfile( $file_h );
-checkfile( $file_cpp );
+chectdefile( $file_h );
+chectdefile( $file_cpp );
exit 0;
-sub checkfile()
+sub chectdefile()
{
my $file = shift;
diff --git a/korundum/rubylib/rbkconfig_compiler/example.kcfg b/korundum/rubylib/rbtdeconfig_compiler/example.kcfg
index 055958b4..055958b4 100644
--- a/korundum/rubylib/rbkconfig_compiler/example.kcfg
+++ b/korundum/rubylib/rbtdeconfig_compiler/example.kcfg
diff --git a/korundum/rubylib/rbkconfig_compiler/example.rb b/korundum/rubylib/rbtdeconfig_compiler/example.rb
index 9ed4d9c4..9ed4d9c4 100644
--- a/korundum/rubylib/rbkconfig_compiler/example.rb
+++ b/korundum/rubylib/rbtdeconfig_compiler/example.rb
diff --git a/korundum/rubylib/rbkconfig_compiler/exampleprefs_base.kcfgc b/korundum/rubylib/rbtdeconfig_compiler/exampleprefs_base.kcfgc
index a9ac98dc..9b72fdb0 100644
--- a/korundum/rubylib/rbkconfig_compiler/exampleprefs_base.kcfgc
+++ b/korundum/rubylib/rbtdeconfig_compiler/exampleprefs_base.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
ClassName=ExamplePrefsBase
#
# Singleton=false
diff --git a/korundum/rubylib/rbkconfig_compiler/general_base.ui b/korundum/rubylib/rbtdeconfig_compiler/general_base.ui
index 4a76cc34..4a76cc34 100644
--- a/korundum/rubylib/rbkconfig_compiler/general_base.ui
+++ b/korundum/rubylib/rbtdeconfig_compiler/general_base.ui
diff --git a/korundum/rubylib/rbkconfig_compiler/kcfg.xsd b/korundum/rubylib/rbtdeconfig_compiler/kcfg.xsd
index d505a514..d505a514 100644
--- a/korundum/rubylib/rbkconfig_compiler/kcfg.xsd
+++ b/korundum/rubylib/rbtdeconfig_compiler/kcfg.xsd
diff --git a/korundum/rubylib/rbkconfig_compiler/myoptions_base.ui b/korundum/rubylib/rbtdeconfig_compiler/myoptions_base.ui
index aa3148a4..aa3148a4 100644
--- a/korundum/rubylib/rbkconfig_compiler/myoptions_base.ui
+++ b/korundum/rubylib/rbtdeconfig_compiler/myoptions_base.ui
diff --git a/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp b/korundum/rubylib/rbtdeconfig_compiler/rbtdeconfig_compiler.cpp
index c29cb838..8db55019 100644
--- a/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp
+++ b/korundum/rubylib/rbtdeconfig_compiler/rbtdeconfig_compiler.cpp
@@ -33,7 +33,7 @@
#include <klocale.h>
#include <kcmdlineargs.h>
#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
@@ -600,7 +600,7 @@ TQString param( const TQString &type )
else if ( type == "Path" ) return "const TQString &";
else if ( type == "Password" ) return "const TQString &";
else {
- kdError() <<"rbkconfig_compiler does not support type \""<< type <<"\""<<endl;
+ kdError() <<"rbtdeconfig_compiler does not support type \""<< type <<"\""<<endl;
return "TQString"; //For now, but an assert would be better
}
}
@@ -629,7 +629,7 @@ TQString rbType( const TQString &type )
else if ( type == "Path" ) return "\"\"";
else if ( type == "Password" ) return "\"\"";
else {
- kdError()<<"rbkconfig_compiler does not support type \""<< type <<"\""<<endl;
+ kdError()<<"rbtdeconfig_compiler does not support type \""<< type <<"\""<<endl;
return "nil"; //For now, but an assert would be better
}
}
@@ -655,7 +655,7 @@ TQString defaultValue( const TQString &type )
else if ( type == "Path" ) return "\"\""; // Use empty string, not null string!
else if ( type == "Password" ) return "\"\""; // Use empty string, not null string!
else {
- kdWarning()<<"Error, rbkconfig_compiler doesn't support the \""<< type <<"\" type!"<<endl;
+ kdWarning()<<"Error, rbtdeconfig_compiler doesn't support the \""<< type <<"\" type!"<<endl;
return "String"; //For now, but an assert would be better
}
}
@@ -801,7 +801,7 @@ TQString userTextsFunctions( CfgEntry *e, TQString itemVarStr=TQString::null, TQ
int main( int argc, char **argv )
{
- TDEAboutData aboutData( "rbkconfig_compiler", I18N_NOOP("TDE .kcfg compiler"), "0.3",
+ TDEAboutData aboutData( "rbtdeconfig_compiler", I18N_NOOP("TDE .kcfg compiler"), "0.3",
I18N_NOOP("Ruby TDEConfig Compiler") , TDEAboutData::License_LGPL );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
aboutData.addAuthor( "Waldo Bastian", 0, "bastian@kde.org" );
@@ -978,7 +978,7 @@ int main( int argc, char **argv )
TQTextStream rb( &implementation );
- rb << "# This file is generated by rbkconfig_compiler from " << args->url(0).fileName() << "." << endl;
+ rb << "# This file is generated by rbtdeconfig_compiler from " << args->url(0).fileName() << "." << endl;
rb << "# All changes you do to this file will be lost." << endl;
rb << endl << "require 'Korundum'" << endl;
@@ -1001,7 +1001,7 @@ int main( int argc, char **argv )
if ( headerIncludes.count() > 0 ) rb << endl;
-// rb << "#include <kconfigskeleton.h>" << endl << endl;
+// rb << "#include <tdeconfigskeleton.h>" << endl << endl;
if ( !nameSpace.isEmpty() )
rb << "module " << nameSpace << endl << endl;
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/Makefile.am b/korundum/rubylib/rbtdeconfig_compiler/tests/Makefile.am
index ce61f658..cabfed4d 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/Makefile.am
+++ b/korundum/rubylib/rbtdeconfig_compiler/tests/Makefile.am
@@ -13,24 +13,24 @@ all: $(SOURCES)
SOURCES = test1main.rb test1.rb test2main.rb test2.rb test3main.rb test3.rb test4main.rb test4.rb test5main.rb test5.rb
# avoid running the below command in parallel
-test1.rb: $(srcdir)/test1.kcfg ../rbkconfig_compiler $(srcdir)/test1.kcfgc
- ../rbkconfig_compiler $(srcdir)/test1.kcfg $(srcdir)/test1.kcfgc
+test1.rb: $(srcdir)/test1.kcfg ../rbtdeconfig_compiler $(srcdir)/test1.kcfgc
+ ../rbtdeconfig_compiler $(srcdir)/test1.kcfg $(srcdir)/test1.kcfgc
# avoid running the below command in parallel
-test2.rb: $(srcdir)/test2.kcfg ../rbkconfig_compiler $(srcdir)/test2.kcfgc
- ../rbkconfig_compiler $(srcdir)/test2.kcfg $(srcdir)/test2.kcfgc
+test2.rb: $(srcdir)/test2.kcfg ../rbtdeconfig_compiler $(srcdir)/test2.kcfgc
+ ../rbtdeconfig_compiler $(srcdir)/test2.kcfg $(srcdir)/test2.kcfgc
# avoid running the below command in parallel
-test3.rb: $(srcdir)/test3.kcfg ../rbkconfig_compiler $(srcdir)/test3.kcfgc
- ../rbkconfig_compiler $(srcdir)/test3.kcfg $(srcdir)/test3.kcfgc
+test3.rb: $(srcdir)/test3.kcfg ../rbtdeconfig_compiler $(srcdir)/test3.kcfgc
+ ../rbtdeconfig_compiler $(srcdir)/test3.kcfg $(srcdir)/test3.kcfgc
# avoid running the below command in parallel
-test4.rb: $(srcdir)/test4.kcfg ../rbkconfig_compiler $(srcdir)/test4.kcfgc
- ../rbkconfig_compiler $(srcdir)/test4.kcfg $(srcdir)/test4.kcfgc
+test4.rb: $(srcdir)/test4.kcfg ../rbtdeconfig_compiler $(srcdir)/test4.kcfgc
+ ../rbtdeconfig_compiler $(srcdir)/test4.kcfg $(srcdir)/test4.kcfgc
# avoid running the below command in parallel
-test5.rb: $(srcdir)/test5.kcfg ../rbkconfig_compiler $(srcdir)/test5.kcfgc
- ../rbkconfig_compiler $(srcdir)/test5.kcfg $(srcdir)/test5.kcfgc
+test5.rb: $(srcdir)/test5.kcfg ../rbtdeconfig_compiler $(srcdir)/test5.kcfgc
+ ../rbtdeconfig_compiler $(srcdir)/test5.kcfg $(srcdir)/test5.kcfgc
md5sums:
$(MD5SUM) $(srcdir)/test*.ref | sed -e "s,$(srcdir)/,,; s,\.ref$$,," > md5sums
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/myprefs.rb b/korundum/rubylib/rbtdeconfig_compiler/tests/myprefs.rb
index a4f1f082..a4f1f082 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/myprefs.rb
+++ b/korundum/rubylib/rbtdeconfig_compiler/tests/myprefs.rb
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/test1.kcfg b/korundum/rubylib/rbtdeconfig_compiler/tests/test1.kcfg
index b8c23c15..b8c23c15 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/test1.kcfg
+++ b/korundum/rubylib/rbtdeconfig_compiler/tests/test1.kcfg
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/test1.kcfgc b/korundum/rubylib/rbtdeconfig_compiler/tests/test1.kcfgc
index ecab7b85..dd086cdd 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/test1.kcfgc
+++ b/korundum/rubylib/rbtdeconfig_compiler/tests/test1.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
ClassName=Test1
#
# Singleton=false
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/test1main.rb b/korundum/rubylib/rbtdeconfig_compiler/tests/test1main.rb
index 88a151a6..88a151a6 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/test1main.rb
+++ b/korundum/rubylib/rbtdeconfig_compiler/tests/test1main.rb
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/test2.kcfg b/korundum/rubylib/rbtdeconfig_compiler/tests/test2.kcfg
index 3b19e270..3b19e270 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/test2.kcfg
+++ b/korundum/rubylib/rbtdeconfig_compiler/tests/test2.kcfg
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/test2.kcfgc b/korundum/rubylib/rbtdeconfig_compiler/tests/test2.kcfgc
index 56620d2f..e2904068 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/test2.kcfgc
+++ b/korundum/rubylib/rbtdeconfig_compiler/tests/test2.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=test2.kcfg
ClassName=Test2
Singleton=false
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/test2main.rb b/korundum/rubylib/rbtdeconfig_compiler/tests/test2main.rb
index 85d18f07..85d18f07 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/test2main.rb
+++ b/korundum/rubylib/rbtdeconfig_compiler/tests/test2main.rb
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/test3.kcfg b/korundum/rubylib/rbtdeconfig_compiler/tests/test3.kcfg
index 77916da4..77916da4 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/test3.kcfg
+++ b/korundum/rubylib/rbtdeconfig_compiler/tests/test3.kcfg
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/test3.kcfgc b/korundum/rubylib/rbtdeconfig_compiler/tests/test3.kcfgc
index ca2c2205..d699810d 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/test3.kcfgc
+++ b/korundum/rubylib/rbtdeconfig_compiler/tests/test3.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=test3.kcfg
NameSpace=TestNameSpace
ClassName=Test3
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/test3main.rb b/korundum/rubylib/rbtdeconfig_compiler/tests/test3main.rb
index 8c19b442..8c19b442 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/test3main.rb
+++ b/korundum/rubylib/rbtdeconfig_compiler/tests/test3main.rb
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/test4.kcfg b/korundum/rubylib/rbtdeconfig_compiler/tests/test4.kcfg
index c834aa9f..c834aa9f 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/test4.kcfg
+++ b/korundum/rubylib/rbtdeconfig_compiler/tests/test4.kcfg
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/test4.kcfgc b/korundum/rubylib/rbtdeconfig_compiler/tests/test4.kcfgc
index 754706df..a81655b6 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/test4.kcfgc
+++ b/korundum/rubylib/rbtdeconfig_compiler/tests/test4.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=test4.kcfg
ClassName=Test4
Singleton=true
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/test4main.rb b/korundum/rubylib/rbtdeconfig_compiler/tests/test4main.rb
index c75f0995..c75f0995 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/test4main.rb
+++ b/korundum/rubylib/rbtdeconfig_compiler/tests/test4main.rb
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/test5.kcfg b/korundum/rubylib/rbtdeconfig_compiler/tests/test5.kcfg
index c834aa9f..c834aa9f 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/test5.kcfg
+++ b/korundum/rubylib/rbtdeconfig_compiler/tests/test5.kcfg
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/test5.kcfgc b/korundum/rubylib/rbtdeconfig_compiler/tests/test5.kcfgc
index 663005e5..dbc5603a 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/test5.kcfgc
+++ b/korundum/rubylib/rbtdeconfig_compiler/tests/test5.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=test5.kcfg
ClassName=Test5
Singleton=true
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/test5main.rb b/korundum/rubylib/rbtdeconfig_compiler/tests/test5main.rb
index cd0fbeb7..cd0fbeb7 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/test5main.rb
+++ b/korundum/rubylib/rbtdeconfig_compiler/tests/test5main.rb