1.1 --- a/as_panel.h Fri Nov 28 14:20:00 2008 +0100 1.2 +++ b/as_panel.h Fri Dec 05 23:14:02 2008 +0100 1.3 @@ -1,12 +1,12 @@ 1.4 // 1.5 // OSSP asgui - Accounting system graphical user interface 1.6 -// Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/) 1.7 -// Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com> 1.8 -// Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com> 1.9 -// Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH 1.10 +// Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/) 1.11 +// Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com> 1.12 +// Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com> 1.13 +// Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH 1.14 // 1.15 // This file is part of OSSP asgui, an accounting system graphical user 1.16 -// interface which can be found at http://www.ossp.org/pkg/tool/asgui/. 1.17 +// interface which can be found at http://asgui.europalab.com/. 1.18 // 1.19 // Permission to use, copy, modify, and distribute this software for 1.20 // any purpose with or without fee is hereby granted, provided that 1.21 @@ -29,12 +29,14 @@ 1.22 // as_panel.h: ISO C++ interface 1.23 // 1.24 1.25 +#define QT3_SUPPORT 1.26 + 1.27 #ifndef PREFPANEL_H 1.28 #define PREFPANEL_H 1.29 1.30 #include <qvariant.h> 1.31 #include <qdialog.h> 1.32 -#include <qbuttongroup.h> 1.33 +#include <q3buttongroup.h> 1.34 #include <qlabel.h> 1.35 #include <qlineedit.h> 1.36 #include <qpushbutton.h> 1.37 @@ -46,10 +48,15 @@ 1.38 #include <qwidget.h> 1.39 #include <qlayout.h> 1.40 #include <qtooltip.h> 1.41 -#include <qwhatsthis.h> 1.42 +#include <q3whatsthis.h> 1.43 #include <qstylefactory.h> 1.44 #include <qlayout.h> 1.45 1.46 +//Added by qt3to4: 1.47 +#include <Q3HBoxLayout> 1.48 +#include <Q3GridLayout> 1.49 +#include <Q3VBoxLayout> 1.50 + 1.51 #include "as_gui.h" // For usage of style_t 1.52 1.53 1.54 @@ -58,7 +65,7 @@ 1.55 Q_OBJECT 1.56 1.57 public: 1.58 - Prefpanel(QWidget *pParent = 0, const char *kszName = 0, bool bModal = true, WFlags Flags = 0); 1.59 + Prefpanel(QWidget *pParent = 0, const char *kszName = 0, bool bModal = true, Qt::WFlags Flags = 0); 1.60 // ~Prefpanel(void); // No need to destroy widgets, because qt does it for us 1.61 1.62 private: 1.63 @@ -67,17 +74,17 @@ 1.64 QColorGroup *m_pOrigcolours, *m_pAltcolours; 1.65 1.66 public: 1.67 - QGroupBox *m_pGenbox, *m_pRembox, *m_pShadebox, *m_pThemebox; 1.68 - QVBoxLayout *m_pStylelay, *m_pReportlay, *m_pSwitchlay; 1.69 - QVBoxLayout *m_pVlayout, *m_pBinlayout; 1.70 - QHBoxLayout *m_pBoolayout, *m_pGenlayout, *m_pRemlayout; 1.71 - QVBoxLayout *m_pShadeboxlay, *m_pThemeboxlay; 1.72 - QHBoxLayout *m_pGenboxlay, *m_pRemboxlay, *m_pColourlayout; 1.73 - QGridLayout *m_pGeninner, *m_pReminner, *m_pShadelayout; 1.74 + Q3GroupBox *m_pGenbox, *m_pRembox, *m_pShadebox, *m_pThemebox; 1.75 + Q3VBoxLayout *m_pStylelay, *m_pReportlay, *m_pSwitchlay; 1.76 + Q3VBoxLayout *m_pVlayout, *m_pBinlayout; 1.77 + Q3HBoxLayout *m_pBoolayout, *m_pGenlayout, *m_pRemlayout; 1.78 + Q3VBoxLayout *m_pShadeboxlay, *m_pThemeboxlay; 1.79 + Q3HBoxLayout *m_pGenboxlay, *m_pRemboxlay, *m_pColourlayout; 1.80 + Q3GridLayout *m_pGeninner, *m_pReminner, *m_pShadelayout; 1.81 1.82 QWidget *m_pBoolpage, *m_pGeneralpage, *m_pRemotepage, *m_pColourpage; 1.83 1.84 - QHBoxLayout *m_pButtlay; 1.85 + Q3HBoxLayout *m_pButtlay; 1.86 QPushButton *m_pOkaybutton; 1.87 QPushButton *m_pApplybutton; 1.88 QPushButton *m_pCancelbutton; 1.89 @@ -94,7 +101,7 @@ 1.90 QLabel *m_pLightlab, *m_pDarklab, *m_pRevertlab; 1.91 QToolButton *m_pLightbutt, *m_pDarkbutt, *m_pRevertbutt; 1.92 1.93 - QButtonGroup *m_pStylegroup, *m_pReportgroup, *m_pSwitchgroup; 1.94 + Q3ButtonGroup *m_pStylegroup, *m_pReportgroup, *m_pSwitchgroup; 1.95 QCheckBox *m_pBackupcheck, *m_pExtendcheck; 1.96 QCheckBox *m_pDetailcheck, *m_pSigncheck; 1.97