remove X11 abstraction classes - they will come back later but using

the same strategy as zecke did when porting Opie to Qt/X11
author: mickeyl <mickeyl> 2003-12-03 22:43:51 (UTC)
committer: mickeyl <mickeyl> 2003-12-03 22:43:51 (UTC)
commit: ac3b69ee40e341c847a31cc72eb25d395088c432 (patch) (unidiff)
tree: 3c4b04cf92aec63f4129fe80dd28c40b609a76c5
parent: ae3310f90ad9fc7a264b8963ad0fc24b10b48730 (diff)
download: opie-ac3b69ee40e341c847a31cc72eb25d395088c432.zip
opie-ac3b69ee40e341c847a31cc72eb25d395088c432.tar.gz
opie-ac3b69ee40e341c847a31cc72eb25d395088c432.tar.bz2
5 files changed, 0 insertions, 184 deletions
diff --git a/libopie2/opieui/omenubar.cpp b/libopie2/opieui/omenubar.cpp
deleted file mode 100644
index 3279701..0000000
--- a/libopie2/opieui/omenubar.cpp
+++ b/dev/null
@@ -1,36 +0,0 @@
-/*
-                             This file is part of the Opie Project
-                             Copyright (C) 2003 Michael Lauer <mickey@tm.informatik.uni-frankfurt.de>
-              =.
-            .=l.
-           .>+-=
- _;:,     .>    :=|.         This program is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This program 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 <opie2/omenubar.h>
-OMenuBar::OMenuBar(QWidget* parent, const char* name)
-:OpieMenuBar(parent, name)
-{
-}
diff --git a/libopie2/opieui/omenubar.h b/libopie2/opieui/omenubar.h
deleted file mode 100644
index 234885f..0000000
--- a/libopie2/opieui/omenubar.h
+++ b/dev/null
@@ -1,49 +0,0 @@
-/*
-                             This file is part of the Opie Project
-                             Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
-              =.
-            .=l.
-           .>+-=
- _;:,     .>    :=|.         This program is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This program 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.
-*/
-#ifndef OMENUBAR_H
-#define OMENUBAR_H
-#include "opiemenubar.h"
-class OMenuBar : public OpieMenuBar
-{
-  Q_OBJECT
-  public:
-  OMenuBar(QWidget* parent = 0, const char* name = 0 );
-};
-#endif // OAPPLICATION_H
diff --git a/libopie2/opieui/opiemenubar.cpp b/libopie2/opieui/opiemenubar.cpp
deleted file mode 100644
index 98715d7..0000000
--- a/libopie2/opieui/opiemenubar.cpp
+++ b/dev/null
@@ -1,43 +0,0 @@
-/*
-                             This file is part of the Opie Project
-                             Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
-              =.
-            .=l.
-           .>+-=
- _;:,     .>    :=|.         This program is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This program 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 "opiemenubar.h"
-OpieMenuBar::OpieMenuBar(QWidget* parent, const char* name )
-#ifdef QWS
-    : QPEMenuBar(parent,name)
-#else
-    : QMenuBar(parent,name)
-#endif
-{
-}
diff --git a/libopie2/opieui/opiemenubar.h b/libopie2/opieui/opiemenubar.h
deleted file mode 100644
index ccd72cc..0000000
--- a/libopie2/opieui/opiemenubar.h
+++ b/dev/null
@@ -1,52 +0,0 @@
-/*
-                             This file is part of the Opie Project
-                             Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
-              =.
-            .=l.
-           .>+-=
- _;:,     .>    :=|.         This program is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This program 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.
-*/
-#ifndef OPIE_MENUBAR_H
-#define OPIE_MENUBAR_H
-#ifdef QWS
-#include <qpe/qpemenubar.h>
-#else
-#include <qmenubar.h>
-#endif
-class OpieMenuBar
-#ifdef QWS
-: public QPEMenuBar
-#else
-: public QMenuBar
-#endif
-{
- public:
-    OpieMenuBar(QWidget* parent = 0, const char* name = 0);
-};
-#endif
diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro
index cfb591c..b455602 100644
--- a/libopie2/opieui/opieui.pro
+++ b/libopie2/opieui/opieui.pro
@@ -1,53 +1,49 @@
 TEMPLATE    = lib
 CONFIG      += qt warn_on debug
 DESTDIR     = $(OPIEDIR)/lib
 HEADERS     = olistview.h            \
              oimageeffect.h         \
              opixmapeffect.h        \
              opopupmenu.h           \
              opixmapprovider.h      \
              oselector.h            \
              oversatileview.h       \
              oversatileviewitem.h   \
              odialog.h              \
-              omenubar.h             \
-              opiemenubar.h          \
              omessagebox.h          \
              oresource.h            \
              oseparator.h           
 SOURCES     = olistview.cpp          \
              oimageeffect.cpp       \
              opixmapeffect.cpp      \
              opopupmenu.cpp         \
              opixmapprovider.cpp    \
              oselector.cpp          \
              oversatileview.cpp     \
              oversatileviewitem.cpp \
              odialog.cpp            \
-              omenubar.cpp           \
-              opiemenubar.cpp        \
              oresource.cpp          \
              oseparator.cpp         
 INTERFACES  =
 TARGET      = opieui2
 VERSION     = 1.8.2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lopiecore2
 MOC_DIR     = moc
 OBJECTS_DIR = obj
 !contains( platform, x11 ) {
  include ( $(OPIEDIR)/include.pro )
  HEADERS     += otaskbarapplet.h
  SOURCES     += otaskbarapplet.cpp
 }
 contains( platform, x11 ) {
  LIBS        += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 
  message( Warning: NO otaskbarapplet ATM )
 }
author	mickeyl <mickeyl>	2003-12-03 22:43:51 (UTC)
committer	mickeyl <mickeyl>	2003-12-03 22:43:51 (UTC)
commit	ac3b69ee40e341c847a31cc72eb25d395088c432 (patch) (unidiff)
tree	3c4b04cf92aec63f4129fe80dd28c40b609a76c5
parent	ae3310f90ad9fc7a264b8963ad0fc24b10b48730 (diff)
download	opie-ac3b69ee40e341c847a31cc72eb25d395088c432.zip opie-ac3b69ee40e341c847a31cc72eb25d395088c432.tar.gz opie-ac3b69ee40e341c847a31cc72eb25d395088c432.tar.bz2

diff --git a/libopie2/opieui/omenubar.cpp b/libopie2/opieui/omenubar.cpp deleted file mode 100644 index 3279701..0000000 --- a/libopie2/opieui/omenubar.cpp +++ b/dev/null
@@ -1,36 +0,0 @@
1	/*
2	This file is part of the Opie Project
3
4	Copyright (C) 2003 Michael Lauer <mickey@tm.informatik.uni-frankfurt.de>
5	=.
6	.=l.
7	.>+-=
8	_;:, .> :=\|. This program is free software; you can
9	.> <`_, > . <= redistribute it and/or modify it under
10	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
11	.="- .-=="i, .._ License as published by the Free Software
12	- . .-<_> .<> Foundation; either version 2 of the License,
13	._= =} : or (at your option) any later version.
14	.%`+i> _;_.
15	.i_,=:_. -<s. This program is distributed in the hope that
16	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
17	: .. .:, . . . without even the implied warranty of
18	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
19	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
20	..}^=.= = ; Library General Public License for more
21	++= -. .` .: details.
22	: = ...= . :.=-
23	-. .:....=;==+<; You should have received a copy of the GNU
24	-_. . . )=. = Library General Public License along with
25	-- :-=` this library; see the file COPYING.LIB.
26	If not, write to the Free Software Foundation,
27	Inc., 59 Temple Place - Suite 330,
28	Boston, MA 02111-1307, USA.
29	*/
30
31	#include <opie2/omenubar.h>
32
33	OMenuBar::OMenuBar(QWidget* parent, const char* name)
34	:OpieMenuBar(parent, name)
35	{
36	}


diff --git a/libopie2/opieui/omenubar.h b/libopie2/opieui/omenubar.h deleted file mode 100644 index 234885f..0000000 --- a/libopie2/opieui/omenubar.h +++ b/dev/null
@@ -1,49 +0,0 @@
1	/*
2	This file is part of the Opie Project
3
4	Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
5	=.
6	.=l.
7	.>+-=
8	_;:, .> :=\|. This program is free software; you can
9	.> <`_, > . <= redistribute it and/or modify it under
10	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
11	.="- .-=="i, .._ License as published by the Free Software
12	- . .-<_> .<> Foundation; either version 2 of the License,
13	._= =} : or (at your option) any later version.
14	.%`+i> _;_.
15	.i_,=:_. -<s. This program is distributed in the hope that
16	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
17	: .. .:, . . . without even the implied warranty of
18	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
19	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
20	..}^=.= = ; Library General Public License for more
21	++= -. .` .: details.
22	: = ...= . :.=-
23	-. .:....=;==+<; You should have received a copy of the GNU
24	-_. . . )=. = Library General Public License along with
25	-- :-=` this library; see the file COPYING.LIB.
26	If not, write to the Free Software Foundation,
27	Inc., 59 Temple Place - Suite 330,
28	Boston, MA 02111-1307, USA.
29	*/
30
31	#ifndef OMENUBAR_H
32	#define OMENUBAR_H
33
34
35
36
37	#include "opiemenubar.h"
38
39
40
41	class OMenuBar : public OpieMenuBar
42	{
43	Q_OBJECT
44
45	public:
46	OMenuBar(QWidget* parent = 0, const char* name = 0 );
47	};
48
49	#endif // OAPPLICATION_H


diff --git a/libopie2/opieui/opiemenubar.cpp b/libopie2/opieui/opiemenubar.cpp deleted file mode 100644 index 98715d7..0000000 --- a/libopie2/opieui/opiemenubar.cpp +++ b/dev/null
@@ -1,43 +0,0 @@
1	/*
2	This file is part of the Opie Project
3
4	Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
5	=.
6	.=l.
7	.>+-=
8	_;:, .> :=\|. This program is free software; you can
9	.> <`_, > . <= redistribute it and/or modify it under
10	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
11	.="- .-=="i, .._ License as published by the Free Software
12	- . .-<_> .<> Foundation; either version 2 of the License,
13	._= =} : or (at your option) any later version.
14	.%`+i> _;_.
15	.i_,=:_. -<s. This program is distributed in the hope that
16	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
17	: .. .:, . . . without even the implied warranty of
18	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
19	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
20	..}^=.= = ; Library General Public License for more
21	++= -. .` .: details.
22	: = ...= . :.=-
23	-. .:....=;==+<; You should have received a copy of the GNU
24	-_. . . )=. = Library General Public License along with
25	-- :-=` this library; see the file COPYING.LIB.
26	If not, write to the Free Software Foundation,
27	Inc., 59 Temple Place - Suite 330,
28	Boston, MA 02111-1307, USA.
29	*/
30
31
32	#include "opiemenubar.h"
33
34	OpieMenuBar::OpieMenuBar(QWidget* parent, const char* name )
35	#ifdef QWS
36	: QPEMenuBar(parent,name)
37	#else
38	: QMenuBar(parent,name)
39	#endif
40	{
41	}
42
43


diff --git a/libopie2/opieui/opiemenubar.h b/libopie2/opieui/opiemenubar.h deleted file mode 100644 index ccd72cc..0000000 --- a/libopie2/opieui/opiemenubar.h +++ b/dev/null
@@ -1,52 +0,0 @@
1	/*
2	This file is part of the Opie Project
3
4	Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
5	=.
6	.=l.
7	.>+-=
8	_;:, .> :=\|. This program is free software; you can
9	.> <`_, > . <= redistribute it and/or modify it under
10	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
11	.="- .-=="i, .._ License as published by the Free Software
12	- . .-<_> .<> Foundation; either version 2 of the License,
13	._= =} : or (at your option) any later version.
14	.%`+i> _;_.
15	.i_,=:_. -<s. This program is distributed in the hope that
16	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
17	: .. .:, . . . without even the implied warranty of
18	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
19	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
20	..}^=.= = ; Library General Public License for more
21	++= -. .` .: details.
22	: = ...= . :.=-
23	-. .:....=;==+<; You should have received a copy of the GNU
24	-_. . . )=. = Library General Public License along with
25	-- :-=` this library; see the file COPYING.LIB.
26	If not, write to the Free Software Foundation,
27	Inc., 59 Temple Place - Suite 330,
28	Boston, MA 02111-1307, USA.
29	*/
30
31	#ifndef OPIE_MENUBAR_H
32	#define OPIE_MENUBAR_H
33
34	#ifdef QWS
35	#include <qpe/qpemenubar.h>
36	#else
37	#include <qmenubar.h>
38	#endif
39
40	class OpieMenuBar
41	#ifdef QWS
42	: public QPEMenuBar
43	#else
44	: public QMenuBar
45	#endif
46	{
47	public:
48	OpieMenuBar(QWidget* parent = 0, const char* name = 0);
49	};
50	#endif
51
52


diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro index cfb591c..b455602 100644 --- a/libopie2/opieui/opieui.pro +++ b/libopie2/opieui/opieui.pro
@@ -1,53 +1,49 @@
1	TEMPLATE = lib	1	TEMPLATE = lib
2	CONFIG += qt warn_on debug	2	CONFIG += qt warn_on debug
3	DESTDIR = $(OPIEDIR)/lib	3	DESTDIR = $(OPIEDIR)/lib
4	HEADERS = olistview.h \	4	HEADERS = olistview.h \
5	oimageeffect.h \	5	oimageeffect.h \
6	opixmapeffect.h \	6	opixmapeffect.h \
7	opopupmenu.h \	7	opopupmenu.h \
8	opixmapprovider.h \	8	opixmapprovider.h \
9	oselector.h \	9	oselector.h \
10	oversatileview.h \	10	oversatileview.h \
11	oversatileviewitem.h \	11	oversatileviewitem.h \
12	odialog.h \	12	odialog.h \
13	omenubar.h \
14	opiemenubar.h \
15	omessagebox.h \	13	omessagebox.h \
16	oresource.h \	14	oresource.h \
17	oseparator.h	15	oseparator.h
18		16
19	SOURCES = olistview.cpp \	17	SOURCES = olistview.cpp \
20	oimageeffect.cpp \	18	oimageeffect.cpp \
21	opixmapeffect.cpp \	19	opixmapeffect.cpp \
22	opopupmenu.cpp \	20	opopupmenu.cpp \
23	opixmapprovider.cpp \	21	opixmapprovider.cpp \
24	oselector.cpp \	22	oselector.cpp \
25	oversatileview.cpp \	23	oversatileview.cpp \
26	oversatileviewitem.cpp \	24	oversatileviewitem.cpp \
27	odialog.cpp \	25	odialog.cpp \
28	omenubar.cpp \
29	opiemenubar.cpp \
30	oresource.cpp \	26	oresource.cpp \
31	oseparator.cpp	27	oseparator.cpp
32		28
33	INTERFACES =	29	INTERFACES =
34	TARGET = opieui2	30	TARGET = opieui2
35	VERSION = 1.8.2	31	VERSION = 1.8.2
36	INCLUDEPATH += $(OPIEDIR)/include	32	INCLUDEPATH += $(OPIEDIR)/include
37	DEPENDPATH += $(OPIEDIR)/include	33	DEPENDPATH += $(OPIEDIR)/include
38	LIBS += -lopiecore2	34	LIBS += -lopiecore2
39	MOC_DIR = moc	35	MOC_DIR = moc
40	OBJECTS_DIR = obj	36	OBJECTS_DIR = obj
41		37
42		38
43	!contains( platform, x11 ) {	39	!contains( platform, x11 ) {
44	include ( $(OPIEDIR)/include.pro )	40	include ( $(OPIEDIR)/include.pro )
45	HEADERS += otaskbarapplet.h	41	HEADERS += otaskbarapplet.h
46	SOURCES += otaskbarapplet.cpp	42	SOURCES += otaskbarapplet.cpp
47	}	43	}
48		44
49	contains( platform, x11 ) {	45	contains( platform, x11 ) {
50	LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib	46	LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
51	message( Warning: NO otaskbarapplet ATM )	47	message( Warning: NO otaskbarapplet ATM )
52	}	48	}
53		49