summaryrefslogtreecommitdiffstats
path: root/kalyptus
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:47:56 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:47:56 -0600
commitea4d7d39f76dc8aa3216380287e9391b6b6a44a0 (patch)
treece0a22266a51ae821653746785286af900f1d8cb /kalyptus
parentf848c7a5deb2e7fbd346e9651203aa8c2bf1b314 (diff)
downloadlibtqt-perl-ea4d7d39f76dc8aa3216380287e9391b6b6a44a0.tar.gz
libtqt-perl-ea4d7d39f76dc8aa3216380287e9391b6b6a44a0.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'kalyptus')
-rw-r--r--kalyptus/kalyptusCxxToJNI.pm4
-rw-r--r--kalyptus/kalyptusCxxToJava.pm2
-rw-r--r--kalyptus/kalyptusCxxToKimono.pm2
-rw-r--r--kalyptus/kalyptusDataDict.pm6
4 files changed, 7 insertions, 7 deletions
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm
index 7db0fdd..d95daec 100644
--- a/kalyptus/kalyptusCxxToJNI.pm
+++ b/kalyptus/kalyptusCxxToJNI.pm
@@ -2239,7 +2239,7 @@ sub jniToReturnValue($$$)
$returnCall .= "\treturn (jobject) KDESupport::arrayWith$1(env, (DOM::$1 *) " . ($2 eq "\*" ? "" : "&") . "_qlist);\n";
} elsif ( $cplusplusType =~ /(QCStringList|KFileItemList|KFileViewItemList)\s*([\*\&])?\s*$/ ) {
$returnCall .= "\treturn (jobject) KDESupport::arrayWith$1(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qlist);\n";
- } elsif ( $cplusplusType =~ /(KTrader::OfferList)\s*([\*\&])?\s*$/ ) {
+ } elsif ( $cplusplusType =~ /(TDETrader::OfferList)\s*([\*\&])?\s*$/ ) {
$returnCall .= "\treturn (jobject) KDESupport::arrayWithOfferList(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qlist);\n";
} elsif ( $cplusplusType =~ /(KURL::List)\s*([\*\&])?\s*$/ ) {
$returnCall .= "\treturn (jobject) KDESupport::arrayWithKURLList(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qlist);\n";
@@ -5460,7 +5460,7 @@ sub printJavadocComment($$$$)
} else {
$line =~ s/(const )?QC?StringList(\s*&)?/ArrayList/g;
}
- $line =~ s/NodeList|KTrader::OfferList/ArrayList/g;
+ $line =~ s/NodeList|TDETrader::OfferList/ArrayList/g;
$line =~ s/(const )?TQDate(Time)?(\s*&)?/Calendar/g;
$line =~ s/(const )?TQTime([^r])/Date$1/g;
$line =~ s/TQString::null/null/g;
diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm
index 07dc3fc..430e274 100644
--- a/kalyptus/kalyptusCxxToJava.pm
+++ b/kalyptus/kalyptusCxxToJava.pm
@@ -3299,7 +3299,7 @@ sub printJavadocComment($$$$)
} else {
$line =~ s/(const )?QC?StringList(\s*&)?/ArrayList/g;
}
- $line =~ s/NodeList|KTrader::OfferList/ArrayList/g;
+ $line =~ s/NodeList|TDETrader::OfferList/ArrayList/g;
$line =~ s/(const )?TQDate(Time)?(\s*&)?/Calendar/g;
$line =~ s/(const )?TQTime([^r])/Date$1/g;
$line =~ s/TQString::null/null/g;
diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm
index 851a54d..a043a73 100644
--- a/kalyptus/kalyptusCxxToKimono.pm
+++ b/kalyptus/kalyptusCxxToKimono.pm
@@ -3493,7 +3493,7 @@ sub printCSharpdocComment($$$$)
} else {
$line =~ s/(const )?QC?StringList(\s*&)?/ArrayList/g;
}
- $line =~ s/NodeList|KTrader::OfferList/ArrayList/g;
+ $line =~ s/NodeList|TDETrader::OfferList/ArrayList/g;
$line =~ s/(const )?TQDate(Time)?(\s*&)?/DateTime/g;
$line =~ s/(const )?TQTime([^r])/DateTime$1/g;
$line =~ s/TQString::null/null/g;
diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm
index 9286486..ca1a5c2 100644
--- a/kalyptus/kalyptusDataDict.pm
+++ b/kalyptus/kalyptusDataDict.pm
@@ -1204,7 +1204,7 @@ BEGIN
'KToolBarRadioGroup*' => 'kde_KToolBarRadioGroup*',
'KToolBarSeparator*' => 'kde_KToolBarSeparator*',
'KToolButtonType' => 'int' ,
-'KTrader*' => 'kde_KTrader*' ,
+'TDETrader*' => 'kde_TDETrader*' ,
'KTypeList*' => 'kde_KTypeList*',
'KURIFilter*' => 'kde_KURIFilter*' ,
'KURIFilterData&' => 'kde_KURIFilterData*' ,
@@ -1374,7 +1374,7 @@ BEGIN
'Object_stub*' => 'kde_Object_stub*',
'Observer*' => 'kde_Observer*',
'OfferList' => 'kde_OfferList*' ,
-'KTrader::OfferList' => 'kde_OfferList*' ,
+'TDETrader::OfferList' => 'kde_OfferList*' ,
'Offset' => 'int',
'OnewayDispatchFunction' => 'kde_OnewayDispatchFunction*',
'OnewayInvocation&' => 'kde_OnewayInvocation*',
@@ -2867,7 +2867,7 @@ sub addNamespace
if ( $className =~ /^(OfferList)/ )
{
- return "KTrader::".$className;
+ return "TDETrader::".$className;
}
if ( $className =~ /^(BlockSelectionInterface|ClipboardInterface|CodeCompletionInterface|CompletionEntry|ConfigInterface|Cursor|CursorInterface|Document|EditInterface|Editor|HighlightingInterface|Mark|MarkInterface|PopupMenuInterface|PrintInterface|SearchInterface|SelectionInterface|UndoInterface|View|ViewCursorInterface)/ )