CLEANUP: Don't include header files via relative paths

Note: Remember to rm stamp-headers

4 files changed, 8 insertions, 6 deletions

diff --git a/Rules.make b/Rules.make
index f0e463b..7fa0178 100644
--- a/Rules.make
+++ b/Rules.make
@@ -128,96 +128,98 @@ $(TOPDIR)/.depends.cfgs:
 
 $(QTDIR)/stamp-headers :
 	@-rm -f $(QTDIR)/stamp-headers*
 	( cd $(QTDIR)/include; \
 		$(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \
 		qcopchannel_qws.h qwindowsystem_qws.h \
 		qfontmanager_qws.h qwsdefaultdecoration_qws.h))
 	touch $@
 
 $(QTDIR)/stamp-headers-x11 :
 	@-rm -f $(QTDIR)/stamp-headers*
 	cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h)
 	touch $@
 
 $(OPIEDIR)/stamp-headers :
 	@-rm -f $(OPIEDIR)/stamp-headers*
 	mkdir -p $(TOPDIR)/include/qpe \
 		$(TOPDIR)/include/qtopia \
 		$(TOPDIR)/include/opie \
 		$(TOPDIR)/include/opie2 \
 		$(TOPDIR)/include/qtopia/private \
 		$(TOPDIR)/include/sl
 	( cd include/qpe &&  rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
 	( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
 	( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
 ifeq ($(CONFIG_LIBOPIE),y)
 	# libopie1
 	( cd include/opie &&  rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
 	( cd include/opie &&  ln -sf ../../libopie/pim/*.h .; )
 	( cd include/opie &&  ln -sf ../../libopie/big-screen/*.h .; )
 endif
 	# libopie2
 	( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; )
 	( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; )
 	( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; )
 	( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
 	( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; )
 	( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
 	( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; )
 	( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/backends/*.h .; )
 	( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; )
 	( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
 	( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; )
 	( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; )
 	# auxilliary libraries
 	( cd include/opie2 && ln -sf ../../libqtaux/*.h .; )
 	( cd include/sl && ln -sf ../../libslcompat/*.h .; )
 	( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; )
+	( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; )
+	( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; )
 	# all
 ifeq ($(CONFIG_LIBOPIE),y)
 	( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
 	ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
 endif
 	( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
 	ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done )
 	( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
 	ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done )
 	ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
 	touch $@
 
 $(OPIEDIR)/stamp-headers-x11 :
 	@-rm -f $(OPIEDIR)/stamp-headers*
 	mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
 		$(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
 	( cd include/qpe &&  rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
 	( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
 	( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
 	( cd include/opie &&  rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
 	( cd include/opie &&  ln -sf ../../libsql/*.h .; )
 	( cd include/opie &&  ln -sf ../../libopie/pim/*.h .; )
 	( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
 	ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
 	ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
 	( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; )
 	touch $@
 
 $(TOPDIR)/library/custom.h : $(TOPDIR)/.config
 	@-rm -f $@
 	@$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\
 		ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@)
 	@touch $@
 
 $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/qmake/qmake:
 	@$(call descend,$(shell dirname $@),$(shell basename $@))
 
 menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in
 	$(TOPDIR)/scripts/kconfig/mconf ./config.in
 	@touch ./.config.stamp
 
 xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
 	$(TOPDIR)/scripts/kconfig/qconf ./config.in
 	@touch .config.stamp
 
 gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
 	$(TOPDIR)/scripts/kconfig/gconf ./config.in
 	@touch .config.stamp
diff --git a/inputmethods/dvorak/dvorak.h b/inputmethods/dvorak/dvorak.h
index 216b5e5..758e181 100644
--- a/inputmethods/dvorak/dvorak.h
+++ b/inputmethods/dvorak/dvorak.h
@@ -1,70 +1,70 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU 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.
 **
 ** 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 <qframe.h>
-#include "../pickboard/pickboardcfg.h"
-#include "../pickboard/pickboardpicks.h"
+#include <pickboardcfg.h>
+#include <pickboardpicks.h>
 
 class QTimer;
 
 namespace Dvorak
 {
 
 class KeyboardConfig : public DictFilterConfig
 {
 public:
     KeyboardConfig(PickboardPicks* p) : DictFilterConfig(p), backspaces(0) { nrows = 1; }
     virtual void generateText(const QString &s);
     void decBackspaces() { if (backspaces) backspaces--; }
     void incBackspaces() { backspaces++; }
     void resetBackspaces() { backspaces = 0; }
 private:
     int backspaces;
 };
 
 
 class KeyboardPicks : public PickboardPicks
 {
     Q_OBJECT
 public:
     KeyboardPicks(QWidget* parent=0, const char* name=0, WFlags f=0)
 	: PickboardPicks(parent, name, f) { }
     void initialise();
     virtual QSize sizeHint() const;
     KeyboardConfig *dc;
 };
 
 class Keyboard : public QFrame
 {
     Q_OBJECT
 public:
     Keyboard( QWidget* parent=0, const char* name=0, WFlags f=0 );
 
     void resetState();
 
     void mousePressEvent(QMouseEvent*);
     void mouseReleaseEvent(QMouseEvent*);
     void resizeEvent(QResizeEvent*);
     void paintEvent(QPaintEvent* e);
     void timerEvent(QTimerEvent* e);
     void drawKeyboard( QPainter &p, int key = -1 );
 
     void setMode(int mode) { useOptiKeys = mode; }
 
     QSize sizeHint() const;
diff --git a/inputmethods/keyboard/keyboard.h b/inputmethods/keyboard/keyboard.h
index cc7f3f5..82588f0 100644
--- a/inputmethods/keyboard/keyboard.h
+++ b/inputmethods/keyboard/keyboard.h
@@ -1,70 +1,70 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU 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.
 **
 ** 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 <qframe.h>
-#include "../pickboard/pickboardcfg.h"
-#include "../pickboard/pickboardpicks.h"
+#include <pickboardcfg.h>
+#include <pickboardpicks.h>
 
 class QTimer;
 
 namespace KeyboardInput
 {
 
 class KeyboardConfig : public DictFilterConfig
 {
 public:
     KeyboardConfig(PickboardPicks* p) : DictFilterConfig(p), backspaces(0) { nrows = 1; }
     virtual void generateText(const QString &s);
     void decBackspaces() { if (backspaces) backspaces--; }
     void incBackspaces() { backspaces++; }
     void resetBackspaces() { backspaces = 0; }
 private:
     int backspaces;
 };
 
 
 class KeyboardPicks : public PickboardPicks
 {
     Q_OBJECT
 public:
     KeyboardPicks(QWidget* parent=0, const char* name=0, WFlags f=0)
 	: PickboardPicks(parent, name, f) { }
     void initialise();
     virtual QSize sizeHint() const;
     KeyboardConfig *dc;
 };
 
 class Keyboard : public QFrame
 {
     Q_OBJECT
 public:
     Keyboard( QWidget* parent=0, const char* name=0, WFlags f=0 );
 
     void resetState();
 
     void mousePressEvent(QMouseEvent*);
     void mouseReleaseEvent(QMouseEvent*);
     void resizeEvent(QResizeEvent*);
     void paintEvent(QPaintEvent* e);
     void timerEvent(QTimerEvent* e);
     void drawKeyboard( QPainter &p, int key = -1 );
 
     void setMode(int mode) { useOptiKeys = mode; }
 
     QSize sizeHint() const;
diff --git a/inputmethods/multikey/keyboard.h b/inputmethods/multikey/keyboard.h
index 0b56988..77bf718 100644
--- a/inputmethods/multikey/keyboard.h
+++ b/inputmethods/multikey/keyboard.h
@@ -1,71 +1,71 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU 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.
 **
 ** 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 <qframe.h>
 #include <qmap.h>
-#include "../pickboard/pickboardcfg.h"
-#include "../pickboard/pickboardpicks.h"
+#include <pickboardcfg.h>
+#include <pickboardpicks.h>
 #include "configdlg.h"
 
 class QTimer;
 
 namespace MultiKey
 {
 
 class KeyboardConfig : public DictFilterConfig
 {
 public:
     KeyboardConfig(PickboardPicks* p) : DictFilterConfig(p), backspaces(0) { nrows = 1; }
     virtual void generateText(const QString &s);
     void decBackspaces() { if (backspaces) backspaces--; }
     void incBackspaces() { backspaces++; }
     void resetBackspaces() { backspaces = 0; }
 private:
     int backspaces;
 };
 
 
 class KeyboardPicks : public PickboardPicks
 {
     Q_OBJECT
 public:
     KeyboardPicks(QWidget* parent=0, const char* name=0, WFlags f=0)
 	: PickboardPicks(parent, name, f) { }
     void initialise();
     virtual QSize sizeHint() const;
     KeyboardConfig *dc;
 };
 
 
 class Keys {
 public:
 
     Keys();
     Keys(const char * filename);
     ~Keys();
     int     width(const int row, const int col);
     int     rows();
     ushort  uni(const int row, const int col);
     int     qcode(const int row, const int col);
     bool    pressed(const int row, const int col);
     bool    *pressedPtr(const int row, const int col);
     ushort  shift(const ushort);
     ushort  meta(const ushort);
     ushort  circumflex(const ushort);
     ushort  diaeresis(const ushort);