Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4

bug/266/move-to-usr
Timothy Pearson 12 years ago
parent ed57d8a57b
commit 2407db5f82

@ -401,7 +401,7 @@ sub preParseClass
$className eq 'KSharedPixmap' || $className eq 'KSharedPixmap' ||
$className eq 'KLibrary' || $className eq 'KLibrary' ||
$className eq 'KScanDialogFactory' || $className eq 'KScanDialogFactory' ||
$className eq 'KBufferedIO' || $className eq 'TDEBufferedIO' ||
$className eq 'KDictSpellingHighlighter' || $className eq 'KDictSpellingHighlighter' ||
$className eq 'KPropertiesDialog' || $className eq 'KPropertiesDialog' ||
$className eq 'ProgressItem' || $className eq 'ProgressItem' ||

@ -748,7 +748,7 @@ BEGIN
'KAutoUnmount*' => 'kde_KAutoUnmount*', 'KAutoUnmount*' => 'kde_KAutoUnmount*',
'KBindingPropsPlugin*' => 'kde_KBindingPropsPlugin*', 'KBindingPropsPlugin*' => 'kde_KBindingPropsPlugin*',
'KBlankEffect*' => 'kde_KBlankEffect*', 'KBlankEffect*' => 'kde_KBlankEffect*',
'KBufferedIO*' => 'kde_KBufferedIO*', 'TDEBufferedIO*' => 'kde_TDEBufferedIO*',
'KBugReport*' => 'kde_KBugReport*', 'KBugReport*' => 'kde_KBugReport*',
'KButtonBox*' => 'kde_KButtonBox*', 'KButtonBox*' => 'kde_KButtonBox*',
'TDECModule*' => 'kde_TDECModule*' , 'TDECModule*' => 'kde_TDECModule*' ,
@ -938,8 +938,8 @@ BEGIN
'TDEIO::SimpleJob*' => 'kde_SimpleJob*', 'TDEIO::SimpleJob*' => 'kde_SimpleJob*',
'TDEIO::SkipDlg_Result' => 'int', 'TDEIO::SkipDlg_Result' => 'int',
'TDEIO::Slave*' => 'kde_Slave*', 'TDEIO::Slave*' => 'kde_Slave*',
'KIOInputStream&' => 'kde_KIOInputStream*', 'TDEIOInputStream&' => 'kde_TDEIOInputStream*',
'KIOInputStream*' => 'kde_KIOInputStream*', 'TDEIOInputStream*' => 'kde_TDEIOInputStream*',
'KIOTestSlow&' => 'kde_KIOTestSlow*', 'KIOTestSlow&' => 'kde_KIOTestSlow*',
'KIOTestSlow' => 'kde_KIOTestSlow*', 'KIOTestSlow' => 'kde_KIOTestSlow*',
'KIOTestSlow*' => 'kde_KIOTestSlow*', 'KIOTestSlow*' => 'kde_KIOTestSlow*',

Loading…
Cancel
Save