summaryrefslogtreecommitdiffstats
path: root/korundum
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:50:32 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:50:32 -0600
commit5538de896d91beba2d934e4d218f1d2bb52e937b (patch)
tree166367146432517fcc404376de628b5505f2f5fd /korundum
parentddde3d2db1a481c6fd3fd3e4273176b75d17c5e8 (diff)
downloadtdebindings-5538de896d91beba2d934e4d218f1d2bb52e937b.tar.gz
tdebindings-5538de896d91beba2d934e4d218f1d2bb52e937b.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'korundum')
-rw-r--r--korundum/ChangeLog2
-rw-r--r--korundum/rubylib/examples/mimetype.rb2
-rw-r--r--korundum/rubylib/korundum/kdehandlers.cpp8
3 files changed, 6 insertions, 6 deletions
diff --git a/korundum/ChangeLog b/korundum/ChangeLog
index 404bc6c9..0fe5e03f 100644
--- a/korundum/ChangeLog
+++ b/korundum/ChangeLog
@@ -581,7 +581,7 @@ CCMAIL: kde-bindings@kde.org
2004-03-10 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
- * Added marshaller for KTrader::OfferList to ruby array
+ * Added marshaller for TDETrader::OfferList to ruby array
* Used DOM::Node rtti to instantiate a ruby value with the correct subclass
2004-03-03 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
diff --git a/korundum/rubylib/examples/mimetype.rb b/korundum/rubylib/examples/mimetype.rb
index e2860f0e..848b46cc 100644
--- a/korundum/rubylib/examples/mimetype.rb
+++ b/korundum/rubylib/examples/mimetype.rb
@@ -89,7 +89,7 @@ class OfferListTab < TQt::Widget
trader = KDE::Trader.self()
slist = trader.query("image/jpeg", "Type == 'Application'")
-# print "KTrader returned:" + slist
+# print "TDETrader returned:" + slist
slist.each do |s|
lvi = TQt::ListViewItem.new(lv, s.type(), s.name(), s.exec(), s.library())
end
diff --git a/korundum/rubylib/korundum/kdehandlers.cpp b/korundum/rubylib/korundum/kdehandlers.cpp
index d22adf53..632d5379 100644
--- a/korundum/rubylib/korundum/kdehandlers.cpp
+++ b/korundum/rubylib/korundum/kdehandlers.cpp
@@ -770,7 +770,7 @@ void marshall_KActionPtrList(Marshall *m) {
}
}
-void marshall_KTraderOfferList(Marshall *m) {
+void marshall_TDETraderOfferList(Marshall *m) {
switch(m->action()) {
case Marshall::FromVALUE:
{
@@ -778,7 +778,7 @@ void marshall_KTraderOfferList(Marshall *m) {
break;
case Marshall::ToVALUE:
{
- KTrader::OfferList *offerList = (KTrader::OfferList*)m->item().s_voidp;
+ TDETrader::OfferList *offerList = (TDETrader::OfferList*)m->item().s_voidp;
if(!offerList) {
*(m->var()) = Qnil;
break;
@@ -786,7 +786,7 @@ void marshall_KTraderOfferList(Marshall *m) {
VALUE av = rb_ary_new();
- for(KTrader::OfferList::Iterator it = offerList->begin();
+ for(TDETrader::OfferList::Iterator it = offerList->begin();
it != offerList->end();
++it) {
TDESharedPtr<KService> *ptr = new TDESharedPtr<KService>(*it);
@@ -1405,7 +1405,7 @@ TypeHandler KDE_handlers[] = {
{ "TQValueList<TDEConfigSkeleton::ItemEnum::Choice>&", marshall_ChoicesList },
#endif
{ "KServiceType::List", marshall_KServiceTypeList },
- { "KTrader::OfferList", marshall_KTraderOfferList },
+ { "TDETrader::OfferList", marshall_TDETraderOfferList },
{ "KURL::List", marshall_KURLList },
{ "KURL::List&", marshall_KURLList },
{ "KFileItemList", marshall_KFileItemList },