diff -r e8292658d5b3 -r c1941114ca88 as_panel.h --- a/as_panel.h Fri Nov 28 14:20:00 2008 +0100 +++ b/as_panel.h Fri Dec 05 23:14:02 2008 +0100 @@ -1,12 +1,12 @@ // // OSSP asgui - Accounting system graphical user interface -// Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/) -// Copyright (c) 2002-2004 Ralf S. Engelschall -// Copyright (c) 2002-2004 Michael Schloh von Bennewitz -// Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH +// Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/) +// Copyright (c) 2002-2008 Ralf S. Engelschall +// Copyright (c) 2002-2008 Michael Schloh von Bennewitz +// Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH // // This file is part of OSSP asgui, an accounting system graphical user -// interface which can be found at http://www.ossp.org/pkg/tool/asgui/. +// interface which can be found at http://asgui.europalab.com/. // // Permission to use, copy, modify, and distribute this software for // any purpose with or without fee is hereby granted, provided that @@ -29,12 +29,14 @@ // as_panel.h: ISO C++ interface // +#define QT3_SUPPORT + #ifndef PREFPANEL_H #define PREFPANEL_H #include #include -#include +#include #include #include #include @@ -46,10 +48,15 @@ #include #include #include -#include +#include #include #include +//Added by qt3to4: +#include +#include +#include + #include "as_gui.h" // For usage of style_t @@ -58,7 +65,7 @@ Q_OBJECT public: - Prefpanel(QWidget *pParent = 0, const char *kszName = 0, bool bModal = true, WFlags Flags = 0); + Prefpanel(QWidget *pParent = 0, const char *kszName = 0, bool bModal = true, Qt::WFlags Flags = 0); // ~Prefpanel(void); // No need to destroy widgets, because qt does it for us private: @@ -67,17 +74,17 @@ QColorGroup *m_pOrigcolours, *m_pAltcolours; public: - QGroupBox *m_pGenbox, *m_pRembox, *m_pShadebox, *m_pThemebox; - QVBoxLayout *m_pStylelay, *m_pReportlay, *m_pSwitchlay; - QVBoxLayout *m_pVlayout, *m_pBinlayout; - QHBoxLayout *m_pBoolayout, *m_pGenlayout, *m_pRemlayout; - QVBoxLayout *m_pShadeboxlay, *m_pThemeboxlay; - QHBoxLayout *m_pGenboxlay, *m_pRemboxlay, *m_pColourlayout; - QGridLayout *m_pGeninner, *m_pReminner, *m_pShadelayout; + Q3GroupBox *m_pGenbox, *m_pRembox, *m_pShadebox, *m_pThemebox; + Q3VBoxLayout *m_pStylelay, *m_pReportlay, *m_pSwitchlay; + Q3VBoxLayout *m_pVlayout, *m_pBinlayout; + Q3HBoxLayout *m_pBoolayout, *m_pGenlayout, *m_pRemlayout; + Q3VBoxLayout *m_pShadeboxlay, *m_pThemeboxlay; + Q3HBoxLayout *m_pGenboxlay, *m_pRemboxlay, *m_pColourlayout; + Q3GridLayout *m_pGeninner, *m_pReminner, *m_pShadelayout; QWidget *m_pBoolpage, *m_pGeneralpage, *m_pRemotepage, *m_pColourpage; - QHBoxLayout *m_pButtlay; + Q3HBoxLayout *m_pButtlay; QPushButton *m_pOkaybutton; QPushButton *m_pApplybutton; QPushButton *m_pCancelbutton; @@ -94,7 +101,7 @@ QLabel *m_pLightlab, *m_pDarklab, *m_pRevertlab; QToolButton *m_pLightbutt, *m_pDarkbutt, *m_pRevertbutt; - QButtonGroup *m_pStylegroup, *m_pReportgroup, *m_pSwitchgroup; + Q3ButtonGroup *m_pStylegroup, *m_pReportgroup, *m_pSwitchgroup; QCheckBox *m_pBackupcheck, *m_pExtendcheck; QCheckBox *m_pDetailcheck, *m_pSigncheck;