From ed57d8a57b09cf200223bd57ebfaf8073b49653a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:18:16 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kalyptus/ChangeLog | 6 +++--- kalyptus/kalyptusCxxToJNI.pm | 18 +++++++++--------- kalyptus/kalyptusCxxToJava.pm | 16 ++++++++-------- kalyptus/kalyptusCxxToKimono.pm | 16 ++++++++-------- kalyptus/kalyptusCxxToSmoke.pm | 8 ++++---- kalyptus/kalyptusDataDict.pm | 36 ++++++++++++++++++------------------ 6 files changed, 50 insertions(+), 50 deletions(-) (limited to 'kalyptus') diff --git a/kalyptus/ChangeLog b/kalyptus/ChangeLog index 793c333..15fe667 100644 --- a/kalyptus/ChangeLog +++ b/kalyptus/ChangeLog @@ -44,7 +44,7 @@ 2004-08-19 Richard Dale - * A namespace such as KIO:: can be spread over several header files, the source + * A namespace such as TDEIO:: can be spread over several header files, the source names are now kept in a property list so that all the includes can be generated. 2004-07-26 Richard Dale @@ -57,7 +57,7 @@ * When the Smoke code for accessing an enum was generated, it was assuming that the enum was in the same source file as the class. This doesn't work - for namespaces like KIO:: where enums can be spread over several source + for namespaces like TDEIO:: where enums can be spread over several source files. * The solution is to add a source file property to each enum, and when the accessor code for the enum is generated a suitable include can be added. @@ -246,7 +246,7 @@ * Fixed a problem with parsing one line namespace declarations * Added support for the QT_WORKSPACE_WINDOWMODE macro, to solve build problem - * Added some more primitive type definitions such as KIO::filesize_t + * Added some more primitive type definitions such as TDEIO::filesize_t 2003-12-23 Richard Dale diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index a19078e..3e60b06 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -99,7 +99,7 @@ BEGIN 'signed int' => 'int', 'unsigned' => 'uint', 'unsigned int' => 'uint', - 'KIO::filesize_t' => 'long', + 'TDEIO::filesize_t' => 'long', 'signed long' => 'long', 'unsigned long' => 'ulong', @@ -2415,7 +2415,7 @@ sub preParseClass $className eq 'KXMLGUIClient::StateChange' || $className eq 'KIconTheme' || $className eq 'KEditListBox::CustomEditor' || - $className eq 'KIO::KBookmarkMenuNSImporter' || + $className eq 'TDEIO::KBookmarkMenuNSImporter' || $className eq 'KPerDomainSettings' || $className eq 'TDEApplicationPropsPlugin' || $className eq 'KPrinter' || @@ -2439,16 +2439,16 @@ sub preParseClass $className eq 'KOCRDialogFactory' || $className eq 'KExtendedBookmarkOwner' || $className eq 'KSharedPixmap' || - $className eq 'KSocket' || + $className eq 'TDESocket' || $className eq 'KLibrary' || $className eq 'KScanDialogFactory' || $className eq 'KDictSpellingHighlighter' || $className eq 'KPropertiesDialog' || $className eq 'ProgressItem' || - $className eq 'KIO::ChmodInfo' || - $className eq 'KIO::MetaData' || + $className eq 'TDEIO::ChmodInfo' || + $className eq 'TDEIO::MetaData' || $className eq 'KFileMimeTypeInfo::ItemInfo' || - $className eq 'KIO::UDSAtom' || + $className eq 'TDEIO::UDSAtom' || $className eq 'khtml::DrawContentsEvent' || # the khtml:: classes build, but don't link $className eq 'khtml::MouseDoubleClickEvent' || $className eq 'khtml::MouseMoveEvent' || @@ -3079,7 +3079,7 @@ sub writeClassDoc $jniCode .= $quridragjniExtras; } elsif ( $className eq 'TDECmdLineArgs' ) { $jniCode .= $kcmdlineargsjniExtras; - } elsif ( $className eq 'KIO::Scheduler' ) { + } elsif ( $className eq 'TDEIO::Scheduler' ) { $jniCode .= $schedulerjniExtras; } elsif ( $className eq 'TDEApplication' ) { print CLASS $kapplicationExtras; @@ -3918,7 +3918,7 @@ sub generateMethod($$$$$$$$$) } elsif ($javaSignature eq "at()" and $javaClassName eq 'KFilterDev') { $javaReturnType = "long"; } elsif ($javaSignature =~ /copyTo/ and $javaClassName eq "KDesktopFile" ) { - $altReturnType = "KConfig"; + $altReturnType = "TDEConfig"; } if ( defined $altReturnType ) { @@ -5550,7 +5550,7 @@ sub printJavadocComment($$$$) if ( defined $docnode->{See} ) { foreach my $text ( @{$docnode->{See}} ) { next if ($text =~ /TQString|^\s*and\s*$|^\s*$|^[^\w]*$/); - $text =~ s/KIO:://g; + $text =~ s/TDEIO:://g; $text =~ s/KParts:://g; $text =~ s/bool/boolean/g; $text =~ s/::/#/g; diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm index c86739c..73376d6 100644 --- a/kalyptus/kalyptusCxxToJava.pm +++ b/kalyptus/kalyptusCxxToJava.pm @@ -97,7 +97,7 @@ BEGIN 'signed int' => 'int', 'unsigned' => 'uint', 'unsigned int' => 'uint', - 'KIO::filesize_t' => 'long', + 'TDEIO::filesize_t' => 'long', 'signed long' => 'long', 'unsigned long' => 'ulong', @@ -722,7 +722,7 @@ sub preParseClass $className eq 'KXMLGUIClient::StateChange' || $className eq 'KIconTheme' || $className eq 'KEditListBox::CustomEditor' || - $className eq 'KIO::KBookmarkMenuNSImporter' || + $className eq 'TDEIO::KBookmarkMenuNSImporter' || $className eq 'KPerDomainSettings' || $className eq 'TDEApplicationPropsPlugin' || $className eq 'KPrinter' || @@ -746,16 +746,16 @@ sub preParseClass $className eq 'KOCRDialogFactory' || $className eq 'KExtendedBookmarkOwner' || $className eq 'KSharedPixmap' || - $className eq 'KSocket' || + $className eq 'TDESocket' || $className eq 'KLibrary' || $className eq 'KScanDialogFactory' || $className eq 'KDictSpellingHighlighter' || $className eq 'KPropertiesDialog' || $className eq 'ProgressItem' || - $className eq 'KIO::ChmodInfo' || - $className eq 'KIO::MetaData' || + $className eq 'TDEIO::ChmodInfo' || + $className eq 'TDEIO::MetaData' || $className eq 'KFileMimeTypeInfo::ItemInfo' || - $className eq 'KIO::UDSAtom' || + $className eq 'TDEIO::UDSAtom' || $className eq 'khtml::DrawContentsEvent' || # the khtml:: classes build, but don't link $className eq 'khtml::MouseDoubleClickEvent' || $className eq 'khtml::MouseMoveEvent' || @@ -1980,7 +1980,7 @@ sub generateMethod($$$$$$$) } elsif ($javaSignature eq "at()" and $javaClassName eq 'KFilterDev') { $javaReturnType = "long"; } elsif ($javaSignature =~ /copyTo/ and $javaClassName eq "KDesktopFile" ) { - $altReturnType = "KConfig"; + $altReturnType = "TDEConfig"; } if ( defined $altReturnType ) { @@ -3389,7 +3389,7 @@ sub printJavadocComment($$$$) if ( defined $docnode->{See} ) { foreach my $text ( @{$docnode->{See}} ) { next if ($text =~ /TQString|^\s*and\s*$|^\s*$|^[^\w]*$/); - $text =~ s/KIO:://g; + $text =~ s/TDEIO:://g; $text =~ s/KParts:://g; $text =~ s/bool/boolean/g; $text =~ s/::/#/g; diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm index 99fb0b6..871bf54 100644 --- a/kalyptus/kalyptusCxxToKimono.pm +++ b/kalyptus/kalyptusCxxToKimono.pm @@ -100,7 +100,7 @@ BEGIN 'signed int' => 'int', 'unsigned' => 'uint', 'unsigned int' => 'uint', - 'KIO::filesize_t' => 'long', + 'TDEIO::filesize_t' => 'long', 'signed long' => 'long', 'unsigned long' => 'ulong', @@ -742,7 +742,7 @@ sub preParseClass $className eq 'KXMLGUIClient::StateChange' || $className eq 'KIconTheme' || $className eq 'KEditListBox::CustomEditor' || - $className eq 'KIO::KBookmarkMenuNSImporter' || + $className eq 'TDEIO::KBookmarkMenuNSImporter' || $className eq 'KPerDomainSettings' || $className eq 'TDEApplicationPropsPlugin' || $className eq 'KPrinter' || @@ -766,16 +766,16 @@ sub preParseClass $className eq 'KOCRDialogFactory' || $className eq 'KExtendedBookmarkOwner' || $className eq 'KSharedPixmap' || - $className eq 'KSocket' || + $className eq 'TDESocket' || $className eq 'KLibrary' || $className eq 'KScanDialogFactory' || $className eq 'KDictSpellingHighlighter' || $className eq 'KPropertiesDialog' || $className eq 'ProgressItem' || - $className eq 'KIO::ChmodInfo' || - $className eq 'KIO::MetaData' || + $className eq 'TDEIO::ChmodInfo' || + $className eq 'TDEIO::MetaData' || $className eq 'KFileMimeTypeInfo::ItemInfo' || - $className eq 'KIO::UDSAtom' || + $className eq 'TDEIO::UDSAtom' || $className eq 'khtml::DrawContentsEvent' || # the khtml:: classes build, but don't link $className eq 'khtml::MouseDoubleClickEvent' || $className eq 'khtml::MouseMoveEvent' || @@ -2075,7 +2075,7 @@ sub generateMethod($$$$$$$) } elsif ($csharpSignature eq "at()" and $csharpClassName eq 'KFilterDev') { $csharpReturnType = "long"; } elsif ($csharpSignature =~ /copyTo/ and $csharpClassName eq "KDesktopFile" ) { - $altReturnType = "KConfig"; + $altReturnType = "TDEConfig"; } @@ -3581,7 +3581,7 @@ sub printCSharpdocComment($$$$) if ( defined $docnode->{See} ) { foreach my $text ( @{$docnode->{See}} ) { next if ($text =~ /TQString|^\s*and\s*$|^\s*$|^[^\w]*$/); - $text =~ s/KIO:://g; + $text =~ s/TDEIO:://g; $text =~ s/KParts:://g; while ($text =~ /((::)|(->))(.)/) { my $temp = uc($4); diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm index d8d7ac8..06f555d 100644 --- a/kalyptus/kalyptusCxxToSmoke.pm +++ b/kalyptus/kalyptusCxxToSmoke.pm @@ -376,9 +376,9 @@ sub preParseClass $className eq 'KXMLGUIClient::StateChange' || $className eq 'KIconTheme' || $className eq 'KEditListBox::CustomEditor' || - $className eq 'KIO::KBookmarkMenuNSImporter' || + $className eq 'TDEIO::KBookmarkMenuNSImporter' || $className eq 'KExtendedSocket' || - $className eq 'KSocket' || + $className eq 'TDESocket' || $className eq 'KPerDomainSettings' || $className eq 'TDEApplicationPropsPlugin' || $className eq 'KOpenWithHandler' || @@ -405,7 +405,7 @@ sub preParseClass $className eq 'KDictSpellingHighlighter' || $className eq 'KPropertiesDialog' || $className eq 'ProgressItem' || - $className eq 'KIO::ChmodInfo' || + $className eq 'TDEIO::ChmodInfo' || $className eq 'khtml::DrawContentsEvent' || # the khtml:: classes build, but don't link $className eq 'khtml::MouseDoubleClickEvent' || $className eq 'khtml::MouseMoveEvent' || @@ -544,7 +544,7 @@ sub preParseClass # or where the code won't compile/link for obscure reasons. Or even obvious reasons.. if ( ($classNode->{astNodeName} eq 'KCharSelectTable' and $name eq 'paintCell') || ($classNode->{astNodeName} eq 'KAnimWidget' and $name eq 'KAnimWidget' and @{$m->{ParamList}} == 2) - || ($classNode->{astNodeName} eq 'KCModuleLoader' and $name eq 'errorModule') + || ($classNode->{astNodeName} eq 'TDECModuleLoader' and $name eq 'errorModule') || ($classNode->{astNodeName} eq 'KDCOPActionProxy' and $name eq 'actions') || ($classNode->{astNodeName} eq 'KEditToolbarWidget' and $name eq 'insertActive') || ($classNode->{astNodeName} eq 'KEditToolbarWidget' and $name eq 'removeActive') diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm index 3533c72..7891f6f 100644 --- a/kalyptus/kalyptusDataDict.pm +++ b/kalyptus/kalyptusDataDict.pm @@ -751,7 +751,7 @@ BEGIN 'KBufferedIO*' => 'kde_KBufferedIO*', 'KBugReport*' => 'kde_KBugReport*', 'KButtonBox*' => 'kde_KButtonBox*', -'KCModule*' => 'kde_KCModule*' , +'TDECModule*' => 'kde_TDECModule*' , 'KCatalogue&' => 'kde_KCatalogue*', 'KCatalogue*' => 'kde_KCatalogue*', 'KCharSelect*' => 'kde_KCharSelect*', @@ -774,13 +774,13 @@ BEGIN 'KCompletion*' => 'kde_KCompletion*' , 'KCompletionBase*' => 'kde_KCompletionBase*', 'KCompletionBox*' => 'kde_KCompletionBox*', -'KConfig*' => 'kde_KConfig*' , -'KConfigBackEnd*' => 'kde_KConfigBackEnd*', -'KConfigBase&' => 'kde_KConfigBase*', -'KConfigBase*' => 'kde_KConfigBase*' , -'KConfigGroup*' => 'kde_KConfigGroup*', -'KConfigGroupSaver*' => 'kde_KConfigGroupSaver*', -'KConfigINIBackEnd*' => 'kde_KConfigINIBackEnd*', +'TDEConfig*' => 'kde_TDEConfig*' , +'TDEConfigBackEnd*' => 'kde_TDEConfigBackEnd*', +'TDEConfigBase&' => 'kde_TDEConfigBase*', +'TDEConfigBase*' => 'kde_TDEConfigBase*' , +'TDEConfigGroup*' => 'kde_TDEConfigGroup*', +'TDEConfigGroupSaver*' => 'kde_TDEConfigGroupSaver*', +'TDEConfigINIBackEnd*' => 'kde_TDEConfigINIBackEnd*', 'KContainerLayout*' => 'kde_KContainerLayout*', 'KContainerLayoutItem*' => 'kde_KContainerLayoutItem*' , 'KContextMenuManager*' => 'kde_KContextMenuManager*', @@ -929,15 +929,15 @@ BEGIN 'KHelpMenu*' => 'kde_KHelpMenu*', 'KHistoryCombo*' => 'kde_KHistoryCombo*', 'KIO*' => 'kde_KIO*', -'KIO::CopyJob*' => 'kde_CopyJob*' , -'KIO::DeleteJob*' => 'kde_DeleteJob*' , -'KIO::Job*' => 'kde_Job*' , -'KIO::ListJob*' => 'kde_ListJob*' , -'KIO::RenameDlg_Mode' => 'int', -'KIO::RenameDlg_Result' => 'int', -'KIO::SimpleJob*' => 'kde_SimpleJob*', -'KIO::SkipDlg_Result' => 'int', -'KIO::Slave*' => 'kde_Slave*', +'TDEIO::CopyJob*' => 'kde_CopyJob*' , +'TDEIO::DeleteJob*' => 'kde_DeleteJob*' , +'TDEIO::Job*' => 'kde_Job*' , +'TDEIO::ListJob*' => 'kde_ListJob*' , +'TDEIO::RenameDlg_Mode' => 'int', +'TDEIO::RenameDlg_Result' => 'int', +'TDEIO::SimpleJob*' => 'kde_SimpleJob*', +'TDEIO::SkipDlg_Result' => 'int', +'TDEIO::Slave*' => 'kde_Slave*', 'KIOInputStream&' => 'kde_KIOInputStream*', 'KIOInputStream*' => 'kde_KIOInputStream*', 'KIOTestSlow&' => 'kde_KIOTestSlow*', @@ -2857,7 +2857,7 @@ sub addNamespace if ( $className =~ /^(AuthInfo|AutoLogin|CacheInfo|ChmodJob|Connection|CopyInfo|CopyJob|DefaultProgress|DeleteJob|FileCopyJob|Job|ListJob|MetaData|MimetypeJob|MultiGetJob|NetAccess|NetRC|PasswordDialog|PreviewJob|ProgressBase|RenameDlg|Scheduler|SessionData|SimpleJob|SkipDlg|Slave|SlaveBase|SlaveConfig|SlaveInterface|StatJob|StatusbarProgress|TCPSlaveBase|Task|TransferJob|UDSAtom)/ ) { - return "KIO::".$className; + return "TDEIO::".$className; } if ( $className =~ /^(DrawContentsEvent|MouseDoubleClickEvent|MouseEvent|MouseMoveEvent|MousePressEvent|MouseReleaseEvent)/ ) -- cgit v1.2.1