From 137c3446f89fe808518981f974714161f794b364 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 10 Apr 2013 16:55:58 -0500 Subject: Overhaul taskbar configuration system This resolves Bug 1399 --- kicker/taskbar/taskcontainer.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kicker/taskbar/taskcontainer.h') 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 List; typedef TQValueList::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 -- cgit v1.2.3