diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 15:11:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 15:11:21 -0600 |
| commit | f537c21b68e08f649b1b297bce8f3904603137e0 (patch) | |
| tree | fb33065387509dea898c90022ddec9c3f8ede86d /kicker/applets/menu | |
| parent | dc5f267664506a312203c26bfe9001a448b0bb0f (diff) | |
| download | tdebase-f537c21b68e08f649b1b297bce8f3904603137e0.tar.gz tdebase-f537c21b68e08f649b1b297bce8f3904603137e0.zip | |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kicker/applets/menu')
| -rw-r--r-- | kicker/applets/menu/menuapplet.cpp | 4 | ||||
| -rw-r--r-- | kicker/applets/menu/menuapplet.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index 8a9f68095..ee3bb175c 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -292,7 +292,7 @@ void Applet::setBackground() 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 )) { @@ -327,7 +327,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, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( claimSelection())); } delete module; diff --git a/kicker/applets/menu/menuapplet.h b/kicker/applets/menu/menuapplet.h index 5ba54cd66..0b09334b6 100644 --- a/kicker/applets/menu/menuapplet.h +++ b/kicker/applets/menu/menuapplet.h @@ -51,7 +51,7 @@ class MenuEmbed; * * @description All status change, such as when an window is activated, * a new window popped up, etc, is received via @ref KWin::WindowInfo and @ref - * NETWinInfo. Status changes for X selections are done via KSelectionWatcher. + * NETWinInfo. Status changes for X selections are done via TDESelectionWatcher. * * How it works in broad terms: KickerMenuApplet gets notified as soon a window * changes(a new pops up etc.) and accordingly updates the list @ref menus, @@ -158,12 +158,12 @@ private: */ MenuEmbed* active_menu; - KSelectionOwner* selection; + TDESelectionOwner* selection; /** * Only the messenger. Dispatches signals to claimSelection(). */ - KSelectionWatcher* selection_watcher; + TDESelectionWatcher* selection_watcher; /** * Whether the Desktop menu should be used, when a window |