summaryrefslogtreecommitdiff
path: root/libopie
Side-by-side diff
Diffstat (limited to 'libopie') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/libopie.pro6
-rw-r--r--libopie/otabwidget.cpp4
-rw-r--r--libopie/otabwidget.h3
-rw-r--r--libopie/otimepickerbase.h2
4 files changed, 8 insertions, 7 deletions
diff --git a/libopie/libopie.pro b/libopie/libopie.pro
index d5b4836..891c03e 100644
--- a/libopie/libopie.pro
+++ b/libopie/libopie.pro
@@ -1,10 +1,10 @@
TEMPLATE = lib
CONFIG += qte warn_on release
-HEADERS = ofontmenu.h ofileselector.h ofiledialog.h ofileview.h tododb.h todoevent.h todoresource.h todovcalresource.h xmltree.h colordialog.h colorpopupmenu.h oclickablelabel.h oprocctrl.h oprocess.h odevice.h otimepicker.h otabwidget.h otabinfo.h
-SOURCES = ofontmenu.cc ofileselector.cc ofiledialog.cc xmltree.cc tododb.cpp todoevent.cpp todovcalresource.cpp colordialog.cpp colorpopupmenu.cpp oclickablelabel.cpp oprocctrl.cpp oprocess.cpp odevice.cpp otimepicker.cpp otabwidget.cpp
+HEADERS = ofontmenu.h ofileselector.h ofiledialog.h ofileview.h tododb.h todoevent.h todoresource.h todovcalresource.h xmltree.h colordialog.h colorpopupmenu.h oclickablelabel.h oprocctrl.h oprocess.h odevice.h otimepicker.h otabwidget.h otabbar.h otabinfo.h
+SOURCES = ofontmenu.cc ofileselector.cc ofiledialog.cc xmltree.cc tododb.cpp todoevent.cpp todovcalresource.cpp colordialog.cpp colorpopupmenu.cpp oclickablelabel.cpp oprocctrl.cpp oprocess.cpp odevice.cpp otimepicker.cpp otabwidget.cpp otabbar.cpp
TARGET = opie
INCLUDEPATH += $(OPIEDIR)/include
-DESTDIR = $(QTDIR)/lib$(PROJMAK)
+DESTDIR = $(QTDIR)/lib$(PROJMAK)
#VERSION = 1.0.0
INTERFACES = otimepickerbase.ui
diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp
index b60d472..d5b963b 100644
--- a/libopie/otabwidget.cpp
+++ b/libopie/otabwidget.cpp
@@ -33,9 +33,9 @@
#include <qpe/config.h>
#include <qpe/resource.h>
+#include <opie/otabbar.h>
#include <qcombobox.h>
-#include <qtabbar.h>
#include <qwidgetstack.h>
OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPosition p )
@@ -72,7 +72,7 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi
tabBarStack = new QWidgetStack( this, "tabbarstack" );
- tabBar = new QTabBar( tabBarStack, "tabbar" );
+ tabBar = new OTabBar( tabBarStack, "tabbar" );
tabBarStack->addWidget( tabBar, 0 );
connect( tabBar, SIGNAL( selected( int ) ), this, SLOT( slotTabBarSelected( int ) ) );
diff --git a/libopie/otabwidget.h b/libopie/otabwidget.h
index 6a0fbe8..bacda07 100644
--- a/libopie/otabwidget.h
+++ b/libopie/otabwidget.h
@@ -37,6 +37,7 @@
#include <qwidget.h>
#include <qlist.h>
+class OTabBar;
class QComboBox;
class QPixmap;
class QTabBar;
@@ -183,7 +184,7 @@ private:
TabPosition tabBarPosition;
QWidgetStack *tabBarStack;
- QTabBar *tabBar;
+ OTabBar *tabBar;
QComboBox *tabList;
QWidgetStack *widgetStack;
diff --git a/libopie/otimepickerbase.h b/libopie/otimepickerbase.h
index bac2b06..09598f9 100644
--- a/libopie/otimepickerbase.h
+++ b/libopie/otimepickerbase.h
@@ -1,7 +1,7 @@
/****************************************************************************
** Form interface generated from reading ui file 'otimepickerbase.ui'
**
-** Created: Tue Aug 20 10:04:21 2002
+** Created: Tue Sep 3 13:12:19 2002
** by: The User Interface Compiler (uic)
**
** WARNING! All changes made in this file will be lost!