summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-12-03 22:41:08 (UTC)
committer mickeyl <mickeyl>2003-12-03 22:41:08 (UTC)
commitae3310f90ad9fc7a264b8963ad0fc24b10b48730 (patch) (unidiff)
tree94387dd18b1840fdfa4441e3edd0029095e6fee5
parent4774505eb004fa6a1f903224c912c2ece9e449f9 (diff)
downloadopie-ae3310f90ad9fc7a264b8963ad0fc24b10b48730.zip
opie-ae3310f90ad9fc7a264b8963ad0fc24b10b48730.tar.gz
opie-ae3310f90ad9fc7a264b8963ad0fc24b10b48730.tar.bz2
remove OToolbar - QPEToolBar is deprecated anyway
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/opieui.pro2
-rw-r--r--libopie2/opieui/otoolbar.cpp41
-rw-r--r--libopie2/opieui/otoolbar.h55
3 files changed, 0 insertions, 98 deletions
diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro
index 6f197a4..cfb591c 100644
--- a/libopie2/opieui/opieui.pro
+++ b/libopie2/opieui/opieui.pro
@@ -1,55 +1,53 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on debug 2CONFIG += qt warn_on debug
3DESTDIR = $(OPIEDIR)/lib 3DESTDIR = $(OPIEDIR)/lib
4HEADERS = olistview.h \ 4HEADERS = 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 \ 13 omenubar.h \
14 opiemenubar.h \ 14 opiemenubar.h \
15 omessagebox.h \ 15 omessagebox.h \
16 oresource.h \ 16 oresource.h \
17 otoolbar.h \
18 oseparator.h 17 oseparator.h
19 18
20SOURCES = olistview.cpp \ 19SOURCES = olistview.cpp \
21 oimageeffect.cpp \ 20 oimageeffect.cpp \
22 opixmapeffect.cpp \ 21 opixmapeffect.cpp \
23 opopupmenu.cpp \ 22 opopupmenu.cpp \
24 opixmapprovider.cpp \ 23 opixmapprovider.cpp \
25 oselector.cpp \ 24 oselector.cpp \
26 oversatileview.cpp \ 25 oversatileview.cpp \
27 oversatileviewitem.cpp \ 26 oversatileviewitem.cpp \
28 odialog.cpp \ 27 odialog.cpp \
29 omenubar.cpp \ 28 omenubar.cpp \
30 opiemenubar.cpp \ 29 opiemenubar.cpp \
31 oresource.cpp \ 30 oresource.cpp \
32 otoolbar.cpp \
33 oseparator.cpp 31 oseparator.cpp
34 32
35INTERFACES = 33INTERFACES =
36TARGET = opieui2 34TARGET = opieui2
37VERSION = 1.8.2 35VERSION = 1.8.2
38INCLUDEPATH += $(OPIEDIR)/include 36INCLUDEPATH += $(OPIEDIR)/include
39DEPENDPATH += $(OPIEDIR)/include 37DEPENDPATH += $(OPIEDIR)/include
40LIBS += -lopiecore2 38LIBS += -lopiecore2
41MOC_DIR = moc 39MOC_DIR = moc
42OBJECTS_DIR = obj 40OBJECTS_DIR = obj
43 41
44 42
45!contains( platform, x11 ) { 43!contains( platform, x11 ) {
46 include ( $(OPIEDIR)/include.pro ) 44 include ( $(OPIEDIR)/include.pro )
47 HEADERS += otaskbarapplet.h 45 HEADERS += otaskbarapplet.h
48 SOURCES += otaskbarapplet.cpp 46 SOURCES += otaskbarapplet.cpp
49} 47}
50 48
51contains( platform, x11 ) { 49contains( platform, x11 ) {
52 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 50 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
53 message( Warning: NO otaskbarapplet ATM ) 51 message( Warning: NO otaskbarapplet ATM )
54} 52}
55 53
diff --git a/libopie2/opieui/otoolbar.cpp b/libopie2/opieui/otoolbar.cpp
deleted file mode 100644
index c7f2727..0000000
--- a/libopie2/opieui/otoolbar.cpp
+++ b/dev/null
@@ -1,41 +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#include "otoolbar.h"
32
33OToolBar::OToolBar( QMainWindow *parent, const char* name)
34#ifdef QWS
35 : QPEToolBar(parent, name)
36#else
37 : QToolBar(parent, name)
38#endif
39{
40
41}
diff --git a/libopie2/opieui/otoolbar.h b/libopie2/opieui/otoolbar.h
deleted file mode 100644
index e16d8df..0000000
--- a/libopie2/opieui/otoolbar.h
+++ b/dev/null
@@ -1,55 +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 OTOOLBAR_H
32#define OTOOLBAR_H
33
34
35
36#ifdef QWS
37#include <qpe/qpetoolbar.h>
38#else
39#include <qtoolbar.h>
40#endif
41
42
43
44class OToolBar
45#ifdef QWS
46: public QPEToolBar
47#else
48: public QToolBar
49#endif
50{
51 public:
52 OToolBar( QMainWindow *parent=0, const char* name = 0);
53};
54
55#endif // OAPPLICATION_H