1.1 --- a/as_reportpanel.h Fri Nov 28 14:20:00 2008 +0100 1.2 +++ b/as_reportpanel.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,6 +29,8 @@ 1.22 // as_reportpanel.h: ISO C++ interface 1.23 // 1.24 1.25 +#define QT3_SUPPORT 1.26 + 1.27 #ifndef REPORTPANEL_H 1.28 #define REPORTPANEL_H 1.29 1.30 @@ -36,17 +38,23 @@ 1.31 #include <qdialog.h> 1.32 #include <qdatetime.h> 1.33 1.34 +//Added by qt3to4: 1.35 +#include <Q3GridLayout> 1.36 +#include <Q3HBoxLayout> 1.37 +#include <Q3VBoxLayout> 1.38 +#include <Q3PopupMenu> 1.39 + 1.40 1.41 class TiTable; 1.42 class Preferences; 1.43 -class QVBoxLayout; 1.44 -class QHBoxLayout; 1.45 -class QGridLayout; 1.46 +class Q3VBoxLayout; 1.47 +class Q3HBoxLayout; 1.48 +class Q3GridLayout; 1.49 class QPushButton; 1.50 -class QTextEdit; 1.51 +class Q3TextEdit; 1.52 class QToolButton; 1.53 -class QButtonGroup; 1.54 -class QPopupMenu; 1.55 +class Q3ButtonGroup; 1.56 +class Q3PopupMenu; 1.57 class QPrinter; 1.58 1.59 namespace AS { 1.60 @@ -57,26 +65,26 @@ 1.61 1.62 public: 1.63 Reportpanel(TiTable *, Preferences *, QWidget *pParent = 0, 1.64 - const char *kszName = 0, bool bModal = true, WFlags Flags = 0); 1.65 + const char *kszName = 0, bool bModal = true, Qt::WFlags Flags = 0); 1.66 // ~Reportpanel(void); // No need to destroy widgets, because qt does it for us 1.67 1.68 public: 1.69 - QButtonGroup *m_pWeekmonthgroup; 1.70 + Q3ButtonGroup *m_pWeekmonthgroup; 1.71 QToolButton *m_pWeeklybutt; 1.72 QToolButton *m_pMonthlybutt; 1.73 - QTextEdit *m_pBrowser; 1.74 + Q3TextEdit *m_pBrowser; 1.75 QPushButton *m_pSavebutt; 1.76 QPushButton *m_pDismissbutt; 1.77 QPushButton *m_pPrintbutt; 1.78 1.79 protected: 1.80 - QVBoxLayout *m_pFormlay; 1.81 - QVBoxLayout *m_pGrouplay; 1.82 - QHBoxLayout *m_pToolay; 1.83 - QHBoxLayout *m_pPushlay; 1.84 - QHBoxLayout *m_pWeekmonthlay; 1.85 - QPopupMenu *m_pWeekpop; 1.86 - QPopupMenu *m_pMonthpop; 1.87 + Q3VBoxLayout *m_pFormlay; 1.88 + Q3VBoxLayout *m_pGrouplay; 1.89 + Q3HBoxLayout *m_pToolay; 1.90 + Q3HBoxLayout *m_pPushlay; 1.91 + Q3HBoxLayout *m_pWeekmonthlay; 1.92 + Q3PopupMenu *m_pWeekpop; 1.93 + Q3PopupMenu *m_pMonthpop; 1.94 1.95 private: 1.96 int m_nWeeks;