diff options
author | Timothy Pearson <[email protected]> | 2013-02-03 22:59:55 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-03 22:59:55 -0600 |
commit | 4f841fbbbc5d3399535ade061699cc76363c7a3f (patch) | |
tree | 1d036f7ddb4294acb7bbad8d16ae30d8509222b5 /kicker | |
parent | 3e5506b29bb8d45ab067d3a4623af70a56abb990 (diff) | |
download | tdebase-4f841fbbbc5d3399535ade061699cc76363c7a3f.tar.gz tdebase-4f841fbbbc5d3399535ade061699cc76363c7a3f.zip |
Rename KStyle to TDEStyle to avoid conflicts with KDE4
Diffstat (limited to 'kicker')
-rw-r--r-- | kicker/kicker/ui/k_new_mnu.h | 4 | ||||
-rw-r--r-- | kicker/menuext/tom/tom.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kicker/kicker/ui/k_new_mnu.h b/kicker/kicker/ui/k_new_mnu.h index 344be9b89..f48e5652c 100644 --- a/kicker/kicker/ui/k_new_mnu.h +++ b/kicker/kicker/ui/k_new_mnu.h @@ -81,7 +81,7 @@ enum OverflowCategoryState { None, Filling, NotNeeded }; class KMenu : public KMenuBase { Q_OBJECT - TQ_PROPERTY (bool KStyleMenuDropShadow READ useKStyleMenuDropShadow ) + TQ_PROPERTY (bool TDEStyleMenuDropShadow READ useTDEStyleMenuDropShadow ) public: KMenu(); @@ -90,7 +90,7 @@ public: int insertClientMenu(KickerClientMenu *p); void removeClientMenu(int id); - bool useKStyleMenuDropShadow() const { return true; } + bool useTDEStyleMenuDropShadow() const { return true; } virtual void showMenu(); virtual bool eventFilter(TQObject*, TQEvent*); diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc index 4f3aa169a..4ff5c8c32 100644 --- a/kicker/menuext/tom/tom.cc +++ b/kicker/menuext/tom/tom.cc @@ -114,7 +114,7 @@ class runMenuWidget : public TQWidget, public QMenuItem runLayout->addSpacing(KDialog::spacingHint()); TQSettings settings; - if (settings.readEntry("/KStyle/Settings/MenuTransparencyEngine", "Disabled") != "Disabled") + if (settings.readEntry("/TDEStyle/Settings/MenuTransparencyEngine", "Disabled") != "Disabled") { setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); //l1->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); |