7 files changed, 28 insertions, 28 deletions
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