diff --git a/kalyptus/ChangeLog b/kalyptus/ChangeLog index be1c44e6..ce82234c 100644 --- a/kalyptus/ChangeLog +++ b/kalyptus/ChangeLog @@ -261,7 +261,7 @@ 2003-11-29 Richard Dale - * Fixed parsing of casts inside enums in kfileitem.h: + * Fixed parsing of casts inside enums in tdefileitem.h: enum { Unknown = (mode_t) - 1 }; Hmm, not sure what that's up to anyway.. * Added a special Source property to method nodes in TQGlobalSpace. diff --git a/kalyptus/README b/kalyptus/README index ee3d36c9..781ffe92 100644 --- a/kalyptus/README +++ b/kalyptus/README @@ -51,7 +51,7 @@ Remove any TQ_OVERRIDE macros from the Qt headers, and remove EXPORT_DOCKCLASS f KDE headers # Generate Java and C++ sources. Copy all the target headers to directory 'test/tmp' -kalyptus -fjava test/tmp/*.h test/tmp/dom/*.h test/tmp/kio/*.h test/tmp/tdeprint/*.h \ +kalyptus -fjava test/tmp/*.h test/tmp/dom/*.h test/tmp/tdeio/*.h test/tmp/tdeprint/*.h \ test/tmp/kjs/*.h test/tmp/tdeparts/*.h test/tmp/tdesu/*.h test/ktextedit/*.h test/tmp/libtdemid/*.h # Shorten generated filenames diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus index 056a7d4b..5ffa8af8 100644 --- a/kalyptus/kalyptus +++ b/kalyptus/kalyptus @@ -1683,7 +1683,7 @@ sub makeParamList($$$) } if (defined $defaultparam && $isEnum) { - # Remove any casts in enum values, for example this in kfileitem.h: + # Remove any casts in enum values, for example this in tdefileitem.h: # 'enum { Unknown = (mode_t) - 1 };' $defaultparam =~ s/\([^\)]+\)(.*[0-9].*)/$1/; } diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index ec89863e..2c39d401 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -3113,11 +3113,11 @@ sub writeClassDoc if ($javaClassName eq 'KIO') { # Hack: namespaces can be defined in several source files, which doesn't work, so this.. - print JNISOURCE "#include \n"; - print JNISOURCE "#include \n"; - print JNISOURCE "#include \n"; - print JNISOURCE "#include \n"; - print JNISOURCE "#include \n"; + print JNISOURCE "#include \n"; + print JNISOURCE "#include \n"; + print JNISOURCE "#include \n"; + print JNISOURCE "#include \n"; + print JNISOURCE "#include \n"; } print JNISOURCE "\n"; @@ -3355,7 +3355,7 @@ sub addIncludeForClass($$$) { my ( $node, $addInclude, $debugMe ) = @_; my $sourcename = $node->{Source}->{astNodeName}; - if ( $sourcename !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { + if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { $sourcename =~ s!.*/(.*)!$1!m; } # die "Empty source name for $node->{astNodeName}" if ( $sourcename eq '' ); @@ -3624,7 +3624,7 @@ sub generateMethod($$$$$$$$$) return; } - if ( $sourcename !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { + if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { $sourcename =~ s!.*/(.*)!$1!m; } if ( $sourcename eq '' ) { @@ -4155,7 +4155,7 @@ sub generateAllMethods($$$$$$$$) my $sourcename = $classNode->{Source}->{astNodeName}; - if ( $sourcename !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { + if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { $sourcename =~ s!.*/(.*)!$1!m; } # die "Empty source name for $classNode->{astNodeName} $classNode->{Source}->{astNodeName}" if ( $sourcename eq '' ); @@ -4164,7 +4164,7 @@ sub generateAllMethods($$$$$$$$) $addInclude->{$sourcename} = 1; # my $s; # for my $sn( @{$classNode->{Sources}} ) { -# if ( ($s = $sn->{astNodeName}) !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { +# if ( ($s = $sn->{astNodeName}) !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { # $s =~ s!.*/(.*)!$1!m; # } # $addInclude->{$s} = 1; diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm index 2bc86651..92d2c93a 100644 --- a/kalyptus/kalyptusCxxToJava.pm +++ b/kalyptus/kalyptusCxxToJava.pm @@ -1732,7 +1732,7 @@ sub generateMethod($$$$$$$) return; } - if ( $sourcename !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { + if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { $sourcename =~ s!.*/(.*)!$1!m; } if ( $sourcename eq '' ) { @@ -2124,7 +2124,7 @@ sub generateAllMethods($$$$$$) my $sourcename = $classNode->{Source}->{astNodeName}; - if ( $sourcename !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { + if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { $sourcename =~ s!.*/(.*)!$1!m; } die "Empty source name for $classNode->{astNodeName}" if ( $sourcename eq '' ); @@ -2148,7 +2148,7 @@ sub generateAllMethods($$$$$$) if ($classNode->{astNodeName} ne $main::globalSpaceClassName) { # my $s; # for my $sn( @{$classNode->{Sources}} ) { -# if ( ($s = $sn->{astNodeName}) !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { +# if ( ($s = $sn->{astNodeName}) !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { # $s =~ s!.*/(.*)!$1!m; # } # $addInclude->{$s} = 1; diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm index 710a5219..c3b79946 100644 --- a/kalyptus/kalyptusCxxToKimono.pm +++ b/kalyptus/kalyptusCxxToKimono.pm @@ -1777,7 +1777,7 @@ sub generateMethod($$$$$$$) return; } - if ( $sourcename !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { + if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { $sourcename =~ s!.*/(.*)!$1!m; } if ( $sourcename eq '' ) { @@ -2317,7 +2317,7 @@ sub generateAllMethods($$$$$$) my $sourcename = $classNode->{Source}->{astNodeName}; - if ( $sourcename !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { + if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { $sourcename =~ s!.*/(.*)!$1!m; } die "Empty source name for $classNode->{astNodeName}" if ( $sourcename eq '' ); @@ -2339,7 +2339,7 @@ sub generateAllMethods($$$$$$) if ($classNode->{astNodeName} ne $main::globalSpaceClassName) { # my $s; # for my $sn( @{$classNode->{Sources}} ) { -# if ( ($s = $sn->{astNodeName}) !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { +# if ( ($s = $sn->{astNodeName}) !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { # $s =~ s!.*/(.*)!$1!m; # } # $addInclude->{$s} = 1; diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm index 42d9f222..dffb27c9 100644 --- a/kalyptus/kalyptusCxxToSmoke.pm +++ b/kalyptus/kalyptusCxxToSmoke.pm @@ -230,7 +230,7 @@ BEGIN 'TQStyle::SubControls' => 'int', ); -$headerSubdirectories = "kio/|tdevelop/|kinterfacedesigner/|kontact/|kate/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/|knewstuff/" +$headerSubdirectories = "tdeio/|tdevelop/|kinterfacedesigner/|kontact/|kate/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/|knewstuff/" } @@ -932,9 +932,9 @@ my $fhn =1; # static delete $includes{"kshortcut.h"}; } if (defined $includes{"kshortcutlist.h"}) { - print $fh "#include \n"; + print $fh "#include \n"; print $fh "#include \n"; - delete $includes{"kconfigbase.h"}; + delete $includes{"tdeconfigbase.h"}; delete $includes{"kshortcutlist.h"}; } if (defined $includes{"kaction.h"}) { diff --git a/kdejava/ChangeLog b/kdejava/ChangeLog index ce043d5b..1ec88c42 100644 --- a/kdejava/ChangeLog +++ b/kdejava/ChangeLog @@ -74,7 +74,7 @@ AuthInfo and Observer classes * Converted '\c' tags in comments to pairs tags * Improved conversion of C++ code snippets to java - * Fixed bug in KIO Scheduler.connect(), and the example in test/kioslave now works + * Fixed bug in KIO Scheduler.connect(), and the example in test/tdeioslave now works correctly * Added some long long types, converted to java longs (both 64 bit) @@ -152,7 +152,7 @@ 2002-03-22 Richard Dale * Added missing KMainWindow constructor * Added KIO slot/signal types for writing as well as reading. - * Added missing kioslave classes + * Added missing tdeioslave classes * Added new KIO classes Scheduler, KIO, ProgressBase and StatusbarProgress * Fixed various method linking problems 2002-03-19 Richard Dale diff --git a/kdejava/koala/kdejava/AuthInfo.cpp b/kdejava/koala/kdejava/AuthInfo.cpp index 4c495faa..a5f5d078 100644 --- a/kdejava/koala/kdejava/AuthInfo.cpp +++ b/kdejava/koala/kdejava/AuthInfo.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/Connection.cpp b/kdejava/koala/kdejava/Connection.cpp index 82025e54..92616fe2 100644 --- a/kdejava/koala/kdejava/Connection.cpp +++ b/kdejava/koala/kdejava/Connection.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/CopyJob.cpp b/kdejava/koala/kdejava/CopyJob.cpp index 516b9039..43297aff 100644 --- a/kdejava/koala/kdejava/CopyJob.cpp +++ b/kdejava/koala/kdejava/CopyJob.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/DavJob.cpp b/kdejava/koala/kdejava/DavJob.cpp index 0c0c3184..cfa1da70 100644 --- a/kdejava/koala/kdejava/DavJob.cpp +++ b/kdejava/koala/kdejava/DavJob.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/DefaultProgress.cpp b/kdejava/koala/kdejava/DefaultProgress.cpp index e95e14b8..3d2d4dcc 100644 --- a/kdejava/koala/kdejava/DefaultProgress.cpp +++ b/kdejava/koala/kdejava/DefaultProgress.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include +#include +#include #include #include diff --git a/kdejava/koala/kdejava/DeleteJob.cpp b/kdejava/koala/kdejava/DeleteJob.cpp index 53e28d9f..8c017c7c 100644 --- a/kdejava/koala/kdejava/DeleteJob.cpp +++ b/kdejava/koala/kdejava/DeleteJob.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include +#include +#include #include #include diff --git a/kdejava/koala/kdejava/FileCopyJob.cpp b/kdejava/koala/kdejava/FileCopyJob.cpp index 15f8ef95..0a7520e7 100644 --- a/kdejava/koala/kdejava/FileCopyJob.cpp +++ b/kdejava/koala/kdejava/FileCopyJob.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include +#include +#include #include #include diff --git a/kdejava/koala/kdejava/Job.cpp b/kdejava/koala/kdejava/Job.cpp index 865e89c1..a6790771 100644 --- a/kdejava/koala/kdejava/Job.cpp +++ b/kdejava/koala/kdejava/Job.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include +#include +#include #include #include diff --git a/kdejava/koala/kdejava/KCombiView.cpp b/kdejava/koala/kdejava/KCombiView.cpp index 0613d6f4..74a8c9bc 100644 --- a/kdejava/koala/kdejava/KCombiView.cpp +++ b/kdejava/koala/kdejava/KCombiView.cpp @@ -2,10 +2,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KDE.cpp b/kdejava/koala/kdejava/KDE.cpp index 68d62183..0fcdeac5 100644 --- a/kdejava/koala/kdejava/KDE.cpp +++ b/kdejava/koala/kdejava/KDE.cpp @@ -2,21 +2,21 @@ #include #include #include -#include +#include #include #include #include -#include -#include +#include +#include #include #include #include #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/KDEDesktopMimeType.cpp b/kdejava/koala/kdejava/KDEDesktopMimeType.cpp index f6dcd474..03a20300 100644 --- a/kdejava/koala/kdejava/KDEDesktopMimeType.cpp +++ b/kdejava/koala/kdejava/KDEDesktopMimeType.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KDEJavaSlot.h b/kdejava/koala/kdejava/KDEJavaSlot.h index f1644724..56903ba6 100644 --- a/kdejava/koala/kdejava/KDEJavaSlot.h +++ b/kdejava/koala/kdejava/KDEJavaSlot.h @@ -31,18 +31,18 @@ #include #include #include -#include +#include #include #include #include #include #include #include -#include -#include +#include +#include #include #include -#include +#include #include class KDEJavaSlotFactory; diff --git a/kdejava/koala/kdejava/KDESupport.h b/kdejava/koala/kdejava/KDESupport.h index 4e69da17..9e012e86 100644 --- a/kdejava/koala/kdejava/KDESupport.h +++ b/kdejava/koala/kdejava/KDESupport.h @@ -23,8 +23,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/KDialogBase.cpp b/kdejava/koala/kdejava/KDialogBase.cpp index 5cc330bd..9a96f981 100644 --- a/kdejava/koala/kdejava/KDialogBase.cpp +++ b/kdejava/koala/kdejava/KDialogBase.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KDirLister.cpp b/kdejava/koala/kdejava/KDirLister.cpp index ddf550ca..b7b8f6f0 100644 --- a/kdejava/koala/kdejava/KDirLister.cpp +++ b/kdejava/koala/kdejava/KDirLister.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/KDirOperator.cpp b/kdejava/koala/kdejava/KDirOperator.cpp index 94036ad3..73c616fc 100644 --- a/kdejava/koala/kdejava/KDirOperator.cpp +++ b/kdejava/koala/kdejava/KDirOperator.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KDirSize.cpp b/kdejava/koala/kdejava/KDirSize.cpp index fbf1027d..5f347338 100644 --- a/kdejava/koala/kdejava/KDirSize.cpp +++ b/kdejava/koala/kdejava/KDirSize.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/KEntry.cpp b/kdejava/koala/kdejava/KEntry.cpp index c7158192..4b613e5c 100644 --- a/kdejava/koala/kdejava/KEntry.cpp +++ b/kdejava/koala/kdejava/KEntry.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KEntryKey.cpp b/kdejava/koala/kdejava/KEntryKey.cpp index e4c74e50..94c493d9 100644 --- a/kdejava/koala/kdejava/KEntryKey.cpp +++ b/kdejava/koala/kdejava/KEntryKey.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KFile.cpp b/kdejava/koala/kdejava/KFile.cpp index 21d132fa..9ec7fb63 100644 --- a/kdejava/koala/kdejava/KFile.cpp +++ b/kdejava/koala/kdejava/KFile.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KFileDetailView.cpp b/kdejava/koala/kdejava/KFileDetailView.cpp index c6888d7e..f7e0f52d 100644 --- a/kdejava/koala/kdejava/KFileDetailView.cpp +++ b/kdejava/koala/kdejava/KFileDetailView.cpp @@ -1,12 +1,12 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include -#include +#include +#include #include #include -#include +#include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KFileDialog.cpp b/kdejava/koala/kdejava/KFileDialog.cpp index 2bf54f2b..85605210 100644 --- a/kdejava/koala/kdejava/KFileDialog.cpp +++ b/kdejava/koala/kdejava/KFileDialog.cpp @@ -1,10 +1,10 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KFileFilter.cpp b/kdejava/koala/kdejava/KFileFilter.cpp index 6d1f3980..6398f9ee 100644 --- a/kdejava/koala/kdejava/KFileFilter.cpp +++ b/kdejava/koala/kdejava/KFileFilter.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KFileFilterCombo.cpp b/kdejava/koala/kdejava/KFileFilterCombo.cpp index 9a9279d9..53fa3278 100644 --- a/kdejava/koala/kdejava/KFileFilterCombo.cpp +++ b/kdejava/koala/kdejava/KFileFilterCombo.cpp @@ -1,7 +1,7 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KFileIconView.cpp b/kdejava/koala/kdejava/KFileIconView.cpp index cb0e9b51..09158b5a 100644 --- a/kdejava/koala/kdejava/KFileIconView.cpp +++ b/kdejava/koala/kdejava/KFileIconView.cpp @@ -1,12 +1,12 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include -#include +#include +#include #include -#include +#include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KFileIconViewItem.cpp b/kdejava/koala/kdejava/KFileIconViewItem.cpp index 5fb2b97e..fd76934c 100644 --- a/kdejava/koala/kdejava/KFileIconViewItem.cpp +++ b/kdejava/koala/kdejava/KFileIconViewItem.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KFileItem.cpp b/kdejava/koala/kdejava/KFileItem.cpp index 73beaa90..f95b67b6 100644 --- a/kdejava/koala/kdejava/KFileItem.cpp +++ b/kdejava/koala/kdejava/KFileItem.cpp @@ -1,8 +1,8 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include +#include +#include #include -#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/KFileListViewItem.cpp b/kdejava/koala/kdejava/KFileListViewItem.cpp index 23c88fd4..43747d56 100644 --- a/kdejava/koala/kdejava/KFileListViewItem.cpp +++ b/kdejava/koala/kdejava/KFileListViewItem.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KFileMetaInfo.cpp b/kdejava/koala/kdejava/KFileMetaInfo.cpp index 18e3881c..37d51373 100644 --- a/kdejava/koala/kdejava/KFileMetaInfo.cpp +++ b/kdejava/koala/kdejava/KFileMetaInfo.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/KFileMetaInfoGroup.cpp b/kdejava/koala/kdejava/KFileMetaInfoGroup.cpp index 0a397228..ec132d28 100644 --- a/kdejava/koala/kdejava/KFileMetaInfoGroup.cpp +++ b/kdejava/koala/kdejava/KFileMetaInfoGroup.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/KFileMetaInfoItem.cpp b/kdejava/koala/kdejava/KFileMetaInfoItem.cpp index a21ed3e3..160c3eb2 100644 --- a/kdejava/koala/kdejava/KFileMetaInfoItem.cpp +++ b/kdejava/koala/kdejava/KFileMetaInfoItem.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KFilePlugin.cpp b/kdejava/koala/kdejava/KFilePlugin.cpp index a60945de..378aaee4 100644 --- a/kdejava/koala/kdejava/KFilePlugin.cpp +++ b/kdejava/koala/kdejava/KFilePlugin.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KFilePreview.cpp b/kdejava/koala/kdejava/KFilePreview.cpp index 217d290c..8b20aaa0 100644 --- a/kdejava/koala/kdejava/KFilePreview.cpp +++ b/kdejava/koala/kdejava/KFilePreview.cpp @@ -1,12 +1,12 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include -#include +#include +#include #include -#include +#include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KFileShare.cpp b/kdejava/koala/kdejava/KFileShare.cpp index 5519f012..03740be9 100644 --- a/kdejava/koala/kdejava/KFileShare.cpp +++ b/kdejava/koala/kdejava/KFileShare.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KFileTreeBranch.cpp b/kdejava/koala/kdejava/KFileTreeBranch.cpp index 658175bf..7fb78266 100644 --- a/kdejava/koala/kdejava/KFileTreeBranch.cpp +++ b/kdejava/koala/kdejava/KFileTreeBranch.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include +#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/KFileTreeView.cpp b/kdejava/koala/kdejava/KFileTreeView.cpp index 0ecc224d..6267d007 100644 --- a/kdejava/koala/kdejava/KFileTreeView.cpp +++ b/kdejava/koala/kdejava/KFileTreeView.cpp @@ -1,7 +1,7 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/KFileTreeViewItem.cpp b/kdejava/koala/kdejava/KFileTreeViewItem.cpp index e0db5d48..f68ddf34 100644 --- a/kdejava/koala/kdejava/KFileTreeViewItem.cpp +++ b/kdejava/koala/kdejava/KFileTreeViewItem.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KFileTreeViewToolTip.cpp b/kdejava/koala/kdejava/KFileTreeViewToolTip.cpp index 4826268f..3e119137 100644 --- a/kdejava/koala/kdejava/KFileTreeViewToolTip.cpp +++ b/kdejava/koala/kdejava/KFileTreeViewToolTip.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KFileView.cpp b/kdejava/koala/kdejava/KFileView.cpp index 2cbaa8e0..b77cd9fe 100644 --- a/kdejava/koala/kdejava/KFileView.cpp +++ b/kdejava/koala/kdejava/KFileView.cpp @@ -1,10 +1,10 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include -#include +#include +#include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KFileViewSignaler.cpp b/kdejava/koala/kdejava/KFileViewSignaler.cpp index 64fe3974..bbb0146a 100644 --- a/kdejava/koala/kdejava/KFileViewSignaler.cpp +++ b/kdejava/koala/kdejava/KFileViewSignaler.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KPanelApplet.cpp b/kdejava/koala/kdejava/KPanelApplet.cpp index 494b069e..4846aa11 100644 --- a/kdejava/koala/kdejava/KPanelApplet.cpp +++ b/kdejava/koala/kdejava/KPanelApplet.cpp @@ -1,7 +1,7 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KProtocolManager.cpp b/kdejava/koala/kdejava/KProtocolManager.cpp index 4b1494ff..ba0bb159 100644 --- a/kdejava/koala/kdejava/KProtocolManager.cpp +++ b/kdejava/koala/kdejava/KProtocolManager.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KSharedConfig.cpp b/kdejava/koala/kdejava/KSharedConfig.cpp index 9d7797c7..3f75edce 100644 --- a/kdejava/koala/kdejava/KSharedConfig.cpp +++ b/kdejava/koala/kdejava/KSharedConfig.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KShred.cpp b/kdejava/koala/kdejava/KShred.cpp index f84bc534..9e2f3e9c 100644 --- a/kdejava/koala/kdejava/KShred.cpp +++ b/kdejava/koala/kdejava/KShred.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KSimpleFileFilter.cpp b/kdejava/koala/kdejava/KSimpleFileFilter.cpp index 30968cff..82b08f00 100644 --- a/kdejava/koala/kdejava/KSimpleFileFilter.cpp +++ b/kdejava/koala/kdejava/KSimpleFileFilter.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KURLCompletion.cpp b/kdejava/koala/kdejava/KURLCompletion.cpp index 28fe31b8..6d51855c 100644 --- a/kdejava/koala/kdejava/KURLCompletion.cpp +++ b/kdejava/koala/kdejava/KURLCompletion.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/ListJob.cpp b/kdejava/koala/kdejava/ListJob.cpp index b61eb6ef..7a57245d 100644 --- a/kdejava/koala/kdejava/ListJob.cpp +++ b/kdejava/koala/kdejava/ListJob.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include +#include +#include #include #include diff --git a/kdejava/koala/kdejava/MetaInfoJob.cpp b/kdejava/koala/kdejava/MetaInfoJob.cpp index b02493ce..2c0b8ffe 100644 --- a/kdejava/koala/kdejava/MetaInfoJob.cpp +++ b/kdejava/koala/kdejava/MetaInfoJob.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/MimetypeJob.cpp b/kdejava/koala/kdejava/MimetypeJob.cpp index 4881c2f6..a26fbaa0 100644 --- a/kdejava/koala/kdejava/MimetypeJob.cpp +++ b/kdejava/koala/kdejava/MimetypeJob.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/MultiGetJob.cpp b/kdejava/koala/kdejava/MultiGetJob.cpp index 55a32c02..7f856c96 100644 --- a/kdejava/koala/kdejava/MultiGetJob.cpp +++ b/kdejava/koala/kdejava/MultiGetJob.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include +#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/NetAccess.cpp b/kdejava/koala/kdejava/NetAccess.cpp index e2704951..c0b49db5 100644 --- a/kdejava/koala/kdejava/NetAccess.cpp +++ b/kdejava/koala/kdejava/NetAccess.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include +#include +#include #include #include diff --git a/kdejava/koala/kdejava/Observer.cpp b/kdejava/koala/kdejava/Observer.cpp index cf3e70ea..7ace02a9 100644 --- a/kdejava/koala/kdejava/Observer.cpp +++ b/kdejava/koala/kdejava/Observer.cpp @@ -1,13 +1,13 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include -#include +#include +#include +#include #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/PasswordDialog.cpp b/kdejava/koala/kdejava/PasswordDialog.cpp index bb60d287..80791b50 100644 --- a/kdejava/koala/kdejava/PasswordDialog.cpp +++ b/kdejava/koala/kdejava/PasswordDialog.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/PreviewJob.cpp b/kdejava/koala/kdejava/PreviewJob.cpp index 7ea76580..abdfa85f 100644 --- a/kdejava/koala/kdejava/PreviewJob.cpp +++ b/kdejava/koala/kdejava/PreviewJob.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/ProgressBase.cpp b/kdejava/koala/kdejava/ProgressBase.cpp index 2df6da2a..ad277a57 100644 --- a/kdejava/koala/kdejava/ProgressBase.cpp +++ b/kdejava/koala/kdejava/ProgressBase.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include +#include +#include #include #include diff --git a/kdejava/koala/kdejava/RenameDlg.cpp b/kdejava/koala/kdejava/RenameDlg.cpp index fc890ca7..6d8edff4 100644 --- a/kdejava/koala/kdejava/RenameDlg.cpp +++ b/kdejava/koala/kdejava/RenameDlg.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include +#include +#include #include #include diff --git a/kdejava/koala/kdejava/Scheduler.cpp b/kdejava/koala/kdejava/Scheduler.cpp index 99345997..85b27f7e 100644 --- a/kdejava/koala/kdejava/Scheduler.cpp +++ b/kdejava/koala/kdejava/Scheduler.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include +#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/SessionData.cpp b/kdejava/koala/kdejava/SessionData.cpp index 58733673..0ffa30c1 100644 --- a/kdejava/koala/kdejava/SessionData.cpp +++ b/kdejava/koala/kdejava/SessionData.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include +#include +#include #include #include diff --git a/kdejava/koala/kdejava/SimpleJob.cpp b/kdejava/koala/kdejava/SimpleJob.cpp index 88558cd8..10403282 100644 --- a/kdejava/koala/kdejava/SimpleJob.cpp +++ b/kdejava/koala/kdejava/SimpleJob.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include +#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/SkipDlg.cpp b/kdejava/koala/kdejava/SkipDlg.cpp index 781af808..1dc06ee3 100644 --- a/kdejava/koala/kdejava/SkipDlg.cpp +++ b/kdejava/koala/kdejava/SkipDlg.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/Slave.cpp b/kdejava/koala/kdejava/Slave.cpp index 87bfc0d0..5a4c8e3e 100644 --- a/kdejava/koala/kdejava/Slave.cpp +++ b/kdejava/koala/kdejava/Slave.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include +#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/SlaveBase.cpp b/kdejava/koala/kdejava/SlaveBase.cpp index 9a9ca11f..4c586a86 100644 --- a/kdejava/koala/kdejava/SlaveBase.cpp +++ b/kdejava/koala/kdejava/SlaveBase.cpp @@ -1,7 +1,7 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/SlaveInterface.cpp b/kdejava/koala/kdejava/SlaveInterface.cpp index 28dae4aa..9e944a51 100644 --- a/kdejava/koala/kdejava/SlaveInterface.cpp +++ b/kdejava/koala/kdejava/SlaveInterface.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include +#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/StatJob.cpp b/kdejava/koala/kdejava/StatJob.cpp index f4d303ad..f1a439a2 100644 --- a/kdejava/koala/kdejava/StatJob.cpp +++ b/kdejava/koala/kdejava/StatJob.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include +#include +#include #include #include diff --git a/kdejava/koala/kdejava/StatusbarProgress.cpp b/kdejava/koala/kdejava/StatusbarProgress.cpp index b5d40792..62065af3 100644 --- a/kdejava/koala/kdejava/StatusbarProgress.cpp +++ b/kdejava/koala/kdejava/StatusbarProgress.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include +#include +#include #include #include diff --git a/kdejava/koala/kdejava/StoredTransferJob.cpp b/kdejava/koala/kdejava/StoredTransferJob.cpp index c9396d6c..cf1abfd5 100644 --- a/kdejava/koala/kdejava/StoredTransferJob.cpp +++ b/kdejava/koala/kdejava/StoredTransferJob.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEConfig.cpp b/kdejava/koala/kdejava/TDEConfig.cpp index dc571a89..cdefbcfe 100644 --- a/kdejava/koala/kdejava/TDEConfig.cpp +++ b/kdejava/koala/kdejava/TDEConfig.cpp @@ -1,8 +1,8 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEConfigBackEnd.cpp b/kdejava/koala/kdejava/TDEConfigBackEnd.cpp index 5834b960..521d96e4 100644 --- a/kdejava/koala/kdejava/TDEConfigBackEnd.cpp +++ b/kdejava/koala/kdejava/TDEConfigBackEnd.cpp @@ -1,8 +1,8 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include +#include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEConfigBase.cpp b/kdejava/koala/kdejava/TDEConfigBase.cpp index 7ae6c398..73fcf72c 100644 --- a/kdejava/koala/kdejava/TDEConfigBase.cpp +++ b/kdejava/koala/kdejava/TDEConfigBase.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/TDEConfigGroup.cpp b/kdejava/koala/kdejava/TDEConfigGroup.cpp index 43bfa969..3ab3d917 100644 --- a/kdejava/koala/kdejava/TDEConfigGroup.cpp +++ b/kdejava/koala/kdejava/TDEConfigGroup.cpp @@ -1,7 +1,7 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEConfigGroupSaver.cpp b/kdejava/koala/kdejava/TDEConfigGroupSaver.cpp index 91dc2500..42f01c8c 100644 --- a/kdejava/koala/kdejava/TDEConfigGroupSaver.cpp +++ b/kdejava/koala/kdejava/TDEConfigGroupSaver.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEConfigINIBackEnd.cpp b/kdejava/koala/kdejava/TDEConfigINIBackEnd.cpp index 585d0e15..2a6136a1 100644 --- a/kdejava/koala/kdejava/TDEConfigINIBackEnd.cpp +++ b/kdejava/koala/kdejava/TDEConfigINIBackEnd.cpp @@ -1,8 +1,8 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include +#include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEIO.cpp b/kdejava/koala/kdejava/TDEIO.cpp index 5e94eb16..a891dd45 100644 --- a/kdejava/koala/kdejava/TDEIO.cpp +++ b/kdejava/koala/kdejava/TDEIO.cpp @@ -1,24 +1,24 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include +#include +#include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include JNIEXPORT jstring JNICALL Java_org_kde_koala_KIO_buildErrorString(JNIEnv* env, jclass cls, jint errorCode, jstring errorText) diff --git a/kdejava/koala/kdejava/TransferJob.cpp b/kdejava/koala/kdejava/TransferJob.cpp index d1f3b4b4..5c027f7c 100644 --- a/kdejava/koala/kdejava/TransferJob.cpp +++ b/kdejava/koala/kdejava/TransferJob.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include +#include +#include #include #include #include diff --git a/kdejava/koala/org/kde/koala/Job.java b/kdejava/koala/org/kde/koala/Job.java index debc3f1d..697570d5 100644 --- a/kdejava/koala/org/kde/koala/Job.java +++ b/kdejava/koala/org/kde/koala/Job.java @@ -37,7 +37,7 @@ public class Job extends TQObject { Abort this job. This kills all subjobs and deletes the job. @param tquietly if false, Job will emit signal result - and ask kio_uiserver to close the progress window. + and ask tdeio_uiserver to close the progress window. tquietly is set to true for subjobs. Whether applications should call with true or false depends on whether they rely on result being emitted or not. diff --git a/kdejava/koala/org/kde/koala/KBugReport.java b/kdejava/koala/org/kde/koala/KBugReport.java index 42384963..24d4513a 100644 --- a/kdejava/koala/org/kde/koala/KBugReport.java +++ b/kdejava/koala/org/kde/koala/KBugReport.java @@ -64,8 +64,8 @@ public class KBugReport extends KDialogBase { */ protected native boolean sendBugReport(); /** - "Configure email" has been clicked - this calls kcmshell System/email - @short "Configure email" has been clicked - this calls kcmshell System/email + "Configure email" has been clicked - this calls tdecmshell System/email + @short "Configure email" has been clicked - this calls tdecmshell System/email */ protected native void slotConfigureEmail(); /** diff --git a/kdejava/koala/org/kde/koala/KFile.java b/kdejava/koala/org/kde/koala/KFile.java index 96ddfa2c..9de3ff61 100644 --- a/kdejava/koala/org/kde/koala/KFile.java +++ b/kdejava/koala/org/kde/koala/KFile.java @@ -7,9 +7,9 @@ import org.kde.qt.QtSupport; /** KFile is a class which provides a namespace for some enumerated - values associated with the kfile library. You will never need to + values associated with the tdefile library. You will never need to construct a KFile object itself. - @short KFile is a class which provides a namespace for some enumerated values associated with the kfile library. + @short KFile is a class which provides a namespace for some enumerated values associated with the tdefile library. */ public class KFile implements QtSupport { diff --git a/kdejava/koala/org/kde/koala/KFileDialog.java b/kdejava/koala/org/kde/koala/KFileDialog.java index d2ae5f6f..7f8957da 100644 --- a/kdejava/koala/org/kde/koala/KFileDialog.java +++ b/kdejava/koala/org/kde/koala/KFileDialog.java @@ -20,7 +20,7 @@ import org.kde.qt.TQWidget; The dialog has been designed to allow applications to customise it by subclassing. It uses geometry management to ensure that subclasses can easily add children that will be incorporated into the layout. - \image html kfiledialog.png "KDE File Dialog" + \image html tdefiledialog.png "KDE File Dialog" See {@link KFileDialogSignals} for signals emitted by KFileDialog @author Richard J. Moore , Carsten Pfeiffer @@ -225,11 +225,11 @@ public class KFileDialog extends KDialogBase { If no | is found in the expression, just the namefilter is shown. Examples: 
-		 kfile.setFilter("*.cpp|C++ Source Files\n.h|Header files");
-		 kfile.setFilter("*.cpp");
-		 kfile.setFilter("*.cpp|Sources (.cpp)");
-		 kfile.setFilter("*.cpp|" + i18n("Sources (.cpp)"));
-		 kfile.setFilter("*.cpp .cc .C|C++ Source Files\n.h .H|Header files");
+		 tdefile.setFilter("*.cpp|C++ Source Files\n.h|Header files");
+		 tdefile.setFilter("*.cpp");
+		 tdefile.setFilter("*.cpp|Sources (.cpp)");
+		 tdefile.setFilter("*.cpp|" + i18n("Sources (.cpp)"));
+		 tdefile.setFilter("*.cpp .cc .C|C++ Source Files\n.h .H|Header files");
Note: The text to display is not parsed in any way. So, if you want to show the suffix to select by a specific filter, you must @@ -239,8 +239,8 @@ public class KFileDialog extends KDialogBase { a '\'. You can specify multiple mimetypes like this (separated with space): 
-		 kfile.setFilter( "image/png text/html text/plain" );
-		 kfile.setFilter( "*.cue|CUE\\/BIN Files (.cue)" );
+		 tdefile.setFilter( "image/png text/html text/plain" );
+		 tdefile.setFilter( "*.cue|CUE\\/BIN Files (.cue)" );
@short Sets the filter to be used to filter. @see #filterChanged @@ -326,7 +326,7 @@ public class KFileDialog extends KDialogBase { yourAction = new KAction( i18n("Your Action"), 0, this, SLOT("yourSlot()"), this, "action name" ); - yourAction.plug( kfileDialog.toolBar() ); + yourAction.plug( tdefileDialog.toolBar() ); @short Returns a pointer to the toolbar. */ diff --git a/kdejava/koala/org/kde/koala/KFileItem.java b/kdejava/koala/org/kde/koala/KFileItem.java index 29790ff6..94ee6e7e 100644 --- a/kdejava/koala/org/kde/koala/KFileItem.java +++ b/kdejava/koala/org/kde/koala/KFileItem.java @@ -447,11 +447,11 @@ public class KFileItem implements QtSupport { I.e. a KFileIconView that associates a KFileIconViewItem (an item suitable for use with TQIconView) does 
-		 kfileItem.setExtraData( this, iconViewItem );
+		 tdefileItem.setExtraData( this, iconViewItem );
and can later access the iconViewItem by doing 
-		 KFileIconViewItem iconViewItem = (KFileIconViewItem)( kfileItem.extraData( this ));
+		 KFileIconViewItem iconViewItem = (KFileIconViewItem)( tdefileItem.extraData( this ));
This is usually more efficient then having every view associate data to items by using a separate TQDict or TQMap. diff --git a/kdejava/koala/org/kde/koala/KFilePlugin.java b/kdejava/koala/org/kde/koala/KFilePlugin.java index 000c4ac4..3b00e4c9 100644 --- a/kdejava/koala/org/kde/koala/KFilePlugin.java +++ b/kdejava/koala/org/kde/koala/KFilePlugin.java @@ -92,7 +92,7 @@ import org.kde.qt.TQObject; Example: @code typedef KGenericFactory FooFactory; - K_EXPORT_COMPONENT_FACTORY(kfile_foo, FooFactory("kfile_foo")); + K_EXPORT_COMPONENT_FACTORY(tdefile_foo, FooFactory("tdefile_foo")); @endcode To make your plugin available within KDE, you also need to provide a .desktop file which describes your plugin. The required fields in the @@ -115,7 +115,7 @@ import org.kde.qt.TQObject; Type=Service Name=Foo Info ServiceTypes=KFilePlugin - X-TDE-Library=kfile_foo + X-TDE-Library=tdefile_foo MimeType=application/x-foo PreferredGroups=FooInfo PreferredItems=Items,Size diff --git a/kdejava/koala/org/kde/koala/KHistoryCombo.java b/kdejava/koala/org/kde/koala/KHistoryCombo.java index 780f6a07..97e7bbee 100644 --- a/kdejava/koala/org/kde/koala/KHistoryCombo.java +++ b/kdejava/koala/org/kde/koala/KHistoryCombo.java @@ -147,7 +147,7 @@ public class KHistoryCombo extends KComboBox { KPixmapProvider is just an abstract class with the one pure virtual method KPixmapProvider.pixmapFor(). This method is called whenever an item is added to the KHistoryComboBox. Implement it to return your - own custom pixmaps, or use the KURLPixmapProvider from libkio, + own custom pixmaps, or use the KURLPixmapProvider from libtdeio, which uses KMimeType.pixmapForURL to resolve icons. Set prov to null if you want to disable pixmaps. Default no pixmaps. @short Sets a pixmap provider, so that items in the combobox can have a pixmap. diff --git a/kdejava/koala/org/kde/koala/KMainWindow.java b/kdejava/koala/org/kde/koala/KMainWindow.java index cb852c36..7f2108a1 100644 --- a/kdejava/koala/org/kde/koala/KMainWindow.java +++ b/kdejava/koala/org/kde/koala/KMainWindow.java @@ -680,7 +680,7 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface Save your instance-specific properties. The function is invoked when the session manager requests your application to save its state. - You must not change the group of the kconfig object, since + You must not change the group of the tdeconfig object, since KMainWindow uses one group for each window. Please reimplement these function in childclasses. Note: No user interaction is allowed diff --git a/kdejava/koala/org/kde/koala/KProtocolInfo.java b/kdejava/koala/org/kde/koala/KProtocolInfo.java index a9c35303..858bce91 100644 --- a/kdejava/koala/org/kde/koala/KProtocolInfo.java +++ b/kdejava/koala/org/kde/koala/KProtocolInfo.java @@ -13,7 +13,7 @@ import java.util.ArrayList; KDE supports. In addition you can find out lots of information about a certain protocol. A KProtocolInfo instance represents a single protocol. Most of the functionality is provided by the static - methods that scan the .protocol files of all installed kioslaves to get + methods that scan the .protocol files of all installed tdeioslaves to get this information. .protocol files are installed in the "services" resource. @author Torben Weis @@ -483,7 +483,7 @@ public class KProtocolInfo extends KSycocaEntry { */ public static native int uriParseMode(String protocol); /** - Returns the list of capabilities provided by the kioslave implementing + Returns the list of capabilities provided by the tdeioslave implementing this protocol. This corresponds to the "Capabilities=" field in the protocol description file. The capability names are not defined globally, they are up to each @@ -491,11 +491,11 @@ public class KProtocolInfo extends KSycocaEntry { special command for mounting, one would add the string "Mount" to the capabilities list, and applications could check for that string before sending a special() command that would otherwise do nothing - on older kioslave implementations. + on older tdeioslave implementations. @param protocol the protocol to check @return the list of capabilities. - @short Returns the list of capabilities provided by the kioslave implementing this protocol. + @short Returns the list of capabilities provided by the tdeioslave implementing this protocol. */ public static native ArrayList capabilities(String protocol); /** diff --git a/kdejava/koala/org/kde/koala/KProtocolManager.java b/kdejava/koala/org/kde/koala/KProtocolManager.java index f0d02ad3..57166d56 100644 --- a/kdejava/koala/org/kde/koala/KProtocolManager.java +++ b/kdejava/koala/org/kde/koala/KProtocolManager.java @@ -337,8 +337,8 @@ public class KProtocolManager implements QtSupport { public static native boolean persistentConnections(); /** Force a reload of the general config file of - io-slaves ( kioslaverc). - @short Force a reload of the general config file of io-slaves ( kioslaverc). + io-slaves ( tdeioslaverc). + @short Force a reload of the general config file of io-slaves ( tdeioslaverc). */ public static native void reparseConfiguration(); /** diff --git a/kdejava/koala/org/kde/koala/KSycoca.java b/kdejava/koala/org/kde/koala/KSycoca.java index 6386cafa..17aa7dba 100644 --- a/kdejava/koala/org/kde/koala/KSycoca.java +++ b/kdejava/koala/org/kde/koala/KSycoca.java @@ -80,8 +80,8 @@ public class KSycoca extends TQObject implements DCOPObjectInterface { */ public native void disableAutoRebuild(); /** - internal function for receiving kded/kbuildsycoca's signal, when the sycoca file changes - @short internal function for receiving kded/kbuildsycoca's signal, when the sycoca file changes + internal function for receiving kded/tdebuildsycoca's signal, when the sycoca file changes + @short internal function for receiving kded/tdebuildsycoca's signal, when the sycoca file changes */ // void notifyDatabaseChanged(const TQStringList& arg1); >>>> NOT CONVERTED /** diff --git a/kdejava/koala/org/kde/koala/KZip.java b/kdejava/koala/org/kde/koala/KZip.java index c6c9e6ae..60a8b9cb 100644 --- a/kdejava/koala/org/kde/koala/KZip.java +++ b/kdejava/koala/org/kde/koala/KZip.java @@ -8,7 +8,7 @@ import org.kde.qt.TQIODeviceInterface; /** - This class implements a kioslave to access zip files from KDE. + This class implements a tdeioslave to access zip files from KDE. You can use it in IO_ReadOnly or in IO_WriteOnly mode, and it behaves just as expected. It can also be used in IO_ReadWrite mode, in this case one can diff --git a/kdejava/koala/org/kde/koala/Observer.java b/kdejava/koala/org/kde/koala/Observer.java index 6f879f37..951008c7 100644 --- a/kdejava/koala/org/kde/koala/Observer.java +++ b/kdejava/koala/org/kde/koala/Observer.java @@ -129,7 +129,7 @@ public class Observer extends TQObject implements DCOPObjectInterface { @param buttonYes the text of the "Yes" button @param buttonNo the text of the "No button @param dontAskAgainName A checkbox is added with which further confirmation can be turned off. - The string is used to lookup and store the setting in kioslaverc. + The string is used to lookup and store the setting in tdeioslaverc. @short Popup a message box. */ public static native int messageBox(int progressId, int type, String text, String caption, String buttonYes, String buttonNo, String dontAskAgainName); diff --git a/kdejava/koala/org/kde/koala/SimpleJob.java b/kdejava/koala/org/kde/koala/SimpleJob.java index af7ca172..95b3a8a1 100644 --- a/kdejava/koala/org/kde/koala/SimpleJob.java +++ b/kdejava/koala/org/kde/koala/SimpleJob.java @@ -44,7 +44,7 @@ public class SimpleJob extends Job { This kills all subjobs and deletes the job. @param tquietly if true, Job will emit signal result Should only be set to false when the user kills the job - (from kio_uiserver), not when you want to abort a job. + (from tdeio_uiserver), not when you want to abort a job. @short Abort job. */ public native void kill(boolean tquietly); diff --git a/kdejava/koala/org/kde/koala/Slave.java b/kdejava/koala/org/kde/koala/Slave.java index 1da49223..f576294b 100644 --- a/kdejava/koala/org/kde/koala/Slave.java +++ b/kdejava/koala/org/kde/koala/Slave.java @@ -96,33 +96,33 @@ public class Slave extends SlaveInterface { */ public native String passwd(); /** - Suspends the operation of the attached kioslave. - @short Suspends the operation of the attached kioslave. + Suspends the operation of the attached tdeioslave. + @short Suspends the operation of the attached tdeioslave. */ public native void suspend(); /** - Resumes the operation of the attached kioslave. - @short Resumes the operation of the attached kioslave. + Resumes the operation of the attached tdeioslave. + @short Resumes the operation of the attached tdeioslave. */ public native void resume(); /** - Tells wether the kioslave is suspended. - @return true if the kioslave is suspended. + Tells wether the tdeioslave is suspended. + @return true if the tdeioslave is suspended. - @short Tells wether the kioslave is suspended. + @short Tells wether the tdeioslave is suspended. */ public native boolean suspended(); /** - Sends the given command to the kioslave. + Sends the given command to the tdeioslave. @param cmd command id @param data byte array containing data - @short Sends the given command to the kioslave. + @short Sends the given command to the tdeioslave. */ public native void send(int cmd, byte[] data); public native void send(int cmd); /** - Puts the kioslave associated with url at halt. - @short Puts the kioslave associated with url at halt. + Puts the tdeioslave associated with url at halt. + @short Puts the tdeioslave associated with url at halt. */ public native void hold(KURL url); /** diff --git a/kdejava/koala/org/kde/koala/SlaveBase.java b/kdejava/koala/org/kde/koala/SlaveBase.java index 9b1f96ea..0eb4012b 100644 --- a/kdejava/koala/org/kde/koala/SlaveBase.java +++ b/kdejava/koala/org/kde/koala/SlaveBase.java @@ -7,11 +7,11 @@ import org.kde.qt.QtSupport; /** There are two classes that specifies the protocol between application (job) - and kioslave. SlaveInterface is the class to use on the application end, + and tdeioslave. SlaveInterface is the class to use on the application end, SlaveBase is the one to use on the slave end. Slave implementations should simply inherit SlaveBase A call to foo() results in a call to slotFoo() on the other end. - @short There are two classes that specifies the protocol between application (job) and kioslave. + @short There are two classes that specifies the protocol between application (job) and tdeioslave. */ public class SlaveBase implements QtSupport { @@ -209,7 +209,7 @@ public class SlaveBase implements QtSupport { Note: for ContinueCancel, buttonYes is the continue button and buttonNo is unused. and for Information, none is used. @param dontAskAgainName A checkbox is added with which further confirmation can be turned off. - The string is used to lookup and store the setting in kioslaverc. + The string is used to lookup and store the setting in tdeioslaverc. @return a button code, as defined in KMessageBox, or 0 on communication error. @short Call this to show a message box from the slave diff --git a/kdejava/koala/org/kde/koala/SlaveInterface.java b/kdejava/koala/org/kde/koala/SlaveInterface.java index 5a092211..7c2d14a4 100644 --- a/kdejava/koala/org/kde/koala/SlaveInterface.java +++ b/kdejava/koala/org/kde/koala/SlaveInterface.java @@ -9,11 +9,11 @@ import org.kde.qt.TQObject; /** There are two classes that specifies the protocol between application - (KIO.Job) and kioslave. SlaveInterface is the class to use on the application + (KIO.Job) and tdeioslave. SlaveInterface is the class to use on the application end, SlaveBase is the one to use on the slave end. A call to foo() results in a call to slotFoo() on the other end. See {@link SlaveInterfaceSignals} for signals emitted by SlaveInterface - @short There are two classes that specifies the protocol between application (KIO.Job) and kioslave. + @short There are two classes that specifies the protocol between application (KIO.Job) and tdeioslave. */ public class SlaveInterface extends TQObject { diff --git a/kdejava/koala/org/kde/koala/StatJob.java b/kdejava/koala/org/kde/koala/StatJob.java index b413b042..f3706896 100644 --- a/kdejava/koala/org/kde/koala/StatJob.java +++ b/kdejava/koala/org/kde/koala/StatJob.java @@ -33,7 +33,7 @@ public class StatJob extends SimpleJob { /** A stat() can have two meanings. Either we want to read from this URL, or to check if we can write to it. First case is "source", second is "dest". - It is necessary to know what the StatJob is for, to tune the kioslave's behavior + It is necessary to know what the StatJob is for, to tune the tdeioslave's behavior (e.g. with FTP). @param source true for "source" mode, false for "dest" mode @short A stat() can have two meanings. diff --git a/kdejava/koala/org/kde/koala/TDECModule.java b/kdejava/koala/org/kde/koala/TDECModule.java index 3f26535e..b82a54e7 100644 --- a/kdejava/koala/org/kde/koala/TDECModule.java +++ b/kdejava/koala/org/kde/koala/TDECModule.java @@ -221,8 +221,8 @@ public class TDECModule extends TQWidget { Help: shows a "Help" button. Default: shows a "Use Defaults" button Apply: in kcontrol this will show an "Apply" and "Reset" button - in kcmshell this will show an "Ok", "Apply" and "Cancel" button - If Apply is not specified, kcmshell will show a "Close" button. + in tdecmshell this will show an "Ok", "Apply" and "Cancel" button + If Apply is not specified, tdecmshell will show a "Close" button. @short Sets the buttons to display. @see TDECModule#buttons */ diff --git a/kdejava/koala/org/kde/koala/TDEConfig.java b/kdejava/koala/org/kde/koala/TDEConfig.java index 9eedc94d..ac0d530f 100644 --- a/kdejava/koala/org/kde/koala/TDEConfig.java +++ b/kdejava/koala/org/kde/koala/TDEConfig.java @@ -138,7 +138,7 @@ public class TDEConfig extends TDEConfigBase { public native boolean forceGlobal(); /** Checks whether the config file contains the update id - as contained in updateFile. If not, it runs kconf_update + as contained in updateFile. If not, it runs tdeconf_update to update the config file. If you install config update files with critical fixes you may wish to use this method to verify that a critical diff --git a/kdejava/koala/org/kde/koala/TDEIO.java b/kdejava/koala/org/kde/koala/TDEIO.java index 7fe6837d..716744ac 100644 --- a/kdejava/koala/org/kde/koala/TDEIO.java +++ b/kdejava/koala/org/kde/koala/TDEIO.java @@ -709,7 +709,7 @@ public class KIO { @param url the URL of the file @param sideIsSource is true when stating a source file (we will do a get on it if the stat works) and false when stating a destination file (target of a copy). - The reason for this parameter is that in some cases the kioslave might not + The reason for this parameter is that in some cases the tdeioslave might not be able to determine a file's existence (e.g. HTTP doesn't allow it, FTP has issues with case-sensitivity on some systems). When the slave can't reliably determine the existence of a file, it will: diff --git a/kdejava/koala/test/kioslave/KioslaveTest.java b/kdejava/koala/test/tdeioslave/KioslaveTest.java similarity index 99% rename from kdejava/koala/test/kioslave/KioslaveTest.java rename to kdejava/koala/test/tdeioslave/KioslaveTest.java index 2cd2ba82..d8f9f683 100644 --- a/kdejava/koala/test/kioslave/KioslaveTest.java +++ b/kdejava/koala/test/tdeioslave/KioslaveTest.java @@ -510,7 +510,7 @@ void stopJob() { } static String version = "v0.0.0 0000"; // :-) -static String description = "Test for kioslaves"; +static String description = "Test for tdeioslaves"; static String[][] options = { { "s", null, null }, @@ -524,7 +524,7 @@ static String[][] options = }; public static void main(String[] argv) { - TDECmdLineArgs.init( argv, "kioslavetest", "KIOSlaveTest", description, version ); + TDECmdLineArgs.init( argv, "tdeioslavetest", "KIOSlaveTest", description, version ); TDECmdLineArgs.addCmdLineOptions( options ); TDEApplication app = new TDEApplication(); diff --git a/kjsembed/bindings/Makefile.am b/kjsembed/bindings/Makefile.am index cc7cac22..1aa5ce49 100644 --- a/kjsembed/bindings/Makefile.am +++ b/kjsembed/bindings/Makefile.am @@ -9,7 +9,7 @@ libkjsembedbindings_la_SOURCES = image_imp.cpp \ painter_imp.cpp \ pixmap_imp.cpp \ netaccess_imp.cpp \ - kconfig_imp.cpp \ + tdeconfig_imp.cpp \ bindingobject.cpp \ movie_imp.cpp \ sql_imp.cpp \ diff --git a/kjsembed/bindings/bindings.pro b/kjsembed/bindings/bindings.pro index d83d3ba5..6cb7b23d 100644 --- a/kjsembed/bindings/bindings.pro +++ b/kjsembed/bindings/bindings.pro @@ -15,7 +15,7 @@ HEADERS += bindingobject.h \ pen_imp.h \ pixmap_imp.h \ sql_imp.h \ - kconfig_imp.h \ + tdeconfig_imp.h \ point_imp.h \ rect_imp.h \ size_imp.h @@ -29,7 +29,7 @@ SOURCES += bindingobject.cpp \ pen_imp.cpp \ pixmap_imp.cpp \ sql_imp.cpp \ - kconfig_imp.cpp \ + tdeconfig_imp.cpp \ point_imp.cpp \ rect_imp.cpp \ size_imp.cpp diff --git a/kjsembed/bindings/dcop_imp.cpp b/kjsembed/bindings/dcop_imp.cpp index 9dfaf4be..27c4ad22 100644 --- a/kjsembed/bindings/dcop_imp.cpp +++ b/kjsembed/bindings/dcop_imp.cpp @@ -605,7 +605,7 @@ TQString JSDCOPClient::dcopStart( const TQString &appName, const TQStringList& a TQDataStream arg(data, IO_WriteOnly); arg << appName << args; - if ( !kapp->dcopClient()->call( "klauncher", "klauncher", startFunction.latin1(), data, replyType, replyData) ) + if ( !kapp->dcopClient()->call( "tdelauncher", "tdelauncher", startFunction.latin1(), data, replyType, replyData) ) { kdWarning() << "Error: Dcop call failed" << endl; } diff --git a/kjsembed/bindings/netaccess_imp.cpp b/kjsembed/bindings/netaccess_imp.cpp index 0ffbc12c..91dcf708 100644 --- a/kjsembed/bindings/netaccess_imp.cpp +++ b/kjsembed/bindings/netaccess_imp.cpp @@ -21,7 +21,7 @@ */ #include "netaccess_imp.h" -#include +#include #include #include diff --git a/kjsembed/bindings/kconfig_imp.cpp b/kjsembed/bindings/tdeconfig_imp.cpp similarity index 99% rename from kjsembed/bindings/kconfig_imp.cpp rename to kjsembed/bindings/tdeconfig_imp.cpp index 73ca58ed..e4fe3211 100644 --- a/kjsembed/bindings/kconfig_imp.cpp +++ b/kjsembed/bindings/tdeconfig_imp.cpp @@ -17,15 +17,15 @@ * Boston, MA 02110-1301, USA. */ -#include "kconfig_imp.h" +#include "tdeconfig_imp.h" #include #ifndef QT_ONLY -#include +#include #include #include -#include "kconfig_imp.moc" +#include "tdeconfig_imp.moc" #else #include #endif diff --git a/kjsembed/bindings/kconfig_imp.h b/kjsembed/bindings/tdeconfig_imp.h similarity index 100% rename from kjsembed/bindings/kconfig_imp.h rename to kjsembed/bindings/tdeconfig_imp.h diff --git a/kjsembed/builtins/stddialog_imp.cpp b/kjsembed/builtins/stddialog_imp.cpp index 24c973b0..56c9919c 100644 --- a/kjsembed/builtins/stddialog_imp.cpp +++ b/kjsembed/builtins/stddialog_imp.cpp @@ -20,7 +20,7 @@ #ifndef QT_ONLY #include -#include +#include #include #else diff --git a/kjsembed/docs/ChangeLog b/kjsembed/docs/ChangeLog index 4b14af71..1fb28d23 100644 --- a/kjsembed/docs/ChangeLog +++ b/kjsembed/docs/ChangeLog @@ -328,7 +328,7 @@ 2004-11-30 Tuesday 17:47 geiseri - test kconfig more robustly. + test tdeconfig more robustly. 2004-11-30 Tuesday 12:02 geiseri diff --git a/kjsembed/docs/embedding/simple-embed/README b/kjsembed/docs/embedding/simple-embed/README index 12f9642b..4d07166c 100644 --- a/kjsembed/docs/embedding/simple-embed/README +++ b/kjsembed/docs/embedding/simple-embed/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/kjsembed/docs/examples/imunge/imunge.js b/kjsembed/docs/examples/imunge/imunge.js index 6f75cbf1..137cb272 100755 --- a/kjsembed/docs/examples/imunge/imunge.js +++ b/kjsembed/docs/examples/imunge/imunge.js @@ -92,7 +92,7 @@ mw.openFile = function() if ( filename.length > 0 ) { this.load( filename ); openrecent_action.addURL( filename ); - openrecent_action.saveEntries( System.KJSConfig.kconfig(), 'test' ); + openrecent_action.saveEntries( System.KJSConfig.tdeconfig(), 'test' ); System.KJSConfig.sync(); } } @@ -117,7 +117,7 @@ mw.saveFileAs = function() sb.message( filename ); this.imgfile = filename; openrecent_action.addURL( filename ); - openrecent_action.saveEntries( System.KJSConfig.kconfig(), 'test' ); + openrecent_action.saveEntries( System.KJSConfig.tdeconfig(), 'test' ); System.KJSConfig.sync(); } } @@ -154,7 +154,7 @@ mw.setup_actions = function() openrecent_action = StdAction.openRecent( null, '', ac ); openrecent_action.connect( openrecent_action, 'urlSelected(const KURL&)', this, 'load' ); - openrecent_action.loadEntries( System.KJSConfig.kconfig(), 'test' ); + openrecent_action.loadEntries( System.KJSConfig.tdeconfig(), 'test' ); save_action = StdAction.save( null, '', ac ); save_action.connect( save_action, 'activated()', this, 'saveFile' ); diff --git a/kjsembed/jsbuiltin.cpp b/kjsembed/jsbuiltin.cpp index 04680116..50e16f40 100644 --- a/kjsembed/jsbuiltin.cpp +++ b/kjsembed/jsbuiltin.cpp @@ -28,7 +28,7 @@ #include "builtins/resources.h" #endif // QT_ONLY -#include "bindings/kconfig_imp.h" +#include "bindings/tdeconfig_imp.h" #include "jsfactory_imp.h" #include "jsbuiltinproxy.h" diff --git a/kjsembed/jsfactory.cpp b/kjsembed/jsfactory.cpp index d5be63a9..f8c36d75 100644 --- a/kjsembed/jsfactory.cpp +++ b/kjsembed/jsfactory.cpp @@ -113,7 +113,7 @@ #include "bindings/painter_imp.h" #include "bindings/movie_imp.h" #include "bindings/sql_imp.h" -#include "bindings/kconfig_imp.h" +#include "bindings/tdeconfig_imp.h" #include "bindings/brush_imp.h" #include "bindings/size_imp.h" #include "bindings/rect_imp.h" diff --git a/kjsembed/plugins/Makefile.am b/kjsembed/plugins/Makefile.am index 5468d792..3f1e4fab 100644 --- a/kjsembed/plugins/Makefile.am +++ b/kjsembed/plugins/Makefile.am @@ -26,12 +26,12 @@ libqprocessplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) libqprocessplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_KFILE) ../libkjsembed.la # the Plugin's source, library search path, and link libraries -libfileitemplugin_la_SOURCES = kfileitemloader.cpp +libfileitemplugin_la_SOURCES = tdefileitemloader.cpp libfileitemplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(all_libraries) libfileitemplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) ../libkjsembed.la # this is where the desktop file will go plugindesktopdir = $(kde_servicesdir) -plugindesktop_DATA = imagefx_plugin.desktop qprocess_plugin.desktop kfileitem_plugin.desktop +plugindesktop_DATA = imagefx_plugin.desktop qprocess_plugin.desktop tdefileitem_plugin.desktop noinst_DATA = customobject_plugin.desktop customqobject_plugin.desktop diff --git a/kjsembed/plugins/kfileitem_plugin.desktop b/kjsembed/plugins/tdefileitem_plugin.desktop similarity index 100% rename from kjsembed/plugins/kfileitem_plugin.desktop rename to kjsembed/plugins/tdefileitem_plugin.desktop diff --git a/kjsembed/plugins/kfileitemloader.cpp b/kjsembed/plugins/tdefileitemloader.cpp similarity index 99% rename from kjsembed/plugins/kfileitemloader.cpp rename to kjsembed/plugins/tdefileitemloader.cpp index e3fcdb7f..6ab7cc45 100644 --- a/kjsembed/plugins/kfileitemloader.cpp +++ b/kjsembed/plugins/tdefileitemloader.cpp @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "kfileitemloader.h" +#include "tdefileitemloader.h" #include #include @@ -25,7 +25,7 @@ #include #include -#include +#include #include namespace KJSEmbed { diff --git a/kjsembed/plugins/kfileitemloader.h b/kjsembed/plugins/tdefileitemloader.h similarity index 100% rename from kjsembed/plugins/kfileitemloader.h rename to kjsembed/plugins/tdefileitemloader.h diff --git a/kjsembed/tests/test_kconfig.js b/kjsembed/tests/test_tdeconfig.js similarity index 100% rename from kjsembed/tests/test_kconfig.js rename to kjsembed/tests/test_tdeconfig.js 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 * 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 @@ -150,7 +150,7 @@ 2005-01-27 Richard Dale - * 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 - * 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 - * 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 - * 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 - * Added rbkconfig_compiler for compiling .kcfg files to ruby + * Added rbtdeconfig_compiler for compiling .kcfg files to ruby 2004-12-29 Richard Dale 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 #include #if TDE_VERSION >= 0x030200 -#include +#include #endif -#include +#include #include #include @@ -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 #include #include -#include -#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include #include #include #include #include #if TDE_VERSION >= 0x030200 -#include +#include #include #include #endif -#include +#include #include #include #include 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 similarity index 98% rename from korundum/rubylib/rbkconfig_compiler/README.dox rename to 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 similarity index 100% rename from korundum/rubylib/rbkconfig_compiler/TODO rename to korundum/rubylib/rbtdeconfig_compiler/TODO diff --git a/korundum/rubylib/rbkconfig_compiler/autoexample.rb b/korundum/rubylib/rbtdeconfig_compiler/autoexample.rb similarity index 100% rename from korundum/rubylib/rbkconfig_compiler/autoexample.rb rename to korundum/rubylib/rbtdeconfig_compiler/autoexample.rb diff --git a/korundum/rubylib/rbkconfig_compiler/checkkcfg.pl b/korundum/rubylib/rbtdeconfig_compiler/checkkcfg.pl similarity index 87% rename from korundum/rubylib/rbkconfig_compiler/checkkcfg.pl rename to 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 similarity index 100% rename from korundum/rubylib/rbkconfig_compiler/example.kcfg rename to korundum/rubylib/rbtdeconfig_compiler/example.kcfg diff --git a/korundum/rubylib/rbkconfig_compiler/example.rb b/korundum/rubylib/rbtdeconfig_compiler/example.rb similarity index 100% rename from korundum/rubylib/rbkconfig_compiler/example.rb rename to korundum/rubylib/rbtdeconfig_compiler/example.rb diff --git a/korundum/rubylib/rbkconfig_compiler/exampleprefs_base.kcfgc b/korundum/rubylib/rbtdeconfig_compiler/exampleprefs_base.kcfgc similarity index 88% rename from korundum/rubylib/rbkconfig_compiler/exampleprefs_base.kcfgc rename to 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 similarity index 100% rename from korundum/rubylib/rbkconfig_compiler/general_base.ui rename to korundum/rubylib/rbtdeconfig_compiler/general_base.ui diff --git a/korundum/rubylib/rbkconfig_compiler/kcfg.xsd b/korundum/rubylib/rbtdeconfig_compiler/kcfg.xsd similarity index 100% rename from korundum/rubylib/rbkconfig_compiler/kcfg.xsd rename to korundum/rubylib/rbtdeconfig_compiler/kcfg.xsd diff --git a/korundum/rubylib/rbkconfig_compiler/myoptions_base.ui b/korundum/rubylib/rbtdeconfig_compiler/myoptions_base.ui similarity index 100% rename from korundum/rubylib/rbkconfig_compiler/myoptions_base.ui rename to 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 similarity index 98% rename from korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp rename to 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 #include #include -#include +#include #include #include @@ -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 <<"\""<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 " << endl << endl; +// rb << "#include " << 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 similarity index 52% rename from korundum/rubylib/rbkconfig_compiler/tests/Makefile.am rename to 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 similarity index 100% rename from korundum/rubylib/rbkconfig_compiler/tests/myprefs.rb rename to 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 similarity index 100% rename from korundum/rubylib/rbkconfig_compiler/tests/test1.kcfg rename to 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 similarity index 87% rename from korundum/rubylib/rbkconfig_compiler/tests/test1.kcfgc rename to 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 similarity index 100% rename from korundum/rubylib/rbkconfig_compiler/tests/test1main.rb rename to 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 similarity index 100% rename from korundum/rubylib/rbkconfig_compiler/tests/test2.kcfg rename to 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 similarity index 78% rename from korundum/rubylib/rbkconfig_compiler/tests/test2.kcfgc rename to 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 similarity index 100% rename from korundum/rubylib/rbkconfig_compiler/tests/test2main.rb rename to 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 similarity index 100% rename from korundum/rubylib/rbkconfig_compiler/tests/test3.kcfg rename to 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 similarity index 80% rename from korundum/rubylib/rbkconfig_compiler/tests/test3.kcfgc rename to 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 similarity index 100% rename from korundum/rubylib/rbkconfig_compiler/tests/test3main.rb rename to 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 similarity index 100% rename from korundum/rubylib/rbkconfig_compiler/tests/test4.kcfg rename to 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 similarity index 78% rename from korundum/rubylib/rbkconfig_compiler/tests/test4.kcfgc rename to 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 similarity index 100% rename from korundum/rubylib/rbkconfig_compiler/tests/test4main.rb rename to 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 similarity index 100% rename from korundum/rubylib/rbkconfig_compiler/tests/test5.kcfg rename to 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 similarity index 78% rename from korundum/rubylib/rbkconfig_compiler/tests/test5.kcfgc rename to 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 similarity index 100% rename from korundum/rubylib/rbkconfig_compiler/tests/test5main.rb rename to korundum/rubylib/rbtdeconfig_compiler/tests/test5main.rb diff --git a/qtruby/ChangeLog b/qtruby/ChangeLog index 2c5b3013..1b276ab5 100644 --- a/qtruby/ChangeLog +++ b/qtruby/ChangeLog @@ -493,7 +493,7 @@ 2005-01-27 Richard Dale - * Made some changes to get code generated by the rbkconfig_compiler + * Made some changes to get code generated by the rbtdeconfig_compiler to work. When an argument is a non-const reference to a primitive type, or a TQString or TQStringList, then don't delete it after the method call. This is because a class like TDEConfigSkeleton takes @@ -510,7 +510,7 @@ * rbuic was giving widgets names containing a '@' to match the ruby instance variable name. However, this doesn't work with KDE::ConfigDialog which expects the names to - match the ones generated in a KDE::ConfigSkeleton by rbkconfig_compiler so '@' is no + match the ones generated in a KDE::ConfigSkeleton by rbtdeconfig_compiler so '@' is no longer added. 2005-01-20 Richard Dale diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp index 90cd759e..ac48ce88 100644 --- a/qtruby/rubylib/qtruby/Qt.cpp +++ b/qtruby/rubylib/qtruby/Qt.cpp @@ -110,9 +110,9 @@ VALUE qt_internal_module = Qnil; VALUE qt_base_class = Qnil; VALUE qmetaobject_class = Qnil; VALUE qvariant_class = Qnil; -VALUE kconfigskeleton_class = Qnil; -VALUE kconfigskeleton_itemenum_class = Qnil; -VALUE kconfigskeleton_itemenum_choice_class = Qnil; +VALUE tdeconfigskeleton_class = Qnil; +VALUE tdeconfigskeleton_itemenum_class = Qnil; +VALUE tdeconfigskeleton_itemenum_choice_class = Qnil; VALUE kio_udsatom_class = Qnil; VALUE twin_class = Qnil; VALUE konsole_part_class = Qnil; @@ -123,7 +123,7 @@ bool application_terminated = false; void rb_str_catf_1(VALUE self, const char *format, ...) __attribute__ ((format (printf, 2, 3))); static VALUE (*_new_kde)(int, VALUE *, VALUE) = 0; -static VALUE (*_kconfigskeletonitem_immutable)(VALUE) = 0; +static VALUE (*_tdeconfigskeletonitem_immutable)(VALUE) = 0; Smoke::Index _current_method = 0; @@ -2675,14 +2675,14 @@ static TQRegExp * scope_op = 0; } if (packageName.startsWith("KDE::ConfigSkeleton::ItemEnum::")) { - klass = rb_define_class_under(kconfigskeleton_itemenum_class, package+strlen("KDE::ConfigSkeleton::EnumItem::"), base_class); + klass = rb_define_class_under(tdeconfigskeleton_itemenum_class, package+strlen("KDE::ConfigSkeleton::EnumItem::"), base_class); rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1); - kconfigskeleton_itemenum_choice_class = klass; + tdeconfigskeleton_itemenum_choice_class = klass; } else if (packageName.startsWith("KDE::ConfigSkeleton::")) { - klass = rb_define_class_under(kconfigskeleton_class, package+strlen("KDE::ConfigSkeleton::"), base_class); + klass = rb_define_class_under(tdeconfigskeleton_class, package+strlen("KDE::ConfigSkeleton::"), base_class); rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1); - rb_define_method(klass, "immutable?", (VALUE (*) (...)) _kconfigskeletonitem_immutable, 0); - rb_define_method(klass, "isImmutable", (VALUE (*) (...)) _kconfigskeletonitem_immutable, 0); + rb_define_method(klass, "immutable?", (VALUE (*) (...)) _tdeconfigskeletonitem_immutable, 0); + rb_define_method(klass, "isImmutable", (VALUE (*) (...)) _tdeconfigskeletonitem_immutable, 0); } else if (packageName.startsWith("KDE::Win::")) { klass = rb_define_class_under(twin_class, package+strlen("KDE::Win::"), base_class); rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1); @@ -2867,12 +2867,12 @@ set_new_kde(VALUE (*new_kde) (int, VALUE *, VALUE)) } void -set_kconfigskeletonitem_immutable(VALUE (*kconfigskeletonitem_immutable) (VALUE)) +set_tdeconfigskeletonitem_immutable(VALUE (*tdeconfigskeletonitem_immutable) (VALUE)) { - _kconfigskeletonitem_immutable = kconfigskeletonitem_immutable; + _tdeconfigskeletonitem_immutable = tdeconfigskeletonitem_immutable; - kconfigskeleton_class = rb_define_class_under(kde_module, "ConfigSkeleton", qt_base_class); - kconfigskeleton_itemenum_class = rb_define_class_under(kconfigskeleton_class, "ItemEnum", qt_base_class); + tdeconfigskeleton_class = rb_define_class_under(kde_module, "ConfigSkeleton", qt_base_class); + tdeconfigskeleton_itemenum_class = rb_define_class_under(tdeconfigskeleton_class, "ItemEnum", qt_base_class); } static VALUE diff --git a/smoke/kde/generate.pl.in b/smoke/kde/generate.pl.in index 6365c739..1dfd3fd5 100644 --- a/smoke/kde/generate.pl.in +++ b/smoke/kde/generate.pl.in @@ -99,13 +99,13 @@ my %kdeexcludes = ( # These headers currently give problems 'tdescreensaver.h' => 1, 'kdirnotify_stub.h' => 1, - 'kio/uiserver_stub.h' => 1, - 'kio/uiserver.h' => 1, - 'kio/tdesasl.h' => 1, - 'kio/kpac.h' => 1, - 'kio/thumbcreator.h' => 1, - 'kio/file.h' => 1, - 'kio/chmodjob.h' => 1, + 'tdeio/uiserver_stub.h' => 1, + 'tdeio/uiserver.h' => 1, + 'tdeio/tdesasl.h' => 1, + 'tdeio/kpac.h' => 1, + 'tdeio/thumbcreator.h' => 1, + 'tdeio/file.h' => 1, + 'tdeio/chmodjob.h' => 1, 'tdeparts/genericfactory.h' => 1, 'tdeparts/pluginselectormodule.h' => 1, 'kopenssl.h' => 1, diff --git a/smoke/kde/kde_header_list b/smoke/kde/kde_header_list index ba1c2e9f..9f78c9c3 100644 --- a/smoke/kde/kde_header_list +++ b/smoke/kde/kde_header_list @@ -93,12 +93,12 @@ kcombobox.h kcommand.h kcompletionbox.h kcompletion.h -kconfigdialog.h -kconfigskeleton.h -kconfigbackend.h -kconfigbase.h -kconfigdata.h -kconfig.h +tdeconfigdialog.h +tdeconfigskeleton.h +tdeconfigbackend.h +tdeconfigbase.h +tdeconfigdata.h +tdeconfig.h kcpuinfo.h kcrash.h kcursor.h @@ -140,21 +140,21 @@ kedittoolbar.h kemailsettings.h kextendedsocket.h kextsock.h -kfiledetailview.h -kfiledialog.h -kfilefiltercombo.h -kfilefilter.h -kfile.h -kfileiconview.h -kfileitem.h -kfilemetainfo.h -kfilepreview.h -kfilesharedlg.h -kfileshare.h -kfiletreebranch.h -kfiletreeview.h -kfiletreeviewitem.h -kfileview.h +tdefiledetailview.h +tdefiledialog.h +tdefilefiltercombo.h +tdefilefilter.h +tdefile.h +tdefileiconview.h +tdefileitem.h +tdefilemetainfo.h +tdefilepreview.h +tdefilesharedlg.h +tdefileshare.h +tdefiletreebranch.h +tdefiletreeview.h +tdefiletreeviewitem.h +tdefileview.h kfilterbase.h kfilterdev.h kfinddialog.h @@ -394,42 +394,42 @@ tdeparts/partmanager.h tdeparts/plugin.h tdeparts/pluginselectormodule.h tdeparts/statusbarextension.h -kio/authinfo.h -kio/chmodjob.h -kio/connection.h -kio/davjob.h -kio/defaultprogress.h -kio/file.h -kio/global.h -kio/http.h -kio/http_slave_defaults.h -kio/ioslave_defaults.h -kio/jobclasses.h -kio/job.h -kio/tdesasl.h -kio/kmdbase.h -kio/kmdcodec.h -kio/kpac.h -kio/metainfojob.h -kio/netaccess.h -kio/observer.h -kio/passdlg.h -kio/paste.h -kio/previewjob.h -kio/progressbase.h -kio/renamedlg.h -kio/scheduler.h -kio/sessiondata.h -kio/skipdlg.h -kio/slavebase.h -kio/slaveconfig.h -kio/slave.h -kio/slaveinterface.h -kio/statusbarprogress.h -kio/tcpslavebase.h -kio/thumbcreator.h -kio/uiserver.h -kio/uiserver_stub.h +tdeio/authinfo.h +tdeio/chmodjob.h +tdeio/connection.h +tdeio/davjob.h +tdeio/defaultprogress.h +tdeio/file.h +tdeio/global.h +tdeio/http.h +tdeio/http_slave_defaults.h +tdeio/ioslave_defaults.h +tdeio/jobclasses.h +tdeio/job.h +tdeio/tdesasl.h +tdeio/kmdbase.h +tdeio/kmdcodec.h +tdeio/kpac.h +tdeio/metainfojob.h +tdeio/netaccess.h +tdeio/observer.h +tdeio/passdlg.h +tdeio/paste.h +tdeio/previewjob.h +tdeio/progressbase.h +tdeio/renamedlg.h +tdeio/scheduler.h +tdeio/sessiondata.h +tdeio/skipdlg.h +tdeio/slavebase.h +tdeio/slaveconfig.h +tdeio/slave.h +tdeio/slaveinterface.h +tdeio/statusbarprogress.h +tdeio/tcpslavebase.h +tdeio/thumbcreator.h +tdeio/uiserver.h +tdeio/uiserver_stub.h netwm_def.h netwm.h knewstuff/knewstuff.h