Initial TDE conversion

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

4 files changed, 23 insertions, 23 deletions

diff --git a/kickermenu/Makefile.am b/kickermenu/Makefile.am
index db40fed..9906626 100644
--- a/kickermenu/Makefile.am
+++ b/kickermenu/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = menuapplet.h
 b_menu_panelapplet_la_METASOURCES = AUTO
 
 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/configure.in.in b/kickermenu/configure.in.in
index 72f8843..29a7674 100644
--- a/kickermenu/configure.in.in
+++ b/kickermenu/configure.in.in
@@ -1,2 +1,2 @@
-AM_CONDITIONAL( HAVE_3_4, test $(kde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2) -gt 3 )
+AM_CONDITIONAL( HAVE_3_4, test $(tde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2) -gt 3 )
 
diff --git a/kickermenu/menuapplet.cpp b/kickermenu/menuapplet.cpp
index 6ff5d75..f82e2c3 100644
--- a/kickermenu/menuapplet.cpp
+++ b/kickermenu/menuapplet.cpp
@@ -31,14 +31,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqtooltip.h>
 #include <tqtimer.h>
 #include <tqvariant.h> // avoid X11 #define's
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kwin.h>
-#include <kwinmodule.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
+#include <twin.h>
+#include <twinmodule.h>
 
 #include <netwm.h>
 
@@ -67,7 +67,7 @@ extern "C"
 {
     KDE_EXPORT 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 );
     }
 }
@@ -87,7 +87,7 @@ const long SUPPORTED_WINDOW_TYPES = NET::NormalMask | NET::DesktopMask | NET::Do
 
 Applet::Applet( const TQString& configFile_P, TQWidget* parent_P ) : KPanelApplet( configFile_P, Normal, 0, parent_P, "menuapplet" ), DCOPObject( "menuapplet" ), module( NULL ), active_menu( NULL ), selection( NULL ), selection_watcher( NULL ), desktop_menu( false ), topEdgeOffset( 0 )
 {
-   KConfig config(TQDir::homeDirPath() + "/.qt/baghirarc");
+   TDEConfig config(TQDir::homeDirPath() + "/.qt/baghirarc");
    config.setGroup("Menubar");
    _maxWidth = config.readNumEntry("Width", TQDesktopWidget().availableGeometry().width());
    _menuMover = new TQLabel("<<|>>", this );
@@ -103,7 +103,7 @@ Applet::Applet( const TQString& configFile_P, TQWidget* parent_P ) : KPanelApple
    windowList = new KWindowListMenu(windowIndicator);
    connect(windowList, SIGNAL(aboutToShow()), this, SLOT(initPopup()));
    windowIndicator->insertItem( "KDE", windowList, 0);
-   TQFont tmpFont = KGlobalSettings::menuFont();
+   TQFont tmpFont = TDEGlobalSettings::menuFont();
    windowIndicator->setFont(tmpFont);
 //    windowIndicator->adjustSize();
 //    int tmpHeight = windowIndicator->height();
@@ -117,7 +117,7 @@ Applet::Applet( const TQString& configFile_P, TQWidget* parent_P ) : KPanelApple
    //==============
    // toolbarAppearanceChanged(int) is sent when changing macstyle
    connect( kapp, SIGNAL( toolbarAppearanceChanged( int )), this, SLOT( readSettings()));
-   connect( kapp, SIGNAL( kdisplayFontChanged()), this, SLOT( fontChanged()));
+   connect( kapp, SIGNAL( tdedisplayFontChanged()), this, SLOT( fontChanged()));
    claimSelection();
    readSettings();
    updateTopEdgeOffset();
@@ -129,14 +129,14 @@ Applet::~Applet()
    delete selection;
    delete selection_watcher;
    delete module;
-   KGlobal::locale()->removeCatalogue("kmenuapplet");
+   TDEGlobal::locale()->removeCatalogue("kmenuapplet");
 }
 
 void Applet::fontChanged()
 {
    if (!windowIndicator)
       return;
-   TQFont tmpFont = KGlobalSettings::menuFont();
+   TQFont tmpFont = TDEGlobalSettings::menuFont();
 //    windowIndicator->setFont(tmpFont);
 //    windowIndicator->adjustSize();
 //    int tmpHeight = windowIndicator->height();
@@ -504,7 +504,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 ))
    {
@@ -536,7 +536,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;
@@ -548,7 +548,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/menuapplet.h b/kickermenu/menuapplet.h
index facd256..dea5481 100644
--- a/kickermenu/menuapplet.h
+++ b/kickermenu/menuapplet.h
@@ -28,9 +28,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kpanelapplet.h>
 #include <tqintdict.h>
 #include <tqvaluelist.h>
-#include <kmenubar.h>
-#include <kwindowlistmenu.h>
-#include <kwinmodule.h>
+#include <tdemenubar.h>
+#include <twindowlistmenu.h>
+#include <twinmodule.h>
 #include <kmanagerselection.h>
 #include <dcopclient.h>
 #include <dcopobject.h>
@@ -85,8 +85,8 @@ private:
    KWinModule* module;
    TQValueList< MenuEmbed* > menus;
    MenuEmbed* active_menu;
-   KSelectionOwner* selection;
-   KSelectionWatcher* selection_watcher;
+   TDESelectionOwner* selection;
+   TDESelectionWatcher* selection_watcher;
    bool desktop_menu;
    DCOPClient dcopclient;
    int topEdgeOffset;