diff options
author | Timothy Pearson <[email protected]> | 2013-04-10 16:55:58 -0500 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-04-10 16:55:58 -0500 |
commit | 137c3446f89fe808518981f974714161f794b364 (patch) | |
tree | c2510cece63d90384375b1daf0b708fb7b23169e /kicker/taskbar/taskcontainer.h | |
parent | 4dc80faf840ee48bd4c0b8d5338a5274de013c39 (diff) | |
download | tdebase-137c3446f89fe808518981f974714161f794b364.tar.gz tdebase-137c3446f89fe808518981f974714161f794b364.zip |
Overhaul taskbar configuration system
This resolves Bug 1399
Diffstat (limited to 'kicker/taskbar/taskcontainer.h')
-rw-r--r-- | kicker/taskbar/taskcontainer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kicker/taskbar/taskcontainer.h b/kicker/taskbar/taskcontainer.h index a176a0787..b7016477e 100644 --- a/kicker/taskbar/taskcontainer.h +++ b/kicker/taskbar/taskcontainer.h @@ -45,9 +45,8 @@ public: typedef TQValueList<TaskContainer*> List; typedef TQValueList<TaskContainer*>::iterator Iterator; - TaskContainer(Task::Ptr, TaskBar*, TaskBarSettings* settingsObject, TQWidget *parent = 0, const char *name = 0); - TaskContainer(Startup::Ptr, PixmapList&, TaskBar*, TaskBarSettings* settingsObject, - TQWidget *parent = 0, const char *name = 0); + TaskContainer(Task::Ptr, TaskBar*, TaskBarSettings* settingsObject, TaskBarSettings* globalSettingsObject, TQWidget *parent = 0, const char *name = 0); + TaskContainer(Startup::Ptr, PixmapList&, TaskBar*, TaskBarSettings* settingsObject, TaskBarSettings* globalSettingsObject, TQWidget *parent = 0, const char *name = 0); virtual ~TaskContainer(); void setArrowType( TQt::ArrowType at ); @@ -151,6 +150,7 @@ private: enum { ATTENTION_BLINK_TIMEOUT = 4 }; TQPoint m_dragStartPos; TaskBarSettings* m_settingsObject; + TaskBarSettings* m_globalSettingsObject; }; #endif |