fix includes

17 files changed, 4 insertions, 41 deletions

diff --git a/libopie/colordialog.cpp b/libopie/colordialog.cpp
index c7421ec..d46da41 100644
--- a/libopie/colordialog.cpp
+++ b/libopie/colordialog.cpp
@@ -37,27 +37,25 @@
 
 #include "colordialog.h"
 
 #include "qpainter.h"
 #include "qlayout.h"
 #include "qlabel.h"
 #include "qpushbutton.h"
 #include "qlineedit.h"
 #include "qimage.h"
 #include "qpixmap.h"
 #include "qdrawutil.h"
 #include "qvalidator.h"
-#include "qdragobject.h"
 #include "qapplication.h"
-#include "qdragobject.h"
 
 static inline void rgb2hsv( QRgb rgb, int&h, int&s, int&v )
 {
     QColor c;
     c.setRgb( rgb );
     c.getHsv(h,s,v);
 }
 
 /*
  * avoid clashes with the original Qt
  */
 namespace {
diff --git a/libopie/colorpopupmenu.cpp b/libopie/colorpopupmenu.cpp
index 5a8d77e..0d66fba 100644
--- a/libopie/colorpopupmenu.cpp
+++ b/libopie/colorpopupmenu.cpp
@@ -24,25 +24,24 @@
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "colorpopupmenu.h"
 #include "colordialog.h"
 
-#include <qaction.h>
 #include <qlayout.h>
 #include <qpainter.h>
 
 OColorPanelButton::OColorPanelButton( const QColor& color, QWidget* parent, const char* name )
     : QFrame( parent, name )
 {
     m_color = color;
 
     setFixedSize( 16, 16 );
     setActive( FALSE );
 }
 
diff --git a/libopie/ocheckitem.cpp b/libopie/ocheckitem.cpp
index 082d7a2..cd763c1 100644
--- a/libopie/ocheckitem.cpp
+++ b/libopie/ocheckitem.cpp
@@ -1,25 +1,24 @@
 /**********************************************************************
 ** Copyright (C) 2002 Stefan Eilers (se, eilers.stefan@epost.de
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU Library General Public License version 2 as published by the
 **  Free Software Foundation and appearing in the file LICENSE.GPL
 ** included in the packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **********************************************************************/
 
-#include <qpainter.h>
 
 #include "ocheckitem.h"
 
 /**
  * Constructs an CheckItem with a QTable as parent
  * and a sort key for.
  * The sort key will be used by QTable to sort the table later
  * @param t The parent QTable where the check item belongs
  * @param key A sort key
  */
 OCheckItem::OCheckItem( QTable *t, const QString &key )
     : QTableItem( t, Never, "" ), m_checked( FALSE ), m_sortKey( key )
diff --git a/libopie/ocolorbutton.cpp b/libopie/ocolorbutton.cpp
index 113a77a..93fe5d0 100644
--- a/libopie/ocolorbutton.cpp
+++ b/libopie/ocolorbutton.cpp
@@ -19,27 +19,24 @@
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <opie/colorpopupmenu.h>
 #include <opie/ocolorbutton.h>
-#include <qcolor.h>
-#include <qpixmap.h>
-#include <qimage.h>
 
 #include <qpe/resource.h>
 
 struct OColorButtonPrivate {
     QPopupMenu *m_menu;
     QColor m_color;
 };
 
 
 /**
  * This concstructs a Color Button with @param color as the start color
  * It'll use a OColorPopupMenu internally
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index c5342e1..c0b6efa 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -19,25 +19,24 @@
 
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <signal.h>
 #include <sys/time.h>
 #ifndef QT_NO_SOUND
 #include <linux/soundcard.h>
 #endif
 #include <math.h>
 
-#include <qapplication.h>
 
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qpe/sound.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include "odevice.h"
 
 #include <qwindowsystem_qws.h>
 
diff --git a/libopie/odevicebutton.cpp b/libopie/odevicebutton.cpp
index 314eb51..647ac4b 100644
--- a/libopie/odevicebutton.cpp
+++ b/libopie/odevicebutton.cpp
@@ -9,26 +9,24 @@
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
-#include <qpixmap.h>
-#include <qstring.h>
 
 #include <qpe/qcopenvelope_qws.h>
 #include <opie/odevicebutton.h>
 
 using namespace Opie;
 
 
 class OQCopMessageData {
 public:
 	QCString m_channel;
 	QCString m_message;
 	QByteArray m_data;
diff --git a/libopie/ofiledialog.cc b/libopie/ofiledialog.cc
index 5511b24..47306b6 100644
--- a/libopie/ofiledialog.cc
+++ b/libopie/ofiledialog.cc
@@ -17,31 +17,28 @@
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
-#include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 
 #include <qfileinfo.h>
-#include <qstring.h>
-#include <qapplication.h>
 #include <qlayout.h>
 
 
 #include "ofiledialog.h"
 
 
 namespace {
     /*
      * helper functions to load the start dir
      * and to save it
      * helper to extract the dir out of a file name
      */
diff --git a/libopie/ofileselector.cpp b/libopie/ofileselector.cpp
index 9ac2981..1ba94ae 100644
--- a/libopie/ofileselector.cpp
+++ b/libopie/ofileselector.cpp
@@ -1,24 +1,19 @@
 #include <qcombobox.h>
 #include <qdir.h>
-#include <qhbox.h>
-#include <qheader.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
-#include <qlistview.h>
 #include <qpopupmenu.h>
 #include <qwidgetstack.h>
-#include <qregexp.h>
-#include <qobjectlist.h>
 
 /* hacky but we need to get FileSelector::filter */
 #define private public
 #include <qpe/fileselector.h>
 #undef private
 
 #include <qpe/qpeapplication.h>
 #include <qpe/mimetype.h>
 #include <qpe/resource.h>
 #include <qpe/storage.h>
 
 #include "ofileselector_p.h"
diff --git a/libopie/ofontselector.cpp b/libopie/ofontselector.cpp
index c8471cc..7e07008 100644
--- a/libopie/ofontselector.cpp
+++ b/libopie/ofontselector.cpp
@@ -21,25 +21,24 @@
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <qlayout.h>
 #include <qlistbox.h>
 #include <qcombobox.h>
 #include <qlabel.h>
-#include <qfont.h>
 #include <qmultilineedit.h>
 
 #include <qpe/fontdatabase.h>
 
 #include "ofontselector.h"
 
 class OFontSelectorPrivate {
 public:
 	QListBox *      m_font_family_list;
 	QComboBox *     m_font_style_list;
 	QComboBox *     m_font_size_list;
 	QMultiLineEdit *m_preview;
diff --git a/libopie/oprocctrl.cpp b/libopie/oprocctrl.cpp
index e7db622..df8da1e 100644
--- a/libopie/oprocctrl.cpp
+++ b/libopie/oprocctrl.cpp
@@ -30,25 +30,24 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
 
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <assert.h>
 
 #include <qsocketnotifier.h>
-#include "oprocess.h"
 #include "oprocctrl.h"
 
 OProcessController *OProcessController::theOProcessController = 0;
 
 struct sigaction OProcessController::oldChildHandlerData;
 bool OProcessController::handlerSet = false;
 
 OProcessController::OProcessController()
 {
   assert( theOProcessController == 0 );
 
   if (0 > pipe(fd))
diff --git a/libopie/oprocess.cpp b/libopie/oprocess.cpp
index 5db2b6c..c19881a 100644
--- a/libopie/oprocess.cpp
+++ b/libopie/oprocess.cpp
@@ -44,25 +44,24 @@
 //   <zekce> Harlekin: oprocess and say it was ported to Qt by the Opie developers an Qt 2
 
 
 
 #include "oprocess.h"
 #define _MAY_INCLUDE_KPROCESSCONTROLLER_
 #include "oprocctrl.h"
 
 //#include <config.h>
 
 #include <qfile.h>
 #include <qsocketnotifier.h>
-#include <qregexp.h>
 
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/libopie/orecurrancewidget.cpp b/libopie/orecurrancewidget.cpp
index be8ec30..d81851e 100644
--- a/libopie/orecurrancewidget.cpp
+++ b/libopie/orecurrancewidget.cpp
@@ -1,18 +1,16 @@
 #include <qapplication.h>
 #include <qlabel.h>
-#include <qpopupmenu.h>
 #include <qspinbox.h>
 
-#include <qpe/timestring.h>
 
 #include "orecurrancewidget.h"
 
 // Global Templates for use in setting up the repeat label...
 // the problem is these strings get initialized before QPEApplication can install the translator -zecke
 namespace {
 QString strDayTemplate;
 QString strYearTemplate;
 QString strMonthDateTemplate;
 QString strMonthDayTemplate;
 QString strWeekTemplate;
 QString dayLabel[7];
diff --git a/libopie/oticker.cpp b/libopie/oticker.cpp
index 4fb5945..c05c2a8 100644
--- a/libopie/oticker.cpp
+++ b/libopie/oticker.cpp
@@ -19,35 +19,26 @@
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
-#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
 #include <qpe/config.h>
 
-#include <qwidget.h>
-#include <qpixmap.h>
-#include <qbutton.h>
-#include <qpainter.h>
-#include <qframe.h>
-#include <qlayout.h>
-#include <qdir.h>
 #include <stdlib.h>
 #include <stdio.h>
 
 #include "oticker.h"
 
 OTicker::OTicker( QWidget* parent )
         : QLabel( parent ) {
   //        : QFrame( parent ) {
     setTextFormat(Qt::RichText);
     Config cfg("qpe");
     cfg.setGroup("Appearance");
     backgroundcolor = QColor( cfg.readEntry( "Background", "#E5E1D5" ) );
diff --git a/libopie/otimepicker.cpp b/libopie/otimepicker.cpp
index 115d39b..1eca7c5 100644
--- a/libopie/otimepicker.cpp
+++ b/libopie/otimepicker.cpp
@@ -1,18 +1,15 @@
 #include "otimepicker.h"
 
-#include <qbuttongroup.h>
-#include <qtoolbutton.h>
 #include <qlayout.h>
-#include <qstring.h>
 #include <stdio.h>
 #include <qlineedit.h>
 
 
 /**
  * Constructs the widget
  * @param parent The parent of the OTimePicker
  * @param name The name of the object
  * @param fl Window Flags
  */
 OTimePicker::OTimePicker(QWidget* parent, const char* name,
 		       WFlags fl) :
diff --git a/libopie/owait.cpp b/libopie/owait.cpp
index 0fdf08d..a0f3834 100644
--- a/libopie/owait.cpp
+++ b/libopie/owait.cpp
@@ -8,27 +8,25 @@
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
-#include <qlabel.h>
 #include <qlayout.h>
-#include <qtimer.h>
 #include <qpe/qpeapplication.h>
 #include <qpainter.h>
 
 #include "owait.h"
 
 #include <qpe/resource.h>
 
 static int frame = 0;
 
 /**
  * This will construct a modal dialog.
  *
diff --git a/libopie/pim/ocontactaccessbackend_xml.cpp b/libopie/pim/ocontactaccessbackend_xml.cpp
index aae7fca..2373ad6 100644
--- a/libopie/pim/ocontactaccessbackend_xml.cpp
+++ b/libopie/pim/ocontactaccessbackend_xml.cpp
@@ -6,24 +6,27 @@
  * =====================================================================
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Library General Public
  *      License as published by the Free Software Foundation; either
  *      version 2 of the License, or (at your option) any later version.
  * =====================================================================
  *
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.10  2004/03/01 15:44:36  chicken
+ * fix includes
+ *
  * Revision 1.9  2003/09/22 14:31:16  eilers
  * Added first experimental incarnation of sql-backend for addressbook.
  * Some modifications to be able to compile the todo sql-backend.
  * A lot of changes fill follow...
  *
  * Revision 1.8  2003/08/30 15:28:26  eilers
  * Removed some unimportant debug output which causes slow down..
  *
  * Revision 1.7  2003/08/01 12:30:16  eilers
  * Merging changes from BRANCH_1_0 to HEAD
  *
  * Revision 1.6  2003/07/07 16:19:47  eilers
@@ -95,31 +98,29 @@
  * Revision 1.1  2002/09/27 17:11:44  eilers
  * Added API for accessing the Contact-Database ! It is compiling, but
  * please do not expect that anything is working !
  * I will debug that stuff in the next time ..
  * Please read README_COMPILE for compiling !
  *
  *
  */
 
 #include "ocontactaccessbackend_xml.h"
 
 #include <qasciidict.h>
-#include <qdatetime.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <qarray.h>
 #include <qmap.h>
-#include <qdatetime.h>
 
 #include <qpe/global.h>
 
 #include <opie/xmltree.h>
 #include "ocontactaccessbackend.h"
 #include "ocontactaccess.h"
 
 #include <stdlib.h>
 #include <errno.h>
 
 using namespace Opie;
 
diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp
index 189bf94..b2c76f8 100644
--- a/libopie/pim/otodo.cpp
+++ b/libopie/pim/otodo.cpp
@@ -1,24 +1,23 @@
 
 #include <qobject.h>
 #include <qshared.h>
 
 
 
 #include <qpe/palmtopuidgen.h>
-#include <qpe/stringutil.h>
 #include <qpe/palmtoprecord.h>
-#include <qpe/stringutil.h>
 #include <qpe/categories.h>
 #include <qpe/categoryselect.h>
+#include <qpe/stringutil.h>
 
 
 #include "opimstate.h"
 #include "orecur.h"
 #include "opimmaintainer.h"
 #include "opimnotifymanager.h"
 #include "opimresolver.h"
 
 #include "otodo.h"
 
 
 struct OTodo::OTodoData : public QShared {