Initial TDE conversion

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

4 files changed, 17 insertions, 17 deletions

diff --git a/kickermenu-3.3/Makefile.am b/kickermenu-3.3/Makefile.am
index ad5542d..02eebb0 100644
--- a/kickermenu-3.3/Makefile.am
+++ b/kickermenu-3.3/Makefile.am
@@ -14,7 +14,7 @@ lnk_DATA = b_menuapplet.desktop
 EXTRA_DIST = $(lnk_DATA)
 
 b_menu_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-b_menu_panelapplet_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI)
+b_menu_panelapplet_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
 
 messages:
 	$(XGETTEXT) *.cpp *.h -o $(podir)/kmenuapplet.pot
diff --git a/kickermenu-3.3/b_menuapplet.desktop b/kickermenu-3.3/b_menuapplet.desktop
index 6328532..036a004 100644
--- a/kickermenu-3.3/b_menuapplet.desktop
+++ b/kickermenu-3.3/b_menuapplet.desktop
@@ -5,5 +5,5 @@ Comment=Applet embedding standalone menubars (Patched baghira version)
 
 Icon=menu
 
-X-KDE-Library=b_menu_panelapplet
-X-KDE-UniqueApplet=true
+X-TDE-Library=b_menu_panelapplet
+X-TDE-UniqueApplet=true
diff --git a/kickermenu-3.3/menuapplet.cpp b/kickermenu-3.3/menuapplet.cpp
index e508c48..4b43223 100644
--- a/kickermenu-3.3/menuapplet.cpp
+++ b/kickermenu-3.3/menuapplet.cpp
@@ -30,15 +30,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <assert.h>
 #include <tqcursor.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqtooltip.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <kdebug.h>
 #include <netwm.h>
-#include <kapplication.h>
-#include <kwin.h>
+#include <tdeapplication.h>
+#include <twin.h>
 
 #include <X11/Xlib.h>
 
@@ -63,7 +63,7 @@ extern "C"
 {
     KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P )
     {
-      KGlobal::locale()->insertCatalogue("kmenuapplet");
+      TDEGlobal::locale()->insertCatalogue("kmenuapplet");
       return new KickerMenuApplet::Applet( configFile_P, parent_P );
     }
 }
@@ -120,7 +120,7 @@ Applet::~Applet()
     delete selection;
     delete selection_watcher;
     delete module;
-    KGlobal::locale()->removeCatalogue("kmenuapplet");
+    TDEGlobal::locale()->removeCatalogue("kmenuapplet");
     }
 
 void Applet::initPopup()
@@ -428,7 +428,7 @@ void Applet::paletteChange(const TQPalette & /* oldPalette */)
 void Applet::claimSelection()
     {
     assert( selection == NULL );
-    selection = new KSelectionOwner( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
+    selection = new TDESelectionOwner( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
 // force taking the selection, but don't kill previous owner
     if( selection->claim( true, false ))
 	{
@@ -464,7 +464,7 @@ void Applet::lostSelection()
     active_menu = NULL;
     if( selection_watcher == NULL )
         {
-        selection_watcher = new KSelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
+        selection_watcher = new TDESelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
         connect( selection_watcher, SIGNAL( lostOwner()), this, SLOT( claimSelection()));
         }
     delete module;
@@ -476,7 +476,7 @@ void Applet::lostSelection()
 
 void Applet::readSettings()
     {
-    KConfig cfg( "kdesktoprc", true );
+    TDEConfig cfg( "kdesktoprc", true );
     cfg.setGroup( "Menubar" );
     desktop_menu = cfg.readBoolEntry( "ShowMenubar", false );
     cfg.setGroup( "KDE" );
diff --git a/kickermenu-3.3/menuapplet.h b/kickermenu-3.3/menuapplet.h
index 915a033..782d922 100644
--- a/kickermenu-3.3/menuapplet.h
+++ b/kickermenu-3.3/menuapplet.h
@@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqintdict.h>
 #include <tqvaluelist.h>
 #include <tqmenubar.h>
-#include <kwindowlistmenu.h>
-#include <kwinmodule.h>
+#include <twindowlistmenu.h>
+#include <twinmodule.h>
 #include <kmanagerselection.h>
 #include <dcopclient.h>
 #include <dcopobject.h>
@@ -80,8 +80,8 @@ class Applet : public KPanelApplet, public DCOPObject
 	TQValueList< MenuEmbed* > menus;
 	MenuEmbed* active_menu;
 	KArrowButton grow_indicator_left, grow_indicator_right;
-	KSelectionOwner* selection;
-        KSelectionWatcher* selection_watcher;
+	TDESelectionOwner* selection;
+        TDESelectionWatcher* selection_watcher;
         bool desktop_menu;
         DCOPClient dcopclient;
         // to show current active window (not necessary equal to the menubar)