More janitor....

remove ulong ref because we use Q_REFCOUNT which also takes
care of initializing the refcount to 0

"And if you save yourself
You will make him happy
He'll keep you in a jar
And you'll think you're happy
He'll give you breathing holes"

18 files changed, 9 insertions, 18 deletions

diff --git a/inputmethods/dasher/QtDasherImpl.cc b/inputmethods/dasher/QtDasherImpl.cc
index 9513802..d72f6d9 100644
--- a/inputmethods/dasher/QtDasherImpl.cc
+++ b/inputmethods/dasher/QtDasherImpl.cc
@@ -12,25 +12,25 @@ static const char * qtdasher_xpm[]={
 "# c #303030",
 "  c None",
 " ########################## ",
 "                            ",
 "    #     #                 ",
 "   # #   # #                ",
 "  #   # #   #               ",
 " #     #     #              ",
 " ########################## "};
 
 
 QtDasherImpl::QtDasherImpl()
-  : qtdasherwidget(0), icn(0), ref(0), qtdasherinterface(0)
+  : qtdasherwidget(0), icn(0), qtdasherinterface(0)
 {
 }
 
 QtDasherImpl::~QtDasherImpl()
 {
     delete qtdasherwidget;
     delete icn;
 }
 
 QWidget *QtDasherImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 {
   if ( !qtdasherwidget ) {
diff --git a/inputmethods/dasher/QtDasherImpl.h b/inputmethods/dasher/QtDasherImpl.h
index c143dc3..69e278c 100644
--- a/inputmethods/dasher/QtDasherImpl.h
+++ b/inputmethods/dasher/QtDasherImpl.h
@@ -19,20 +19,19 @@ public:
 #endif
 
     virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f );
     virtual void resetState();
     virtual QPixmap *icon();
     virtual QString name();
     virtual void onKeyPress( QObject *receiver, const char *slot );
 
 private:
     CDasherInterface *qtdasherinterface;
     QtDasherPlugin *qtdasherwidget;
     QPixmap *icn;
-    ulong ref;
 };
 
 #endif
 
 
 
 
diff --git a/inputmethods/dvorak/dvorakimpl.cpp b/inputmethods/dvorak/dvorakimpl.cpp
index 9e9fed9..1bc2ec8 100644
--- a/inputmethods/dvorak/dvorakimpl.cpp
+++ b/inputmethods/dvorak/dvorakimpl.cpp
@@ -59,25 +59,25 @@ static const char * const opti_xpm[] = {
 " .+@@.+@@.+@@.+@@.+@@.+@@.  ",
 " .........................  ",
 " .+++.+++.+++.+++.+++.+++.  ",
 " .+@@.+@@.+@@.+@@.+@@.+@@.  ",
 " .........................  ",
 " .+++.+++.+++.+++.+++.+++.  ",
 " .+@@.+@@.+@@.+@@.+@@.+@@.  ",
 " .........................  "};
 
 
 
 KeyboardImpl::KeyboardImpl()
-    : input(0), icn(0), ref(0)
+    : input(0), icn(0)
 {
 }
 
 KeyboardImpl::~KeyboardImpl()
 {
     delete input;
     delete icn;
 }
 
 QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 {
     if ( !input )
diff --git a/inputmethods/dvorak/dvorakimpl.h b/inputmethods/dvorak/dvorakimpl.h
index bd9fa88..8cc4e25 100644
--- a/inputmethods/dvorak/dvorakimpl.h
+++ b/inputmethods/dvorak/dvorakimpl.h
@@ -43,18 +43,17 @@ public:
     Q_REFCOUNT
 #endif
 
     virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f );
     virtual void resetState();
     virtual QPixmap *icon();
     virtual QString name();
     virtual void onKeyPress( QObject *receiver, const char *slot );
 
 private:
     Dvorak::Keyboard *input;
     QPixmap *icn;
-    ulong ref;
 };
 
 } // anonymous namespace
 
 #endif
diff --git a/inputmethods/handwriting/handwritingimpl.cpp b/inputmethods/handwriting/handwritingimpl.cpp
index 22e2058..bbd5b1b 100644
--- a/inputmethods/handwriting/handwritingimpl.cpp
+++ b/inputmethods/handwriting/handwritingimpl.cpp
@@ -42,25 +42,25 @@ static const char * pen_xpm[] = {
 "                     .@%&.  ",
 "                    .@%&.   ",
 "      .            .@%&.    ",
 "      .           .@%&.     ",
 "      .          .@%&.      ",
 "  ... ...   ..  .@%&.       ",
 " .  . .  . .   .*.&.        ",
 " .  . .  . .   .**.         ",
 "  ... ...   .. ...          ",
 "                            "};
 
 HandwritingImpl::HandwritingImpl()
-    : input(0), icn(0), ref(0)
+    : input(0), icn(0)
 {
 }
 
 HandwritingImpl::~HandwritingImpl()
 {
     delete input;
     delete icn;
 }
 
 QWidget *HandwritingImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 {
     if ( !input )
diff --git a/inputmethods/handwriting/handwritingimpl.h b/inputmethods/handwriting/handwritingimpl.h
index 1215853..4297c8c 100644
--- a/inputmethods/handwriting/handwritingimpl.h
+++ b/inputmethods/handwriting/handwritingimpl.h
@@ -36,16 +36,15 @@ public:
     Q_REFCOUNT
 #endif
 
     virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f );
     virtual void resetState();
     virtual QPixmap *icon();
     virtual QString name();
     virtual void onKeyPress( QObject *receiver, const char *slot );
 
 private:
     QIMPenInput *input;
     QPixmap *icn;
-    ulong ref;
 };
 
 #endif
diff --git a/inputmethods/jumpx/keyboardimpl.cpp b/inputmethods/jumpx/keyboardimpl.cpp
index e75dd5f..b40046c 100644
--- a/inputmethods/jumpx/keyboardimpl.cpp
+++ b/inputmethods/jumpx/keyboardimpl.cpp
@@ -26,25 +26,25 @@ static const char * const icon_xpm[] = {
 " ....... ... ... .......  ",
 ".       .   .   .       . ",
 ".       .   .   .       . ",
 ".       .   .   .       . ",
 " ....... ... ... .......  ",
 ".   .   .   .   .   .   . ",
 ".   .   .   .   .   .   . ",
 ".   .   .   .   .   .   . ",
 " ... ... ... ... ... ...  "};
 
 
 KeyboardImpl::KeyboardImpl()
-    : input(0), icn(0), ref(0)
+    : input(0), icn(0)
 {
 }
 
 KeyboardImpl::~KeyboardImpl()
 {
     delete input;
     delete icn;
 }
 
 QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 {
     if ( !input )
diff --git a/inputmethods/jumpx/keyboardimpl.h b/inputmethods/jumpx/keyboardimpl.h
index 087781f..cee4c18 100644
--- a/inputmethods/jumpx/keyboardimpl.h
+++ b/inputmethods/jumpx/keyboardimpl.h
@@ -34,18 +34,17 @@ public:
     Q_REFCOUNT
 #endif
 
     virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f );
     virtual void resetState();
     virtual QPixmap *icon();
     virtual QString name();
     virtual void onKeyPress( QObject *receiver, const char *slot );
 
 private:
     JumpX::Keyboard *input;
     QPixmap *icn;
-    ulong ref;
 };
 
 } // anonymous namespace
 
 #endif
diff --git a/inputmethods/keyboard/keyboardimpl.cpp b/inputmethods/keyboard/keyboardimpl.cpp
index 701d35f..86d0427 100644
--- a/inputmethods/keyboard/keyboardimpl.cpp
+++ b/inputmethods/keyboard/keyboardimpl.cpp
@@ -57,25 +57,25 @@ static const char * const ipti_xpm[] = {
 " .........................  ",
 " .+++.+++.+++.+++.+++.+++.  ",
 " .+@@.+@@.+@@.+@@.+@@.+@@.  ",
 " .........................  ",
 " .+++.+++.+++.+++.+++.+++.  ",
 " .+@@.+@@.+@@.+@@.+@@.+@@.  ",
 " .........................  ",
 " .+++.+++.+++.+++.+++.+++.  ",
 " .+@@.+@@.+@@.+@@.+@@.+@@.  ",
 " .........................  "};
 
 KeyboardImpl::KeyboardImpl()
-    : input(0), icn(0), ref(0)
+    : input(0), icn(0)
 {
 }
 
 KeyboardImpl::~KeyboardImpl()
 {
     delete input;
     delete icn;
 }
 
 QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 {
     if ( !input )
diff --git a/inputmethods/keyboard/keyboardimpl.h b/inputmethods/keyboard/keyboardimpl.h
index d33a822..644070c 100644
--- a/inputmethods/keyboard/keyboardimpl.h
+++ b/inputmethods/keyboard/keyboardimpl.h
@@ -43,18 +43,17 @@ public:
     Q_REFCOUNT
 #endif
 
     virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f );
     virtual void resetState();
     virtual QPixmap *icon();
     virtual QString name();
     virtual void onKeyPress( QObject *receiver, const char *slot );
 
 private:
     KeyboardInput::Keyboard *input;
     QPixmap *icn;
-    ulong ref;
 };
 
 } // anonymous namespace
 
 #endif
diff --git a/inputmethods/kjumpx/keyboardimpl.cpp b/inputmethods/kjumpx/keyboardimpl.cpp
index 54fe36e..6c4af71 100644
--- a/inputmethods/kjumpx/keyboardimpl.cpp
+++ b/inputmethods/kjumpx/keyboardimpl.cpp
@@ -26,25 +26,25 @@ static const char * const icon_xpm[] = {
 " ...... ...... ...  ....  ",
 ".        .. .. ..       . ",
 ".        .. .. ..       . ",
 ".         ...  ..       . ",
 " ......  ..       ......  ",
 ".   .    ..         .   . ",
 ".   .     .......   .   . ",
 ".   .   .           .   . ",
 " ... ... ... ... ... ...  "};
 
 
 KeyboardImpl::KeyboardImpl()
-    : input(0), icn(0), ref(0)
+    : input(0), icn(0)
 {
 }
 
 KeyboardImpl::~KeyboardImpl()
 {
     delete input;
     delete icn;
 }
 
 QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 {
     if ( !input )
diff --git a/inputmethods/kjumpx/keyboardimpl.h b/inputmethods/kjumpx/keyboardimpl.h
index 1ff1034..e57121e 100644
--- a/inputmethods/kjumpx/keyboardimpl.h
+++ b/inputmethods/kjumpx/keyboardimpl.h
@@ -34,18 +34,17 @@ public:
     Q_REFCOUNT
 #endif
 
     virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f );
     virtual void resetState();
     virtual QPixmap *icon();
     virtual QString name();
     virtual void onKeyPress( QObject *receiver, const char *slot );
 
 private:
     KJumpX::Keyboard *input;
     QPixmap *icn;
-    ulong ref;
 };
 
 } // anonymous namespace
 
 #endif
diff --git a/inputmethods/multikey/keyboardimpl.cpp b/inputmethods/multikey/keyboardimpl.cpp
index b7908d9..a1c47ad 100644
--- a/inputmethods/multikey/keyboardimpl.cpp
+++ b/inputmethods/multikey/keyboardimpl.cpp
@@ -36,25 +36,25 @@ static const char * const kb_xpm[] = {
 " .+++++.+++.+++.+++.++++++. ",
 " .+@@@@.+@@.+@@.+@@.+@@@@@. ",
 " .......................... ",
 " .++++++.+++.+++.+++.+++++. ",
 " .+@@@@@.+@@.+@@.+@@.+@@@@. ",
 " .......................... ",
 " .++++.++++++++++++++.++++. ",
 " .+@@@.+@@@@@@@@@@@@@.+@@@. ",
 " .......................... "};
 
 
 KeyboardImpl::KeyboardImpl()
-    : input(0), icn(0), ref(0)
+    : input(0), icn(0)
 {
 }
 
 KeyboardImpl::~KeyboardImpl()
 {
     delete input;
     delete icn;
 }
 
 QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 {
     if ( !input )
diff --git a/inputmethods/multikey/keyboardimpl.h b/inputmethods/multikey/keyboardimpl.h
index 76a2955..40fea10 100644
--- a/inputmethods/multikey/keyboardimpl.h
+++ b/inputmethods/multikey/keyboardimpl.h
@@ -43,18 +43,17 @@ public:
     Q_REFCOUNT
 #endif
 
     virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f );
     virtual void resetState();
     virtual QPixmap *icon();
     virtual QString name();
     virtual void onKeyPress( QObject *receiver, const char *slot );
 
 private:
     MultiKey::Keyboard *input;
     QPixmap *icn;
-    ulong ref;
 };
 
 } // anonymous namespace
 
 #endif
diff --git a/inputmethods/pickboard/pickboardimpl.cpp b/inputmethods/pickboard/pickboardimpl.cpp
index 8f449cd..9a21229 100644
--- a/inputmethods/pickboard/pickboardimpl.cpp
+++ b/inputmethods/pickboard/pickboardimpl.cpp
@@ -29,25 +29,25 @@ static const char * pb_xpm[]={
 "# c #303030",
 "  c None",
 " ########################## ",
 " #   #   #   #   #   #    # ",
 " #   #   #   #   #   #    # ",
 " ########################## ",
 " #     #   #   #   #      # ",
 " #     #   #   #   #      # ",
 " ########################## "};
 
 
 PickboardImpl::PickboardImpl()
-    : pickboard(0), icn(0), ref(0)
+    : pickboard(0), icn(0)
 {
 }
 
 PickboardImpl::~PickboardImpl()
 {
     delete pickboard;
     delete icn;
 }
 
 QWidget *PickboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 {
     if ( !pickboard )
diff --git a/inputmethods/pickboard/pickboardimpl.h b/inputmethods/pickboard/pickboardimpl.h
index 4f23665..8340d0d 100644
--- a/inputmethods/pickboard/pickboardimpl.h
+++ b/inputmethods/pickboard/pickboardimpl.h
@@ -36,16 +36,15 @@ public:
     Q_REFCOUNT
 #endif
 
     virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f );
     virtual void resetState();
     virtual QPixmap *icon();
     virtual QString name();
     virtual void onKeyPress( QObject *receiver, const char *slot );
 
 private:
     Pickboard *pickboard;
     QPixmap *icn;
-    ulong ref;
 };
 
 #endif
diff --git a/inputmethods/unikeyboard/unikeyboardimpl.cpp b/inputmethods/unikeyboard/unikeyboardimpl.cpp
index e7fc00e..451f340 100644
--- a/inputmethods/unikeyboard/unikeyboardimpl.cpp
+++ b/inputmethods/unikeyboard/unikeyboardimpl.cpp
@@ -34,25 +34,25 @@ static const char * uni_xpm[]={
 "...####....#######..........",
 "...####....########..####...",
 "...####....####.####.####...",
 "...####....####..########...",
 "...####....####...#######...",
 "...####....####....######...",
 "...#####..#####.....#####...",
 "....##########.......####...",
 "......######..........###...",
 "............................"};
 
 UniKeyboardImpl::UniKeyboardImpl()
-    : input(0), icn(0), ref(0)
+    : input(0), icn(0)
 {
 }
 
 UniKeyboardImpl::~UniKeyboardImpl()
 {
     delete input;
     delete icn;
 }
 
 QWidget *UniKeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 {
     if ( !input )
diff --git a/inputmethods/unikeyboard/unikeyboardimpl.h b/inputmethods/unikeyboard/unikeyboardimpl.h
index 97b1ff6..8c7802f 100644
--- a/inputmethods/unikeyboard/unikeyboardimpl.h
+++ b/inputmethods/unikeyboard/unikeyboardimpl.h
@@ -34,16 +34,15 @@ public:
     QRESULT queryInterface( const QUuid&, QUnknownInterface** );
     Q_REFCOUNT
 
     virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f );
     virtual void resetState();
     virtual QPixmap *icon();
     virtual QString name();
     virtual void onKeyPress( QObject *receiver, const char *slot );
 
 private:
     UniKeyboard *input;
     QPixmap *icn;
-    ulong ref;
 };
 
 #endif