From 3ed7c09d22a5f310a97516f5bab6068e5688a813 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:12:07 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- korundum/ChangeLog | 4 ++-- korundum/rubylib/examples/menudemo.rb | 10 ++++----- korundum/rubylib/examples/rbTDEHTMLPart.rb | 6 +++--- korundum/rubylib/examples/uimodules/uidialogs.rb | 2 +- korundum/rubylib/examples/uimodules/uimenus.rb | 18 ++++++++-------- korundum/rubylib/examples/uimodules/uiwidgets.rb | 16 +++++++-------- korundum/rubylib/examples/uimodules/uixml.rb | 2 +- korundum/rubylib/examples/xmlgui.rb | 2 +- korundum/rubylib/korundum/kdehandlers.cpp | 26 ++++++++++++------------ korundum/rubylib/templates/annotated/basicapp.rb | 2 +- korundum/rubylib/templates/annotated/menuapp1.rb | 2 +- korundum/rubylib/templates/annotated/menuapp2.rb | 2 +- korundum/rubylib/templates/annotated/minimal.rb | 2 +- 13 files changed, 47 insertions(+), 47 deletions(-) (limited to 'korundum') diff --git a/korundum/ChangeLog b/korundum/ChangeLog index 0fe5e03f..ef9115c0 100644 --- a/korundum/ChangeLog +++ b/korundum/ChangeLog @@ -40,7 +40,7 @@ 2006-08-18 Richard Dale - * Added a KActionPtrList marshaller. Fixes problem reported by + * Added a TDEActionPtrList marshaller. Fixes problem reported by eskatos on the #qtruby irc channel. 2006-06-05 Richard Dale @@ -518,7 +518,7 @@ CCMAIL: kde-bindings@kde.org 2004-07-07 Richard Dale * Translated the excellent pytde 'UISampler' app to ruby - * Added KAction list marshalling + * Added TDEAction list marshalling * KDE::MainWindow.RESTORE() and kRestoreMainWindows() methods added. 2004-07-06 Richard Dale diff --git a/korundum/rubylib/examples/menudemo.rb b/korundum/rubylib/examples/menudemo.rb index 44e5b7f0..0ff27ac8 100644 --- a/korundum/rubylib/examples/menudemo.rb +++ b/korundum/rubylib/examples/menudemo.rb @@ -85,7 +85,7 @@ class MainWin < MainWindow # Demo menu items - # KToggleAction has an isChecked member and emits the "toggle" signal + # TDEToggleAction has an isChecked member and emits the "toggle" signal @toggle1Action = ToggleAction.new("Toggle 1") @toggle2Action = ToggleAction.new("Toggle 2", Shortcut.new(), self, SLOT('slotToggle2()'), nil) @@ -100,18 +100,18 @@ class MainWin < MainWindow icons = IconLoader.new() iconSet = TQt::IconSet.new(icons.loadIcon("viewmag", Icon::Toolbar)) - # Nested menus using KActions (also nested on toolbar) + # Nested menus using TDEActions (also nested on toolbar) @actionMenu = ActionMenu.new("Action Menu") @actionMenu.setIconSet(iconSet) @actionMenu.insert(StdAction.zoomIn(self, SLOT('slotZoomIn()'), actionCollection())) @actionMenu.insert(StdAction.zoomOut(self, SLOT('slotZoomOut()'), actionCollection())) # Doesn't work in KDE 2.1.1 -# radio1Action = KRadioAction ("Radio 1") +# radio1Action = TDERadioAction ("Radio 1") # radio1Action.setExclusiveGroup ("Radio") -# radio2Action = KRadioAction ("Radio 2") +# radio2Action = TDERadioAction ("Radio 2") # radio2Action.setExclusiveGroup ("Radio") -# radio3Action = KRadioAction ("Radio 3") +# radio3Action = TDERadioAction ("Radio 3") # radio3Action.setExclusiveGroup ("Radio") end diff --git a/korundum/rubylib/examples/rbTDEHTMLPart.rb b/korundum/rubylib/examples/rbTDEHTMLPart.rb index 827dc157..55e2386c 100644 --- a/korundum/rubylib/examples/rbTDEHTMLPart.rb +++ b/korundum/rubylib/examples/rbTDEHTMLPart.rb @@ -26,7 +26,7 @@ additional code to make this do something useful. The seem to provide much help. Also, to follow links, you probably need to connect some signals to slots. I haven't tried it, but this should work with a plain -KMainWindow or other widget too. +TDEMainWindow or other widget too. The KDE website also incorporates gifs, jpegs, and I believe CSS too. Playing around with some other @@ -44,8 +44,8 @@ lifted from the KDE classref. require 'Korundum' -# Note that we use KParts.MainWindow, not KMainWindow as the superclass -# (KParts.MainWindow subclasses KMainWindow). Also, be sure the 'apply' +# Note that we use KParts.MainWindow, not TDEMainWindow as the superclass +# (KParts.MainWindow subclasses TDEMainWindow). Also, be sure the 'apply' # clause references KParts.MainWindow - it's a hard bug to track down # if it doesn't. diff --git a/korundum/rubylib/examples/uimodules/uidialogs.rb b/korundum/rubylib/examples/uimodules/uidialogs.rb index d07177be..0715fe12 100644 --- a/korundum/rubylib/examples/uimodules/uidialogs.rb +++ b/korundum/rubylib/examples/uimodules/uidialogs.rb @@ -190,7 +190,7 @@ def UIDialogs.dlgKDialogBase(parent) dlg.show() end -def UIDialogs.dlgKFontDialog(parent) +def UIDialogs.dlgTDEFontDialog(parent) dlg = KDE::FontDialog.new(parent, "font dlg", false, false) dlg.show() end diff --git a/korundum/rubylib/examples/uimodules/uimenus.rb b/korundum/rubylib/examples/uimodules/uimenus.rb index dd98f227..a244aa1f 100644 --- a/korundum/rubylib/examples/uimodules/uimenus.rb +++ b/korundum/rubylib/examples/uimodules/uimenus.rb @@ -37,25 +37,25 @@ class PageNotImpl end end -def UIMenus.menuKAccelGen(parent) +def UIMenus.menuTDEAccelGen(parent) parent.currentPageObj = PageNotImpl.new(parent) end -def UIMenus.menuKAccelMenu(parent) +def UIMenus.menuTDEAccelMenu(parent) parent.currentPageObj = PageNotImpl.new(parent) end -def UIMenus.menuKAction(parent) +def UIMenus.menuTDEAction(parent) parent.currentPageObj = PageLaunch.new(parent) system("ruby menudemo.rb") end -def UIMenus.menuKActionMenu(parent) +def UIMenus.menuTDEActionMenu(parent) parent.currentPageObj = PageLaunch.new(parent) system("ruby menudemo.rb") end -def UIMenus.menuKActionSeparator(parent) +def UIMenus.menuTDEActionSeparator(parent) parent.currentPageObj = PageLaunch.new(parent) system("ruby menudemo.rb") end @@ -90,15 +90,15 @@ def UIMenus.menuKPanelMenu(parent) parent.currentPageObj = PageNotImpl.new(parent) end -def UIMenus.menuKPopupFrame(parent) +def UIMenus.menuTDEPopupFrame(parent) # pass end -def UIMenus.menuKPopupMenu(parent) +def UIMenus.menuTDEPopupMenu(parent) # pass end -def UIMenus.menuKPopupTitle(parent) +def UIMenus.menuTDEPopupTitle(parent) # pass end @@ -117,7 +117,7 @@ def UIMenus.menuKStdAction(parent) system("ruby menudemo.rb") end -def UIMenus.menuKToolBar(parent) +def UIMenus.menuTDEToolBar(parent) parent.currentPageObj = PageLaunch.new(parent) system("ruby menudemo.rb") end diff --git a/korundum/rubylib/examples/uimodules/uiwidgets.rb b/korundum/rubylib/examples/uimodules/uiwidgets.rb index e06b06be..68dfb54f 100644 --- a/korundum/rubylib/examples/uimodules/uiwidgets.rb +++ b/korundum/rubylib/examples/uimodules/uiwidgets.rb @@ -168,7 +168,7 @@ class Page2 editListBox.insertStringList(["One", "Two", "Three"]) editListBox.show() - lbLbl = TQt::Label.new("KListBox", page) + lbLbl = TQt::Label.new("TDEListBox", page) lbLbl.setGeometry(x2, y2, 100, 20) lbLbl.show() @@ -186,7 +186,7 @@ class Page3 x = 10 y = 10 - fontLbl = TQt::Label.new("KFontChooser", page) + fontLbl = TQt::Label.new("TDEFontChooser", page) fontLbl.setGeometry(x, y, 95, 20) fontLbl.show() @@ -596,7 +596,7 @@ class PageThisApp x = 10 y = 10 - taLbl = TQt::Label.new("This application uses KMainWindow as its top level widget\n and KListView in the"\ + taLbl = TQt::Label.new("This application uses TDEMainWindow as its top level widget\n and TDEListView in the"\ " left-hand panel", page) taLbl.setGeometry(x, y, 300, 60) taLbl.show() @@ -718,7 +718,7 @@ def UIWidgets.widKEditListBox(parent) parent.currentPageObj = Page2.new(parent) end -def UIWidgets.widKFontChooser(parent) +def UIWidgets.widTDEFontChooser(parent) parent.currentPageObj = Page3.new(parent) end @@ -749,11 +749,11 @@ def UIWidgets.widKLineEdit(parent) parent.currentPageObj = Page1.new(parent) end -def UIWidgets.widKListBox(parent) +def UIWidgets.widTDEListBox(parent) parent.currentPageObj = Page2.new(parent) end -def UIWidgets.widKListView(parent) +def UIWidgets.widTDEListView(parent) parent.currentPageObj = PageThisApp.new(parent) end @@ -777,7 +777,7 @@ def UIWidgets.widKRootPixmap(parent) parent.currentPageObj = PageNotImpl.new(parent) end -def UIWidgets.widKMainWindow(parent) +def UIWidgets.widTDEMainWindow(parent) parent.currentPageObj = PageThisApp.new(parent) end @@ -789,7 +789,7 @@ def UIWidgets.widKRuler(parent) parent.currentPageObj = PageNotImpl.new(parent) end -def UIWidgets.widKSelector(parent) +def UIWidgets.widTDESelector(parent) parent.currentPageObj = Page4.new(parent) end diff --git a/korundum/rubylib/examples/uimodules/uixml.rb b/korundum/rubylib/examples/uimodules/uixml.rb index 8abd0c9d..de487642 100644 --- a/korundum/rubylib/examples/uimodules/uixml.rb +++ b/korundum/rubylib/examples/uimodules/uixml.rb @@ -23,7 +23,7 @@ class PageLaunch end end -def UIXML.xmlKActionCollection(parent) +def UIXML.xmlTDEActionCollection(parent) parent.currentPageObj = PageLaunch.new(parent) system("ruby xmlmenudemo.rb") end diff --git a/korundum/rubylib/examples/xmlgui.rb b/korundum/rubylib/examples/xmlgui.rb index 47660ba1..84acbdde 100755 --- a/korundum/rubylib/examples/xmlgui.rb +++ b/korundum/rubylib/examples/xmlgui.rb @@ -27,7 +27,7 @@ class RAction end end -# { Quit, KStdAccel::Quit, "file_quit", I18N_NOOP("&Quit"), 0, "exit" }, +# { Quit, TDEStdAccel::Quit, "file_quit", I18N_NOOP("&Quit"), 0, "exit" }, std_actions = { :quit => RAction.new( "file_quit", ("&Quit"), KDE::Shortcut.new(), "exit" ) } begin diff --git a/korundum/rubylib/korundum/kdehandlers.cpp b/korundum/rubylib/korundum/kdehandlers.cpp index 632d5379..bf2107ce 100644 --- a/korundum/rubylib/korundum/kdehandlers.cpp +++ b/korundum/rubylib/korundum/kdehandlers.cpp @@ -716,7 +716,7 @@ void marshall_KPluginInfoList(Marshall *m) { } #endif -void marshall_KActionPtrList(Marshall *m) { +void marshall_TDEActionPtrList(Marshall *m) { switch(m->action()) { case Marshall::FromVALUE: { @@ -724,7 +724,7 @@ void marshall_KActionPtrList(Marshall *m) { break; case Marshall::ToVALUE: { - KActionPtrList *valuelist = (KActionPtrList*)m->item().s_voidp; + TDEActionPtrList *valuelist = (TDEActionPtrList*)m->item().s_voidp; if (!valuelist) { *(m->var()) = Qnil; break; @@ -732,10 +732,10 @@ void marshall_KActionPtrList(Marshall *m) { VALUE av = rb_ary_new(); - int ix = m->smoke()->idClass("KAction"); + int ix = m->smoke()->idClass("TDEAction"); const char * className = m->smoke()->binding->className(ix); - for ( KActionPtrList::Iterator it = valuelist->begin(); + for ( TDEActionPtrList::Iterator it = valuelist->begin(); it != valuelist->end(); ++it ) { @@ -750,7 +750,7 @@ void marshall_KActionPtrList(Marshall *m) { if (obj == Qnil) { smokeruby_object * o = ALLOC(smokeruby_object); o->smoke = m->smoke(); - o->classId = o->smoke->idClass("KAction"); + o->classId = o->smoke->idClass("TDEAction"); o->ptr = p; o->allocated = false; obj = set_obj_info(className, o); @@ -1092,8 +1092,8 @@ void marshall_ItemList(Marshall *m) { Marshall::HandlerFn marshall_##ListIdent = marshall_ItemList; DEF_LIST_MARSHALLER( KFileItemList, TQPtrList, KFileItem ) -DEF_LIST_MARSHALLER( KMainWindowList, TQPtrList, KMainWindow ) -DEF_LIST_MARSHALLER( KActionList, TQPtrList, KAction ) +DEF_LIST_MARSHALLER( TDEMainWindowList, TQPtrList, TDEMainWindow ) +DEF_LIST_MARSHALLER( TDEActionList, TQPtrList, TDEAction ) DEF_LIST_MARSHALLER( DCOPObjectList, TQPtrList, DCOPObject ) DEF_LIST_MARSHALLER( KDockWidgetList, TQPtrList, KDockWidget ) DEF_LIST_MARSHALLER( KFileTreeBranch, TQPtrList, KFileTreeBranch ) @@ -1389,9 +1389,9 @@ void marshall_TQMapTQCStringDCOPRef(Marshall *m) { TypeHandler KDE_handlers[] = { { "QCStringList", marshall_TQCStringList }, { "KCmdLineOptions*", marshall_KCmdLineOptions }, - { "KActionPtrList", marshall_KActionList }, - { "TQPtrList", marshall_KActionList }, - { "TQPtrList&", marshall_KActionList }, + { "TDEActionPtrList", marshall_TDEActionList }, + { "TQPtrList", marshall_TDEActionList }, + { "TQPtrList&", marshall_TDEActionList }, { "KMimeType::List", marshall_KMimeTypeList }, { "KMimeType::Ptr", marshall_KMimeTypePtr }, { "KService::Ptr", marshall_KServicePtr }, @@ -1410,7 +1410,7 @@ TypeHandler KDE_handlers[] = { { "KURL::List&", marshall_KURLList }, { "KFileItemList", marshall_KFileItemList }, { "KFileItemList*", marshall_KFileItemList }, - { "TQPtrList*", marshall_KMainWindowList }, + { "TQPtrList*", marshall_TDEMainWindowList }, { "TQPtrList", marshall_DCOPObjectList }, { "TQPtrList&", marshall_KDockWidgetList }, { "TQPtrList*", marshall_KDockWidgetList }, @@ -1420,8 +1420,8 @@ TypeHandler KDE_handlers[] = { { "TQPtrList", marshall_KPartPluginList }, { "TQPtrList", marshall_KPartReadOnlyPartList }, { "TQPtrList&", marshall_KServiceTypeProfileList }, - { "TQValueList", marshall_KActionPtrList }, - { "KActionPtrList", marshall_KActionPtrList }, + { "TQValueList", marshall_TDEActionPtrList }, + { "TDEActionPtrList", marshall_TDEActionPtrList }, { "TQValueList", marshall_KAboutPersonList }, { "TQValueList", marshall_KAboutTranslatorList }, { "TQValueList&", marshall_KIOCopyInfoList }, diff --git a/korundum/rubylib/templates/annotated/basicapp.rb b/korundum/rubylib/templates/annotated/basicapp.rb index fe512f77..9fd77171 100644 --- a/korundum/rubylib/templates/annotated/basicapp.rb +++ b/korundum/rubylib/templates/annotated/basicapp.rb @@ -94,7 +94,7 @@ KDE::CmdLineArgs.addCmdLineOptions([["+files", "File to open", ""]]) # until there is a TDEApplication instance app = KDE::Application.new() -# instantiate the subclass of KMainWindow +# instantiate the subclass of TDEMainWindow mainWindow = MainWin.new(nil, "main window") # create the display diff --git a/korundum/rubylib/templates/annotated/menuapp1.rb b/korundum/rubylib/templates/annotated/menuapp1.rb index d65d3272..bf4ea83c 100644 --- a/korundum/rubylib/templates/annotated/menuapp1.rb +++ b/korundum/rubylib/templates/annotated/menuapp1.rb @@ -92,7 +92,7 @@ class MainWin < KDE::MainWindow fileMenu.insertSeparator() fileMenu.insertItem(i18n("Save"), self, SLOT('slotSave()'), TQt::KeySequence.new(KDE::StdAccel.save().keyCodeQt())) - # KStdAccel doesn't have a standard accelerator for 'Save As', + # TDEStdAccel doesn't have a standard accelerator for 'Save As', # so we omit it - insertItem uses the default value fileMenu.insertItem(i18n("SaveAs"), self, SLOT('slotSaveAs()')) diff --git a/korundum/rubylib/templates/annotated/menuapp2.rb b/korundum/rubylib/templates/annotated/menuapp2.rb index cf79d572..f8778163 100644 --- a/korundum/rubylib/templates/annotated/menuapp2.rb +++ b/korundum/rubylib/templates/annotated/menuapp2.rb @@ -111,7 +111,7 @@ class MainWin < KDE::MainWindow # or you can use KDE::Action.setIcon to set/change the icon. You # can also add a tooltip with KDE::Action.setToolTip - # This KAction constructor requires a string, an accelerator (0 + # This TDEAction constructor requires a string, an accelerator (0 # in this case), a slot, and a TQObject (None in this case) @specialAction = KDE::Action.new(i18n("Special"), KDE::Shortcut.new(0), self, SLOT('slotSpecial()'), actionCollection(), "specialActionName") diff --git a/korundum/rubylib/templates/annotated/minimal.rb b/korundum/rubylib/templates/annotated/minimal.rb index e700adc1..1f910f09 100644 --- a/korundum/rubylib/templates/annotated/minimal.rb +++ b/korundum/rubylib/templates/annotated/minimal.rb @@ -67,7 +67,7 @@ about = KDE::AboutData.new(appName, "A minimal application", "0.1") KDE::CmdLineArgs.init(ARGV, about) app = KDE::Application.new() -# instantiate the subclass of KMainWindow +# instantiate the subclass of TDEMainWindow mainWindow = MainWin.new(nil, "main window") # create the display -- cgit v1.2.1