diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-01-06 15:44:22 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-01-06 15:44:22 -0600 |
| commit | 3642a26c369228341bc7abf55341eb1d6d4d6dfa (patch) | |
| tree | 1ab102939f160e204c237f19af47e362ad31785b /kicker/taskbar/taskcontainer.h | |
| parent | 39c9f76c1b1bf4d2db41a217c301d1f260332697 (diff) | |
| parent | ce3da132361e281919a222a519ff9901c8d6c3e1 (diff) | |
| download | tdebase-3642a26c369228341bc7abf55341eb1d6d4d6dfa.tar.gz tdebase-3642a26c369228341bc7abf55341eb1d6d4d6dfa.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kicker/taskbar/taskcontainer.h')
| -rw-r--r-- | kicker/taskbar/taskcontainer.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/kicker/taskbar/taskcontainer.h b/kicker/taskbar/taskcontainer.h index 766d37639..a176a0787 100644 --- a/kicker/taskbar/taskcontainer.h +++ b/kicker/taskbar/taskcontainer.h @@ -33,6 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "taskmanager.h" class TaskBar; +class TaskBarSettings; typedef TQValueList<TQPixmap*> PixmapList; @@ -44,8 +45,8 @@ public: typedef TQValueList<TaskContainer*> List; typedef TQValueList<TaskContainer*>::iterator Iterator; - TaskContainer(Task::Ptr, TaskBar*, TQWidget *parent = 0, const char *name = 0); - TaskContainer(Startup::Ptr, PixmapList&, TaskBar*, + 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); virtual ~TaskContainer(); @@ -148,7 +149,8 @@ private: bool m_mouseOver; bool m_paintEventCompression; enum { ATTENTION_BLINK_TIMEOUT = 4 }; - TQPoint m_dragStartPos; + TQPoint m_dragStartPos; + TaskBarSettings* m_settingsObject; }; #endif |