diff options
Diffstat (limited to 'kickermenu-3.3/menuapplet.cpp')
-rw-r--r-- | kickermenu-3.3/menuapplet.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
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" ); |