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/launcher | |
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/launcher')
-rw-r--r-- | kicker/applets/launcher/quickbutton.cpp | 6 | ||||
-rw-r--r-- | kicker/applets/launcher/quickbutton.h | 8 | ||||
-rw-r--r-- | kicker/applets/launcher/quictdelauncher.cpp | 2 | ||||
-rw-r--r-- | kicker/applets/launcher/quictdelauncher.h | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index 0563dbb20..c66f4ceb8 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -143,7 +143,7 @@ TQPixmap QuickURL::pixmap( mode_t _mode, KIcon::Group _group, } -QuickButton::QuickButton(const TQString &u, KAction* configAction, +QuickButton::QuickButton(const TQString &u, TDEAction* configAction, TQWidget *parent, const char *name) : SimpleButton(parent, name, KickerSettings::showDeepButtons()), m_flashCounter(0), @@ -174,8 +174,8 @@ QuickButton::QuickButton(const TQString &u, KAction* configAction, _popup->insertItem(SmallIcon("remove"), i18n("Remove Application"), this, TQT_SLOT(removeApp())); - m_stickyAction = new KToggleAction(i18n("Never Remove Automatically"), - KShortcut(), TQT_TQOBJECT(this)); + m_stickyAction = new TDEToggleAction(i18n("Never Remove Automatically"), + TDEShortcut(), TQT_TQOBJECT(this)); connect(m_stickyAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotStickyToggled(bool))); m_stickyAction->plug(_popup, 2); diff --git a/kicker/applets/launcher/quickbutton.h b/kicker/applets/launcher/quickbutton.h index d4f5be29e..4629093cc 100644 --- a/kicker/applets/launcher/quickbutton.h +++ b/kicker/applets/launcher/quickbutton.h @@ -40,8 +40,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "simplebutton.h" class TQPopupMenu; -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; class QuickURL { public: @@ -71,7 +71,7 @@ class QuickButton: public SimpleButton, public KickerTip::Client { public: enum { DEFAULT_ICON_DIM = 16 }; enum { ICON_MARGIN = 1 }; - QuickButton(const TQString &u, KAction* configAction, + QuickButton(const TQString &u, TDEAction* configAction, TQWidget *parent=0, const char *name=0); ~QuickButton(); TQString url() const; @@ -116,7 +116,7 @@ private: bool _highlight, _changeCursorOverItem, _dragEnabled; int _iconDim; bool m_sticky; - KToggleAction *m_stickyAction; + TDEToggleAction *m_stickyAction; int m_stickyId; KPanelApplet::Direction m_popupDirection; }; diff --git a/kicker/applets/launcher/quictdelauncher.cpp b/kicker/applets/launcher/quictdelauncher.cpp index 87ac35387..15439f9c9 100644 --- a/kicker/applets/launcher/quictdelauncher.cpp +++ b/kicker/applets/launcher/quictdelauncher.cpp @@ -107,7 +107,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions, m_oldButtons = 0; m_dragButtons = 0; - m_configAction = new KAction(i18n("Configure Quictdelauncher..."), "configure", KShortcut(), + m_configAction = new TDEAction(i18n("Configure Quictdelauncher..."), "configure", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), TQT_TQOBJECT(this)); m_saveTimer = new TQTimer(this, "m_saveTimer"); diff --git a/kicker/applets/launcher/quictdelauncher.h b/kicker/applets/launcher/quictdelauncher.h index c6fe1d2bb..71bd1c841 100644 --- a/kicker/applets/launcher/quictdelauncher.h +++ b/kicker/applets/launcher/quictdelauncher.h @@ -39,7 +39,7 @@ class ConfigDlg; class TQPopupMenu; class QuickButtonGroup; class PopularityStatistics; -class KAction; +class TDEAction; typedef QuickButtonGroup ButtonGroup; @@ -128,7 +128,7 @@ protected: bool m_dragAccepted, m_refreshEnabled, m_needsSave, m_needsRefresh; std::map<TQString, int> m_appOrdering; Prefs* m_settings; - KAction *m_configAction; + TDEAction *m_configAction; ConfigDlg *m_configDialog; PopularityStatistics* m_popularity; TQImage m_stickyHighlightLayer; |