diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 13:12:29 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 13:12:29 -0600 |
| commit | a23f1fc1a162ecb85ed44484372faa26141af33a (patch) | |
| tree | 2ee1b08fd1fa5e4a094f88d8bcb0d5bd50afa13d /kalyptus | |
| parent | 24b85b785334e8436c975a4323fcbb75d61f6e72 (diff) | |
| download | tdebindings-a23f1fc1a162ecb85ed44484372faa26141af33a.tar.gz tdebindings-a23f1fc1a162ecb85ed44484372faa26141af33a.zip | |
Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4
Diffstat (limited to 'kalyptus')
| -rw-r--r-- | kalyptus/kalyptusCxxToSmoke.pm | 2 | ||||
| -rw-r--r-- | kalyptus/kalyptusDataDict.pm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm index 5c68d642..fbfc1b9f 100644 --- a/kalyptus/kalyptusCxxToSmoke.pm +++ b/kalyptus/kalyptusCxxToSmoke.pm @@ -401,7 +401,7 @@ sub preParseClass $className eq 'KSharedPixmap' || $className eq 'KLibrary' || $className eq 'KScanDialogFactory' || - $className eq 'KBufferedIO' || + $className eq 'TDEBufferedIO' || $className eq 'KDictSpellingHighlighter' || $className eq 'KPropertiesDialog' || $className eq 'ProgressItem' || diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm index 67f8b620..ed8b1f5d 100644 --- a/kalyptus/kalyptusDataDict.pm +++ b/kalyptus/kalyptusDataDict.pm @@ -748,7 +748,7 @@ BEGIN 'KAutoUnmount*' => 'kde_KAutoUnmount*', 'KBindingPropsPlugin*' => 'kde_KBindingPropsPlugin*', 'KBlankEffect*' => 'kde_KBlankEffect*', -'KBufferedIO*' => 'kde_KBufferedIO*', +'TDEBufferedIO*' => 'kde_TDEBufferedIO*', 'KBugReport*' => 'kde_KBugReport*', 'KButtonBox*' => 'kde_KButtonBox*', 'TDECModule*' => 'kde_TDECModule*' , @@ -938,8 +938,8 @@ BEGIN 'TDEIO::SimpleJob*' => 'kde_SimpleJob*', 'TDEIO::SkipDlg_Result' => 'int', 'TDEIO::Slave*' => 'kde_Slave*', -'KIOInputStream&' => 'kde_KIOInputStream*', -'KIOInputStream*' => 'kde_KIOInputStream*', +'TDEIOInputStream&' => 'kde_TDEIOInputStream*', +'TDEIOInputStream*' => 'kde_TDEIOInputStream*', 'KIOTestSlow&' => 'kde_KIOTestSlow*', 'KIOTestSlow' => 'kde_KIOTestSlow*', 'KIOTestSlow*' => 'kde_KIOTestSlow*', |