diff -r e8292658d5b3 -r c1941114ca88 as_gui.h --- a/as_gui.h Fri Nov 28 14:20:00 2008 +0100 +++ b/as_gui.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 @@ -32,7 +32,19 @@ #ifndef AS_GUI_MWIN_H #define AS_GUI_MWIN_H -#include +#define QT3_SUPPORT +#include + +//Added by qt3to4: +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_CONFIG_H #include "ac_config.h" @@ -46,10 +58,10 @@ #undef _AS_VERSION_CPP_AS_HEADER_ // Trolltech class prototypes -class QAction; -class QHeader; -class QTimeEdit; -class QComboBox; +class Q3Action; +class Q3Header; +class Q3TimeEdit; +class Q3ComboBox; class QLineEdit; class QLabel; class QDate; @@ -130,12 +142,12 @@ } styles_t; // Main application form window -class Titraqform : public QMainWindow +class Titraqform : public Q3MainWindow { Q_OBJECT // Generate MOC object model stubs public: - Titraqform(QWidget *pParent = 0, const char *kszName = 0, WFlags Flags = 0); + Titraqform(QWidget *pParent = 0, const char *kszName = 0, Qt::WFlags Flags = 0); ~Titraqform(void); // Accessor methods @@ -176,18 +188,18 @@ Preferences *m_pPrefs; // Main application actions - QAction *m_pFilenewact, *m_pFileopenact; - QAction *m_pFilesaveact, *m_pFilesaveasact; - QAction *m_pFilecloseact, *m_pFilequitact; - QAction *m_pAddrowact, *m_pDelrowact; - QAction *m_pRefreshact, *m_pCutact; - QAction *m_pCopyact, *m_pPasteact; - QAction *m_pSyncact, *m_pPrefsact; - QAction *m_pReportact; + Q3Action *m_pFilenewact, *m_pFileopenact; + Q3Action *m_pFilesaveact, *m_pFilesaveasact; + Q3Action *m_pFilecloseact, *m_pFilequitact; + Q3Action *m_pAddrowact, *m_pDelrowact; + Q3Action *m_pRefreshact, *m_pCutact; + Q3Action *m_pCopyact, *m_pPasteact; + Q3Action *m_pSyncact, *m_pPrefsact; + Q3Action *m_pReportact; // Table, cells, and entries in package layout TiTable *m_pMaintable; - QHeader *m_pTablehead; + Q3Header *m_pTablehead; QStringList *m_pTaskentries; // Edition widgets @@ -198,11 +210,11 @@ QLineEdit *m_pCrcedit; // Control to edit CRC QLineEdit *m_pRevedit; // Control to edit revision Daydatedit *m_pDateedit; // Control to edit date - QTimeEdit *m_pStarttime; // Control to edit start time - QTimeEdit *m_pEndtime; // Control to edit finish time + Q3TimeEdit *m_pStarttime; // Control to edit start time + Q3TimeEdit *m_pEndtime; // Control to edit finish time // QTimeEdit *m_pAmount; // Control to edit total time ASTimeEdit *m_pAmount; // Control to edit total time - QComboBox *m_pTasks; // Control to choose a task + Q3ComboBox *m_pTasks; // Control to choose a task QLineEdit *m_pRemark; // Control to edit remark protected slots: @@ -277,25 +289,25 @@ void closeEvent(QCloseEvent *); // Close current document in main window // Application main window widgets - QFrame *m_pCenframe; // Central frame - QVBoxLayout *m_pMainlayout; // Package and control layouts - QVBoxLayout *m_pPackagelayout; // Main table control - QHBoxLayout *m_pEditlayout; // Lower edition widgets + Q3Frame *m_pCenframe; // Central frame + Q3VBoxLayout *m_pMainlayout; // Package and control layouts + Q3VBoxLayout *m_pPackagelayout; // Main table control + Q3HBoxLayout *m_pEditlayout; // Lower edition widgets private: // Owned by QMainWindow QMenuBar *m_pMenubar; - QPopupMenu *m_pViewpopup; // Saved for manipulating views - QPopupMenu *m_pTbarspopup; // Saved for manipulating toolbars - QPopupMenu *m_pColspopup; // Saved for manipulating columns + Q3PopupMenu *m_pViewpopup; // Saved for manipulating views + Q3PopupMenu *m_pTbarspopup; // Saved for manipulating toolbars + Q3PopupMenu *m_pColspopup; // Saved for manipulating columns QStatusBar *m_pStatbar; // Belong to us - QToolBar *m_pFiletools; - QToolBar *m_pEdittools; - QToolBar *m_pViewtools; - QToolBar *m_pPrefstools; - QToolBar *m_pWhatstools; + Q3ToolBar *m_pFiletools; + Q3ToolBar *m_pEdittools; + Q3ToolBar *m_pViewtools; + Q3ToolBar *m_pPrefstools; + Q3ToolBar *m_pWhatstools; QString *m_szFilename; // Constructor helpers @@ -313,11 +325,11 @@ // Data processing void loadAccounts(QFile &); // Load accounts from file - void loadAccounts(QTextStream &); // Load accounts from stream + void loadAccounts(Q3TextStream &); // Load accounts from stream void loadData(QFile &); // Load personal data from file - void loadData(QTextStream &); // Load personal data from stream + void loadData(Q3TextStream &); // Load personal data from stream void saveData(QFile &); // Save accounting data to file - void saveData(QTextStream &); // Save accounting data to stream + void saveData(Q3TextStream &); // Save accounting data to stream const bool validateData(QFile &) const; // Validate personal data in file const bool validateData(QString &) const; // Validate personal data from string };