diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-07 11:06:42 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-07 11:06:42 -0600 |
| commit | c153d5f83c85f8c5971f2a013ab571d9d4ca1d8b (patch) | |
| tree | f3263615806d322dacaed0d7f7207a719bd0d2de /korundum/rubylib | |
| parent | fb7e279ef21733ca91caad571e63263b1f947f85 (diff) | |
| download | tdebindings-c153d5f83c85f8c5971f2a013ab571d9d4ca1d8b.tar.gz tdebindings-c153d5f83c85f8c5971f2a013ab571d9d4ca1d8b.zip | |
Rename KAbout to avoid conflicts with KDE4
Diffstat (limited to 'korundum/rubylib')
| -rw-r--r-- | korundum/rubylib/examples/uimodules/uidialogs.rb | 4 | ||||
| -rw-r--r-- | korundum/rubylib/korundum/kdehandlers.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/korundum/rubylib/examples/uimodules/uidialogs.rb b/korundum/rubylib/examples/uimodules/uidialogs.rb index 0715fe12..8efed493 100644 --- a/korundum/rubylib/examples/uimodules/uidialogs.rb +++ b/korundum/rubylib/examples/uimodules/uidialogs.rb @@ -131,7 +131,7 @@ class MessageDlg < KDE::Dialog end -def UIDialogs.dlgKAboutDialog(parent) +def UIDialogs.dlgTDEAboutDialog(parent) dlg = KDE::AboutDialog.new(parent, 'about dialog', false) dlg.setLogo(TQt::Pixmap.new("rbtestimage.png")) dlg.setTitle("UISampler for Korundum") @@ -150,7 +150,7 @@ def UIDialogs.dlgKBugReport(parent) dlg.exec() end -def UIDialogs.dlgKAboutKDE(parent) +def UIDialogs.dlgTDEAboutKDE(parent) dlg = KDE::AboutKDE.new(parent, "about kde", false) dlg.show() end diff --git a/korundum/rubylib/korundum/kdehandlers.cpp b/korundum/rubylib/korundum/kdehandlers.cpp index 83db54cf..01239684 100644 --- a/korundum/rubylib/korundum/kdehandlers.cpp +++ b/korundum/rubylib/korundum/kdehandlers.cpp @@ -1199,8 +1199,8 @@ void marshall_ValueItemList(Marshall *m) { #if TDE_VERSION >= 0x030200 DEF_VALUELIST_MARSHALLER( ChoicesList, TQValueList<TDEConfigSkeleton::ItemEnum::Choice>, TDEConfigSkeleton::ItemEnum::Choice, TQValueList<TDEConfigSkeleton::ItemEnum::Choice>::Iterator ) #endif -DEF_VALUELIST_MARSHALLER( KAboutPersonList, TQValueList<KAboutPerson>, KAboutPerson, TQValueList<KAboutPerson>::Iterator ) -DEF_VALUELIST_MARSHALLER( KAboutTranslatorList, TQValueList<KAboutTranslator>, KAboutTranslator, TQValueList<KAboutTranslator>::Iterator ) +DEF_VALUELIST_MARSHALLER( TDEAboutPersonList, TQValueList<TDEAboutPerson>, TDEAboutPerson, TQValueList<TDEAboutPerson>::Iterator ) +DEF_VALUELIST_MARSHALLER( TDEAboutTranslatorList, TQValueList<TDEAboutTranslator>, TDEAboutTranslator, TQValueList<TDEAboutTranslator>::Iterator ) DEF_VALUELIST_MARSHALLER( KIOCopyInfoList, TQValueList<TDEIO::CopyInfo>, TDEIO::CopyInfo, TQValueList<TDEIO::CopyInfo>::Iterator ) DEF_VALUELIST_MARSHALLER( KServiceOfferList, TQValueList<KServiceOffer>, KServiceOffer, TQValueList<KServiceOffer>::Iterator ) DEF_VALUELIST_MARSHALLER( UDSEntry, TQValueList<TDEIO::UDSAtom>, TDEIO::UDSAtom, TQValueList<TDEIO::UDSAtom>::Iterator ) @@ -1422,8 +1422,8 @@ TypeHandler KDE_handlers[] = { { "TQPtrList<KServiceTypeProfile>&", marshall_KServiceTypeProfileList }, { "TQValueList<TDEAction*>", marshall_TDEActionPtrList }, { "TDEActionPtrList", marshall_TDEActionPtrList }, - { "TQValueList<KAboutPerson>", marshall_KAboutPersonList }, - { "TQValueList<KAboutTranslator>", marshall_KAboutTranslatorList }, + { "TQValueList<TDEAboutPerson>", marshall_TDEAboutPersonList }, + { "TQValueList<TDEAboutTranslator>", marshall_TDEAboutTranslatorList }, { "TQValueList<TDEIO::CopyInfo>&", marshall_KIOCopyInfoList }, { "TDEIO::UDSEntry&", marshall_UDSEntry }, { "TDEIO::UDSEntryList&", marshall_UDSEntryList }, |