Fix remaining issues and build warnings

Cleanup code

Signed-off-by: Pascal Viandier <midi-pascal@videotron.ca>

1 files changed, 28 insertions, 33 deletions

diff --git a/src/kooldock.h b/src/kooldock.h
index 85b4700..34731ff 100644
--- a/src/kooldock.h
+++ b/src/kooldock.h
@@ -7,12 +7,10 @@
  ***************************************************************************/
 
 /***************************************************************************
- *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
- *                                                                         *
  ***************************************************************************/
 
 #ifndef KOOLDOCK_H
@@ -62,19 +60,19 @@ const int ON_CHANGE_ANIM_INTERVAL = 50; // animation's interval
 class KoolDock : public TQWidget
 {
    Q_OBJECT
+
    public:
    /** construtor */
-   KoolDock(TQWidget* parent=0, const char *name=0);
+   KoolDock(TQWidget* parent = 0, const char* name = 0);
    /** destructor */
    ~KoolDock();
     
-   //static bool writeIgnoreList(TQString text);
    void setMainPath(const TQString& path);
    void setArgs(const TQString& param);
    clip *clipw;
     
    private:
-      TQTime *perf;
+      TQTime* perf;
       // configuration variables
       int fShowTaskbar; // show-taskbar flag
       int fMinimizedOnly; // show only minimized icons flag
@@ -162,7 +160,6 @@ class KoolDock : public TQWidget
       int Ybase;
 
       // normal variables
-
       TQString progPath;
       TQString menuPath;
       TQString confFile;
@@ -172,10 +169,9 @@ class KoolDock : public TQWidget
 
       TQStringList ignoreList;
 
-
-      NETWinInfo *info;
-      KWinModule *wm;
-      SetupDialog *setupdlg;
+      NETWinInfo* info;
+      KWinModule* wm;
+      SetupDialog* setupdlg;
 
       int Offset; 
       int numLaunchers; // number of quick launcher items
@@ -199,17 +195,17 @@ class KoolDock : public TQWidget
       int cur_cx[MAX_ICONS + 1];//positions of visible icons
       TQPixmap offscr;//drawing buffer
 
-      KRootPixmap *rootpix;
+      KRootPixmap* rootpix;
       KPixmap bottomBg;
       KPixmap bottomBgf;
       TQPixmap topBg;
 
-      TDEAboutDialog *aboutDlg;
-      TQTimer *mkbigTimer; //zoom animation timers
-      TQTimer *mksmallTimer;
-      TQTimer *mTimer; //mouse move emulator (can't use normal event instead)
-      TQTimer *onChangeTimer; // used when a window has changed and we need to notify user
-      TQTimer *trackTimer; //checks whether mouse touches screen edge
+      TDEAboutDialog* aboutDlg;
+      TQTimer* mkbigTimer; //zoom animation timers
+      TQTimer* mksmallTimer;
+      TQTimer* mTimer; //mouse move emulator (can't use normal event instead)
+      TQTimer* onChangeTimer; // used when a window has changed and we need to notify user
+      TQTimer* trackTimer; //checks whether mouse touches screen edge
 
       int animStep; // animation step, not in use yet
       int iOnClick; // index of the quick launcher being clicked
@@ -217,12 +213,12 @@ class KoolDock : public TQWidget
       TQString cClass;
       WId CurrentFocus;
       int onChangeAnimStep;
-      TDEPopupMenu *deskpopup;
-      TDEPopupMenu *appMenu;
-      TDEPopupMenu *godesk;
-      TDEPopupMenu *tasklist;
-      TDEPopupMenu *popup;
-      TDEPopupMenu *advMenu;
+      TDEPopupMenu* deskpopup;
+      TDEPopupMenu* appMenu;
+      TDEPopupMenu* godesk;
+      TDEPopupMenu* tasklist;
+      TDEPopupMenu* popup;
+      TDEPopupMenu* advMenu;
       int menuCount, currMenu;
       bool allApps;
       TQPtrList<TDEPopupMenu> popups;
@@ -235,7 +231,6 @@ class KoolDock : public TQWidget
        /*Xosd Section */
       TQString nom;
       TQString aux;
-      //xosd *osd;
       int xosd_st;
       int showNames;
       int fCleaner;
@@ -246,8 +241,8 @@ class KoolDock : public TQWidget
       bool xosdBold;
       bool xosdItalic;
       int xosdSize;
-      KURIFilterData *_filterData;
-      xosd *xosdw;
+      KURIFilterData* _filterData;
+      xosd* xosdw;
       int animValue;
       int animState;
 
@@ -255,8 +250,8 @@ class KoolDock : public TQWidget
       int func(int x);
       int func2(int x);
       void doUpdateGeometry();
-      bool addTask(WId id, int iFound=-1);
-      bool rmTask(WId id, int iFound=-1);
+      bool addTask(WId id, int iFound = -1);
+      bool rmTask(WId id, int iFound = -1);
       void rmwTask(int iFound);
       bool addwTask(WId id);
       void movetoback(WId id);
@@ -279,11 +274,11 @@ class KoolDock : public TQWidget
       void init2();
 
    protected:
-      void paintEvent(TQPaintEvent *);
-      void mousePressEvent( TQMouseEvent * );
-      void mMoveEvent( int ex, int ey);
+      void paintEvent(TQPaintEvent*);
+      void mousePressEvent(TQMouseEvent*);
+      void mMoveEvent(int ex, int ey);
       void mPress( int mx, int my, ButtonState srcButton);
-      void wheelEvent(TQWheelEvent *);
+      void wheelEvent(TQWheelEvent*);
       void enterEvent(TQEvent*);
       void onleaveEvent(TQEvent*);
       void mksmallTimerstop();
@@ -369,4 +364,4 @@ class KoolDock : public TQWidget
       void pTest();
 };
 
-#endif
+#endif // KOOLDOCK_H