# HG changeset patch # User Michael Schloh von Bennewitz # Date 1228515242 -3600 # Node ID c1941114ca882fb9ed49084674042bcda37426b3 # Parent e8292658d5b3748d5349681ccb5c226fad69eacd Port to the Qt4 API and bump version pending release engineering. diff -r e8292658d5b3 -r c1941114ca88 ChangeLog --- a/ChangeLog Fri Nov 28 14:20:00 2008 +0100 +++ b/ChangeLog Fri Dec 05 23:14:02 2008 +0100 @@ -1,5 +1,9 @@ Geschichte des OSSP titraq in Vorwaerts Cronordnung +081205 Ported to build under the Qt4 API, using the Qt3 support layer logic + Made minor corrections to more closely adhere to the C++ standard + Removed branding in some places where branding is now irrelevant + 040824 Corrected with-qt expression as already indicated by configure --help Avoid forgotten save data loss by connecting QTable's valueChanged signal Corrected in place edition logic to work with newer Qt library editCell() diff -r e8292658d5b3 -r c1941114ca88 Makefile.in --- a/Makefile.in Fri Nov 28 14:20:00 2008 +0100 +++ b/Makefile.in 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 diff -r e8292658d5b3 -r c1941114ca88 README --- a/README Fri Nov 28 14:20:00 2008 +0100 +++ b/README Fri Dec 05 23:14:02 2008 +0100 @@ -15,13 +15,13 @@ COPYRIGHT AND LICENSE - 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 interface which - can be found at http://www.ossp.org/pkg/tool/asgui/. + 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 @@ -45,5 +45,5 @@ The documentation and latest release can be found on - o http://www.ossp.org/pkg/tool/asgui/ + o http://asgui.europalab.com/ o ftp://ftp.ossp.org/pkg/tool/asgui/ diff -r e8292658d5b3 -r c1941114ca88 aclocal.m4 --- a/aclocal.m4 Fri Nov 28 14:20:00 2008 +0100 +++ b/aclocal.m4 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 GUI, a graphical user interface -## for OSSP which can be found at http://www.ossp.org/ +## for OSSP 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 @@ -313,52 +313,14 @@ AC_MSG_ERROR([Neither \$QTDIR nor --with-qt=[DIR] paths exist]) fi -dnl ## Now search for libs and headers -changequote(, )dnl -for file in x `find $QTBASE/include -name "qapplication.h" -print`; do - test .$file = .x && continue - c_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'` -done - -dnl ## Scan to find out which Qt library to link against -dnl ## FIXME Merge static and dynamic library search blocks -dnl ## FIXME Remove this qt-mt check and do --enable-threads instead -for file in x `find $QTBASE/lib -name "libqt.so" -print`; do - test .$file = .x && continue - l_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'` - lib=`echo $file | sed -e 's;^.*/\(.*\)$;\1;' -e 's;lib\(.*\)\.so;\1;'` -done - -dnl ## If we have a multithreaded shared library, then it's better -for file in x `find $QTBASE/lib -name "libqt-mt.so" -print`; do - test .$file = .x && continue - l_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'` - lib=`echo $file | sed -e 's;^.*/\(.*\)$;\1;' -e 's;lib\(.*\)\.so;\1;'` -done - -dnl ## If we have static libraries, then prefer to use those -for file in x `find $QTBASE/lib -name "libqt.a" -print`; do - test .$file = .x && continue - l_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'` - lib=`echo $file | sed -e 's;^.*/\(.*\)$;\1;' -e 's;lib\(.*\)\.a;\1;'` -done - -dnl ## But the static multithreaded library is preferred above all -for file in x `find $QTBASE/lib -name "libqt-mt.a" -print`; do - test .$file = .x && continue - l_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'` - lib=`echo $file | sed -e 's;^.*/\(.*\)$;\1;' -e 's;lib\(.*\)\.a;\1;'` -done -changequote([, ])dnl - dnl ## Append paths of libs and headers if test ".$lib" != .; then LIBS="$LIBS -l$lib" fi -LDFLAGS="$LDFLAGS -L$l_dir" +LDFLAGS="$LDFLAGS `$PKG_CONFIG --ldlags Qt3Support QtCore QtGui`" CPPFLAGS="$CPPFLAGS -DQT_THREAD_SUPPORT" CXXCPP="$CXXCPP -DQT_THREAD_SUPPORT" -CXXFLAGS="$CXXFLAGS -I$c_dir" +CXXFLAGS="$CXXFLAGS `$PKG_CONFIG --cflags-only-I Qt3Support QtCore QtGui`" ]) diff -r e8292658d5b3 -r c1941114ca88 as-accounts.pod --- a/as-accounts.pod Fri Nov 28 14:20:00 2008 +0100 +++ b/as-accounts.pod 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 diff -r e8292658d5b3 -r c1941114ca88 as-events.pod --- a/as-events.pod Fri Nov 28 14:20:00 2008 +0100 +++ b/as-events.pod 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 diff -r e8292658d5b3 -r c1941114ca88 as-gui.conf.pod --- a/as-gui.conf.pod Fri Nov 28 14:20:00 2008 +0100 +++ b/as-gui.conf.pod 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 diff -r e8292658d5b3 -r c1941114ca88 as-gui.html --- a/as-gui.html Fri Nov 28 14:20:00 2008 +0100 +++ b/as-gui.html Fri Dec 05 23:14:02 2008 +0100 @@ -2,7 +2,7 @@ as-gui help reference - + diff -r e8292658d5b3 -r c1941114ca88 as-gui.pod --- a/as-gui.pod Fri Nov 28 14:20:00 2008 +0100 +++ b/as-gui.pod 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 diff -r e8292658d5b3 -r c1941114ca88 as_amount.cpp --- a/as_amount.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_amount.cpp 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 diff -r e8292658d5b3 -r c1941114ca88 as_amount.h --- a/as_amount.h Fri Nov 28 14:20:00 2008 +0100 +++ b/as_amount.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,16 +32,16 @@ #ifndef AMOUNTBOX_H #define AMOUNTBOX_H -#include +#include -class ASTimeEdit : public QTimeEdit +class ASTimeEdit : public Q3TimeEdit { public: - ASTimeEdit(QWidget *pParent = 0, const char *szName = 0) : QTimeEdit(pParent, szName) + ASTimeEdit(QWidget *pParent = 0, const char *szName = 0) : Q3TimeEdit(pParent, szName) { this->setTime(QTime::QTime(0, 0)); - this->setDisplay(QTimeEdit::Hours | QTimeEdit::Minutes); + this->setDisplay(Q3TimeEdit::Hours | Q3TimeEdit::Minutes); this->setAutoAdvance(true); // this->setMaxValue(); // this->setSuffix(trUtf8(" Mins")); diff -r e8292658d5b3 -r c1941114ca88 as_assist.cpp --- a/as_assist.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_assist.cpp 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,21 +29,29 @@ // as_assist.cpp: ISO C++ implementation // +#define QT3_SUPPORT + +#include + // Qt style headers #include -#include +#include +#include #include -#include -#include +#include +#include +#include #include +#include +#include // Qt general headers #include -#include +#include #include -#include +#include #include -#include +#include #include #include #include @@ -51,6 +59,14 @@ #include #include +//Added by qt3to4: +#include +#include +#include +#include +#include +#include + // User interface #include "as_amount.h" // AmountBox class #include "as_user.h" // User class @@ -97,8 +113,8 @@ { // Can't bootstrap until we know who is using our tool, so find out User Localuser = User(); - QString Username = Localuser.getName(); - QString Homedir = Localuser.getHomedir(); + QString Username = QString::fromStdString(Localuser.getName()); + QString Homedir = QString::fromStdString(Localuser.getHomedir()); // Bootstrap a user preferences object from operating system info m_pPrefs = new Preferences(Homedir + QChar('/') + @@ -141,7 +157,7 @@ m_pPrefs->setNumber(TITRAQ_PREFDARKGREEN, TITRAQ_DEFDARKGREEN); m_pPrefs->setNumber(TITRAQ_PREFDARKBLUE, TITRAQ_DEFDARKBLUE); m_pPrefs->flush(); // Write the new conf file - QTextStream cerr(stderr, IO_WriteOnly); + Q3TextStream cerr(stderr, QIODevice::WriteOnly); cerr << trUtf8("Created new preferences file ") << Homedir << QChar('/') << QString::fromLocal8Bit(TITRAQ_PREFNAME) << endl; } @@ -151,18 +167,18 @@ case TITRAQ_STYLECDE: qApp->setStyle(new QCDEStyle); break; - case TITRAQ_STYLESGI: - qApp->setStyle(new QSGIStyle); - break; + //case TITRAQ_STYLESGI: // SGI Style is unsupported + // qApp->setStyle(new QSGIStyle); + // break; case TITRAQ_STYLEMOTIF: qApp->setStyle(new QMotifStyle); break; - case TITRAQ_STYLEMPLUS: - qApp->setStyle(new QMotifPlusStyle); - break; - case TITRAQ_STYLEPLAT: - qApp->setStyle(new QPlatinumStyle); - break; + //case TITRAQ_STYLEMPLUS: // MotifPlus Style is unsupported + // qApp->setStyle(new QMotifPlusStyle); + // break; + //case TITRAQ_STYLEPLAT: // Platinum Style is unsupported + // qApp->setStyle(new QPlatinumStyle); + // break; case TITRAQ_STYLEMSOFT: qApp->setStyle(new QWindowsStyle); break; @@ -177,47 +193,47 @@ // void Titraqform::setupActions(void) { - QIconSet Saveiset, Cutiset, Copyiset, Pasteiset; - QIconSet Rowaddiset, Rowdeliset, Refreshiset; - QIconSet Synciset, Reportiset; + QIcon Saveiset, Cutiset, Copyiset, Pasteiset; + QIcon Rowaddiset, Rowdeliset, Refreshiset; + QIcon Synciset, Reportiset; // Construct iconsets to use later for multistate action images - Saveiset.setPixmap(QPixmap(s_kpcFilesave_xpm), QIconSet::Automatic, QIconSet::Normal); - Saveiset.setPixmap(QPixmap(s_kpcDfilesave_xpm), QIconSet::Automatic, QIconSet::Disabled); - Cutiset.setPixmap(QPixmap(s_kpcCut_xpm), QIconSet::Automatic, QIconSet::Normal); - Cutiset.setPixmap(QPixmap(s_kpcDcut_xpm), QIconSet::Automatic, QIconSet::Disabled); - Copyiset.setPixmap(QPixmap(s_kpcCopy_xpm), QIconSet::Automatic, QIconSet::Normal); - Copyiset.setPixmap(QPixmap(s_kpcDcopy_xpm), QIconSet::Automatic, QIconSet::Disabled); - Pasteiset.setPixmap(QPixmap(s_kpcPaste_xpm), QIconSet::Automatic, QIconSet::Normal); - Pasteiset.setPixmap(QPixmap(s_kpcDpaste_xpm), QIconSet::Automatic, QIconSet::Disabled); - Rowaddiset.setPixmap(QPixmap(s_kpcRowadd_xpm), QIconSet::Automatic, QIconSet::Normal); - Rowaddiset.setPixmap(QPixmap(s_kpcDrowadd_xpm), QIconSet::Automatic, QIconSet::Disabled); - Rowdeliset.setPixmap(QPixmap(s_kpcRowdel_xpm), QIconSet::Automatic, QIconSet::Normal); - Rowdeliset.setPixmap(QPixmap(s_kpcDrowdel_xpm), QIconSet::Automatic, QIconSet::Disabled); - Refreshiset.setPixmap(QPixmap(s_kpcRefresh_xpm), QIconSet::Automatic, QIconSet::Normal); - Refreshiset.setPixmap(QPixmap(s_kpcDrefresh_xpm), QIconSet::Automatic, QIconSet::Disabled); - Synciset.setPixmap(QPixmap(s_kpcSync_xpm), QIconSet::Automatic, QIconSet::Normal); - Synciset.setPixmap(QPixmap(s_kpcDsync_xpm), QIconSet::Automatic, QIconSet::Disabled); - Reportiset.setPixmap(QPixmap(s_kpcReport_xpm), QIconSet::Automatic, QIconSet::Normal); - Reportiset.setPixmap(QPixmap(s_kpcDreport_xpm), QIconSet::Automatic, QIconSet::Disabled); + Saveiset.setPixmap(QPixmap(s_kpcFilesave_xpm), QIcon::Automatic, QIcon::Normal); + Saveiset.setPixmap(QPixmap(s_kpcDfilesave_xpm), QIcon::Automatic, QIcon::Disabled); + Cutiset.setPixmap(QPixmap(s_kpcCut_xpm), QIcon::Automatic, QIcon::Normal); + Cutiset.setPixmap(QPixmap(s_kpcDcut_xpm), QIcon::Automatic, QIcon::Disabled); + Copyiset.setPixmap(QPixmap(s_kpcCopy_xpm), QIcon::Automatic, QIcon::Normal); + Copyiset.setPixmap(QPixmap(s_kpcDcopy_xpm), QIcon::Automatic, QIcon::Disabled); + Pasteiset.setPixmap(QPixmap(s_kpcPaste_xpm), QIcon::Automatic, QIcon::Normal); + Pasteiset.setPixmap(QPixmap(s_kpcDpaste_xpm), QIcon::Automatic, QIcon::Disabled); + Rowaddiset.setPixmap(QPixmap(s_kpcRowadd_xpm), QIcon::Automatic, QIcon::Normal); + Rowaddiset.setPixmap(QPixmap(s_kpcDrowadd_xpm), QIcon::Automatic, QIcon::Disabled); + Rowdeliset.setPixmap(QPixmap(s_kpcRowdel_xpm), QIcon::Automatic, QIcon::Normal); + Rowdeliset.setPixmap(QPixmap(s_kpcDrowdel_xpm), QIcon::Automatic, QIcon::Disabled); + Refreshiset.setPixmap(QPixmap(s_kpcRefresh_xpm), QIcon::Automatic, QIcon::Normal); + Refreshiset.setPixmap(QPixmap(s_kpcDrefresh_xpm), QIcon::Automatic, QIcon::Disabled); + Synciset.setPixmap(QPixmap(s_kpcSync_xpm), QIcon::Automatic, QIcon::Normal); + Synciset.setPixmap(QPixmap(s_kpcDsync_xpm), QIcon::Automatic, QIcon::Disabled); + Reportiset.setPixmap(QPixmap(s_kpcReport_xpm), QIcon::Automatic, QIcon::Normal); + Reportiset.setPixmap(QPixmap(s_kpcDreport_xpm), QIcon::Automatic, QIcon::Disabled); // First associate the graphics with MIME types - QMimeSourceFactory::defaultFactory()->setPixmap("osspicon", QPixmap(s_kpcOsspicon_xpm)); - QMimeSourceFactory::defaultFactory()->setPixmap("filenew", QPixmap(s_kpcFilenew_xpm)); - QMimeSourceFactory::defaultFactory()->setPixmap("fileopen", QPixmap(s_kpcFileopen_xpm)); - QMimeSourceFactory::defaultFactory()->setPixmap("filesave", QPixmap(s_kpcFilesave_xpm)); - QMimeSourceFactory::defaultFactory()->setPixmap("cut", QPixmap(s_kpcCut_xpm)); - QMimeSourceFactory::defaultFactory()->setPixmap("copy", QPixmap(s_kpcCopy_xpm)); - QMimeSourceFactory::defaultFactory()->setPixmap("paste", QPixmap(s_kpcPaste_xpm)); - QMimeSourceFactory::defaultFactory()->setPixmap("rowadd", QPixmap(s_kpcRowadd_xpm)); - QMimeSourceFactory::defaultFactory()->setPixmap("rowdel", QPixmap(s_kpcRowdel_xpm)); - QMimeSourceFactory::defaultFactory()->setPixmap("refresh", QPixmap(s_kpcRefresh_xpm)); - QMimeSourceFactory::defaultFactory()->setPixmap("syncrpc", QPixmap(s_kpcSync_xpm)); - QMimeSourceFactory::defaultFactory()->setPixmap("locreport", QPixmap(s_kpcReport_xpm)); - QMimeSourceFactory::defaultFactory()->setPixmap("prefs", QPixmap(s_kpcPrefs_xpm)); + Q3MimeSourceFactory::defaultFactory()->setPixmap("osspicon", QPixmap(s_kpcOsspicon_xpm)); + Q3MimeSourceFactory::defaultFactory()->setPixmap("filenew", QPixmap(s_kpcFilenew_xpm)); + Q3MimeSourceFactory::defaultFactory()->setPixmap("fileopen", QPixmap(s_kpcFileopen_xpm)); + Q3MimeSourceFactory::defaultFactory()->setPixmap("filesave", QPixmap(s_kpcFilesave_xpm)); + Q3MimeSourceFactory::defaultFactory()->setPixmap("cut", QPixmap(s_kpcCut_xpm)); + Q3MimeSourceFactory::defaultFactory()->setPixmap("copy", QPixmap(s_kpcCopy_xpm)); + Q3MimeSourceFactory::defaultFactory()->setPixmap("paste", QPixmap(s_kpcPaste_xpm)); + Q3MimeSourceFactory::defaultFactory()->setPixmap("rowadd", QPixmap(s_kpcRowadd_xpm)); + Q3MimeSourceFactory::defaultFactory()->setPixmap("rowdel", QPixmap(s_kpcRowdel_xpm)); + Q3MimeSourceFactory::defaultFactory()->setPixmap("refresh", QPixmap(s_kpcRefresh_xpm)); + Q3MimeSourceFactory::defaultFactory()->setPixmap("syncrpc", QPixmap(s_kpcSync_xpm)); + Q3MimeSourceFactory::defaultFactory()->setPixmap("locreport", QPixmap(s_kpcReport_xpm)); + Q3MimeSourceFactory::defaultFactory()->setPixmap("prefs", QPixmap(s_kpcPrefs_xpm)); // File new action - m_pFilenewact = new QAction(trUtf8("New File"), QPixmap(s_kpcFilenew_xpm), trUtf8("&New"), CTRL+Key_N, this, "New"); + m_pFilenewact = new Q3Action(trUtf8("New File"), QPixmap(s_kpcFilenew_xpm), trUtf8("&New"), Qt::CTRL+Qt::Key_N, this, "New"); if (m_pFilenewact == NULL) // Sanity check throw Genexcept("Main window file new action creation failed."); connect(m_pFilenewact, SIGNAL(activated()), SLOT(newDoc())); @@ -229,7 +245,7 @@ m_pFilenewact->setWhatsThis(kszFilenewtext); // File open action - m_pFileopenact = new QAction(trUtf8("Open File"), QPixmap(s_kpcFileopen_xpm), trUtf8("&Open..."), CTRL+Key_O, this, "Open"); + m_pFileopenact = new Q3Action(trUtf8("Open File"), QPixmap(s_kpcFileopen_xpm), trUtf8("&Open..."), Qt::CTRL+Qt::Key_O, this, "Open"); if (m_pFileopenact == NULL) // Sanity check throw Genexcept("Main window file open action creation failed."); connect(m_pFileopenact, SIGNAL(activated()), SLOT(openDoc())); @@ -241,7 +257,7 @@ m_pFileopenact->setWhatsThis(kszFileopentext); // File save current action - m_pFilesaveact = new QAction(trUtf8("Save File"), Saveiset, trUtf8("&Save"), CTRL+Key_S, this, "Save"); + m_pFilesaveact = new Q3Action(trUtf8("Save File"), Saveiset, trUtf8("&Save"), Qt::CTRL+Qt::Key_S, this, "Save"); if (m_pFilesaveact == NULL) // Sanity check throw Genexcept("Main window file save action creation failed."); connect(m_pFilesaveact, SIGNAL(activated()), SLOT(saveFile())); @@ -254,26 +270,26 @@ m_pFilesaveact->setWhatsThis(kszFilesavetext); // File save selected action - m_pFilesaveasact = new QAction(trUtf8("Save File As"), trUtf8("Save &As..."), 0, this, "SaveAs"); + m_pFilesaveasact = new Q3Action(trUtf8("Save File As"), trUtf8("Save &As..."), 0, this, "SaveAs"); if (m_pFilesaveasact == NULL) // Sanity check throw Genexcept("Main window file save as action creation failed."); connect(m_pFilesaveasact, SIGNAL(activated()), SLOT(saveAs())); m_pFilesaveasact->setWhatsThis(kszFilesavetext); // File close current action - m_pFilecloseact = new QAction(trUtf8("Close"), trUtf8("&Close"), CTRL+Key_W, this, "Close"); + m_pFilecloseact = new Q3Action(trUtf8("Close"), trUtf8("&Close"), Qt::CTRL+Qt::Key_W, this, "Close"); if (m_pFilecloseact == NULL) // Sanity check throw Genexcept("Main window file close action creation failed."); connect(m_pFilecloseact, SIGNAL(activated()), SLOT(close())); // File quit action - m_pFilequitact = new QAction(trUtf8("Exit"), trUtf8("E&xit"), CTRL+Key_Q, this, "Exit"); + m_pFilequitact = new Q3Action(trUtf8("Exit"), trUtf8("E&xit"), Qt::CTRL+Qt::Key_Q, this, "Exit"); if (m_pFilequitact == NULL) // Sanity check throw Genexcept("Main window file quit action creation failed."); connect(m_pFilequitact, SIGNAL(activated()), SLOT(quitApp())); // Cut action - m_pCutact = new QAction(trUtf8("Cut"), Cutiset, trUtf8("&Cut"), CTRL+Key_X, this, "Cut"); + m_pCutact = new Q3Action(trUtf8("Cut"), Cutiset, trUtf8("&Cut"), Qt::CTRL+Qt::Key_X, this, "Cut"); if (m_pCutact == NULL) // Sanity check throw Genexcept("Main window cut edit action creation failed."); connect(m_pCutact, SIGNAL(activated()), SLOT(cutEntry())); @@ -284,7 +300,7 @@ m_pCutact->setWhatsThis(kszCuttext); // Copy action - m_pCopyact = new QAction(trUtf8("Copy"), Copyiset, trUtf8("&Copy"), CTRL+Key_C, this, "Copy"); + m_pCopyact = new Q3Action(trUtf8("Copy"), Copyiset, trUtf8("&Copy"), Qt::CTRL+Qt::Key_C, this, "Copy"); if (m_pCopyact == NULL) // Sanity check throw Genexcept("Main window copy edit action creation failed."); connect(m_pCopyact, SIGNAL(activated()), SLOT(copyEntry())); @@ -295,7 +311,7 @@ m_pCopyact->setWhatsThis(kszCopytext); // Paste action - m_pPasteact = new QAction(trUtf8("Paste"), Pasteiset, trUtf8("&Paste"), CTRL+Key_V, this, "Paste"); + m_pPasteact = new Q3Action(trUtf8("Paste"), Pasteiset, trUtf8("&Paste"), Qt::CTRL+Qt::Key_V, this, "Paste"); if (m_pPasteact == NULL) // Sanity check throw Genexcept("Main window paste edit action creation failed."); connect(m_pPasteact, SIGNAL(activated()), SLOT(pasteEntry())); @@ -306,7 +322,7 @@ m_pPasteact->setWhatsThis(kszPastetext); // Add data row action - m_pAddrowact = new QAction(trUtf8("Add Entry"), Rowaddiset, trUtf8("&Add entry"), Key_Insert, this, "Addentry"); + m_pAddrowact = new Q3Action(trUtf8("Add Entry"), Rowaddiset, trUtf8("&Add entry"), Qt::Key_Insert, this, "Addentry"); if (m_pAddrowact == NULL) // Sanity check throw Genexcept("Main window add entry action creation failed."); connect(m_pAddrowact, SIGNAL(activated()), SLOT(addEntry())); @@ -317,7 +333,7 @@ m_pAddrowact->setWhatsThis(kszAddrowtext); // Delete data row action - m_pDelrowact = new QAction(trUtf8("Delete Entry"), Rowdeliset, trUtf8("&Delete entry"), Key_Delete, this, "Delentry"); + m_pDelrowact = new Q3Action(trUtf8("Delete Entry"), Rowdeliset, trUtf8("&Delete entry"), Qt::Key_Delete, this, "Delentry"); if (m_pDelrowact == NULL) // Sanity check throw Genexcept("Main window delete entry action creation failed."); connect(m_pDelrowact, SIGNAL(activated()), SLOT(delEntry())); @@ -328,7 +344,7 @@ m_pDelrowact->setWhatsThis(kszDelrowtext); // Refresh data display action - m_pRefreshact = new QAction(trUtf8("Refresh Display"), Refreshiset, trUtf8("&Refresh display"), CTRL+Key_R, this, "Refresh"); + m_pRefreshact = new Q3Action(trUtf8("Refresh Display"), Refreshiset, trUtf8("&Refresh display"), Qt::CTRL+Qt::Key_R, this, "Refresh"); if (m_pRefreshact == NULL) // Sanity check throw Genexcept("Main window refresh action creation failed."); connect(m_pRefreshact, SIGNAL(activated()), SLOT(refreshDisplay())); @@ -339,7 +355,7 @@ m_pRefreshact->setWhatsThis(kszRefreshtext); // Syncronize data with remote server over IIOP or SOAP action - m_pSyncact = new QAction(trUtf8("Synchronize with server"), Synciset, trUtf8("&Synchronize"), CTRL+Key_E, this, "Synchronize"); + m_pSyncact = new Q3Action(trUtf8("Synchronize with server"), Synciset, trUtf8("&Synchronize"), Qt::CTRL+Qt::Key_E, this, "Synchronize"); if (m_pSyncact == NULL) // Sanity check throw Genexcept("Main window synchronize RPC action creation failed."); connect(m_pSyncact, SIGNAL(activated()), SLOT(syncIiop())); @@ -352,7 +368,7 @@ m_pSyncact->setWhatsThis(kszSynctext); // Local report generation action - m_pReportact = new QAction(trUtf8("Generate a local report"), Reportiset, trUtf8("&Report"), CTRL+Key_T, this, "LocalReport"); + m_pReportact = new Q3Action(trUtf8("Generate a local report"), Reportiset, trUtf8("&Report"), Qt::CTRL+Qt::Key_T, this, "LocalReport"); if (m_pReportact == NULL) // Sanity check throw Genexcept("Main window local report action creation failed."); connect(m_pReportact, SIGNAL(activated()), SLOT(genReport())); @@ -364,7 +380,7 @@ m_pReportact->setWhatsThis(kszReporttext); // Offer a formatted preferences panel for intuitive prefs object editing - m_pPrefsact = new QAction(trUtf8("Edit the preferences"), QPixmap(s_kpcPrefs_xpm), trUtf8("P&references..."), CTRL+Key_F, this, "Prefspanel"); + m_pPrefsact = new Q3Action(trUtf8("Edit the preferences"), QPixmap(s_kpcPrefs_xpm), trUtf8("P&references..."), Qt::CTRL+Qt::Key_F, this, "Prefspanel"); if (m_pPrefsact == NULL) // Sanity check throw Genexcept("Main window preferences panel action creation failed."); connect(m_pPrefsact, SIGNAL(activated()), SLOT(configPrefs())); @@ -391,7 +407,7 @@ // QToolTip::add(m_pMenubar, QRect(0, 0, 2, 2), trUtf8("Easter Egg")); // Construct and populate the file menu with actions - QPopupMenu *pFilepopup = new QPopupMenu(this); + Q3PopupMenu *pFilepopup = new Q3PopupMenu(this); if (pFilepopup == NULL) // Sanity check throw Genexcept("Main window file popup creation failed."); m_pMenubar->insertItem(trUtf8("&File"), pFilepopup); @@ -406,7 +422,7 @@ m_pFilequitact->addTo(pFilepopup); // Construct and populate the edit menu with subitems - QPopupMenu *pEditpopup = new QPopupMenu(this); + Q3PopupMenu *pEditpopup = new Q3PopupMenu(this); if (pEditpopup == NULL) // Sanity check throw Genexcept("Main window edit popup creation failed."); m_pMenubar->insertItem(trUtf8("&Edit"), pEditpopup); @@ -420,9 +436,9 @@ m_pPrefsact->addTo(pEditpopup); // Construct the view menu and submenus - m_pViewpopup = new QPopupMenu(this); - m_pTbarspopup = new QPopupMenu(this); - m_pColspopup = new QPopupMenu(this); + m_pViewpopup = new Q3PopupMenu(this); + m_pTbarspopup = new Q3PopupMenu(this); + m_pColspopup = new Q3PopupMenu(this); // Give the new menus krass attributes m_pTbarspopup->insertTearOffHandle(); @@ -482,7 +498,7 @@ m_pColspopup->setItemChecked(nMenuid, true); // Construct and populate the report menu with subitems - QPopupMenu *pReportpopup = new QPopupMenu(this); + Q3PopupMenu *pReportpopup = new Q3PopupMenu(this); if (pReportpopup == NULL) // Sanity check throw Genexcept("Main window report popup creation failed."); m_pMenubar->insertItem(trUtf8("&Report"), pReportpopup); @@ -497,17 +513,17 @@ m_pMenubar->insertSeparator(); // Construct and populate the help menu with subitems - QPopupMenu *pHelppopup = new QPopupMenu(this); + Q3PopupMenu *pHelppopup = new Q3PopupMenu(this); if (pHelppopup == NULL) // Sanity check throw Genexcept("Main window help popup creation failed."); m_pMenubar->insertItem(trUtf8("&Help"), pHelppopup); - pHelppopup->insertItem(trUtf8("&Contents"), this, SLOT(helpContents()), Key_F1); + pHelppopup->insertItem(trUtf8("&Contents"), this, SLOT(helpContents()), Qt::Key_F1); pHelppopup->insertSeparator(); pHelppopup->insertItem(trUtf8("About &as-gui"), this, SLOT(aboutTitraq())); pHelppopup->insertItem(trUtf8("About &OSSP"), this, SLOT(aboutOSSP())); pHelppopup->insertItem(trUtf8("About &Qt"), this, SLOT(aboutQt())); pHelppopup->insertSeparator(); - pHelppopup->insertItem(QPixmap(s_kpcWhatsthis_xpm), trUtf8("What's &This"), this, SLOT(whatsThis()), SHIFT+Key_F1); + pHelppopup->insertItem(QPixmap(s_kpcWhatsthis_xpm), trUtf8("What's &This"), this, SLOT(whatsThis()), Qt::SHIFT+Qt::Key_F1); } // @@ -516,23 +532,23 @@ void Titraqform::setupToolbars(void) { // Construct and populate the file tool bar - m_pFiletools = new QToolBar("Toolfile", this, DockTop); + m_pFiletools = new Q3ToolBar("Toolfile", this, Qt::DockTop); if (m_pFiletools == NULL) // Sanity check throw Genexcept("File tool bar creation failed."); m_pFiletools->setLabel(trUtf8("File Ops")); m_pFiletools->setOpaqueMoving(false); - m_pFiletools->setCloseMode(QDockWindow::Never); + m_pFiletools->setCloseMode(Q3DockWindow::Never); m_pFilenewact->addTo(m_pFiletools); m_pFileopenact->addTo(m_pFiletools); m_pFilesaveact->addTo(m_pFiletools); // Construct and populate the edit tool bar - m_pEdittools = new QToolBar("Tooledit", this, DockTop); + m_pEdittools = new Q3ToolBar("Tooledit", this, Qt::DockTop); if (m_pEdittools == NULL) // Sanity check throw Genexcept("Edit tool bar creation failed."); m_pEdittools->setLabel(trUtf8("Edit Ops")); m_pEdittools->setOpaqueMoving(false); - m_pEdittools->setCloseMode(QDockWindow::Never); + m_pEdittools->setCloseMode(Q3DockWindow::Never); m_pCutact->addTo(m_pEdittools); m_pCopyact->addTo(m_pEdittools); m_pPasteact->addTo(m_pEdittools); @@ -541,33 +557,33 @@ m_pDelrowact->addTo(m_pEdittools); // Construct and populate the view tool bar - m_pViewtools = new QToolBar("Toolview", this, DockTop); + m_pViewtools = new Q3ToolBar("Toolview", this, Qt::DockTop); if (m_pViewtools == NULL) // Sanity check throw Genexcept("View tool bar creation failed."); m_pViewtools->setLabel(trUtf8("View Ops")); m_pViewtools->setOpaqueMoving(false); - m_pViewtools->setCloseMode(QDockWindow::Never); + m_pViewtools->setCloseMode(Q3DockWindow::Never); m_pRefreshact->addTo(m_pViewtools); m_pReportact->addTo(m_pViewtools); m_pSyncact->addTo(m_pViewtools); // Construct and populate the lonely preferences tool bar - m_pPrefstools = new QToolBar("Preferences", this, DockTop); + m_pPrefstools = new Q3ToolBar("Preferences", this, Qt::DockTop); if (m_pPrefstools == NULL) // Sanity check throw Genexcept("Prefs tool bar creation failed."); m_pPrefstools->setLabel(trUtf8("Preferences editor")); m_pPrefstools->setOpaqueMoving(false); - m_pPrefstools->setCloseMode(QDockWindow::Never); + m_pPrefstools->setCloseMode(Q3DockWindow::Never); m_pPrefsact->addTo(m_pPrefstools); // Construct and populate the lonely whatsthis tool bar - m_pWhatstools = new QToolBar("Toolwhats", this, DockTop); + m_pWhatstools = new Q3ToolBar("Toolwhats", this, Qt::DockTop); if (m_pWhatstools == NULL) // Sanity check throw Genexcept("Whats this tool bar creation failed."); m_pWhatstools->setLabel(trUtf8("Whats this")); m_pWhatstools->setOpaqueMoving(false); - m_pWhatstools->setCloseMode(QDockWindow::Never); - QWhatsThis::whatsThisButton(m_pWhatstools); // Preconfigured whats this button + m_pWhatstools->setCloseMode(Q3DockWindow::Never); + Q3WhatsThis::whatsThisButton(m_pWhatstools); // Preconfigured whats this button } // @@ -576,17 +592,17 @@ void Titraqform::setupCentralwidget(void) { // Create a central frame and associated layout for QMainWindow - m_pCenframe = new QFrame(this, "Centralframe"); + m_pCenframe = new Q3Frame(this, "Centralframe"); if (m_pCenframe == NULL) // Sanity check throw Genexcept("Main window central frame creation failed."); - m_pCenframe->setFrameShape(QFrame::StyledPanel); - m_pCenframe->setFrameShadow(QFrame::Sunken); + m_pCenframe->setFrameShape(Q3Frame::StyledPanel); + m_pCenframe->setFrameShadow(Q3Frame::Sunken); this->setCentralWidget(m_pCenframe); // Layout controls for table, editing widgets - m_pMainlayout = new QVBoxLayout(m_pCenframe, TITRAQ_MARGIN, TITRAQ_SPACING, "Mainlayout"); // For layouts - m_pPackagelayout = new QVBoxLayout(0, 0, TITRAQ_SPACING, "Packagelayout"); // For table - m_pEditlayout = new QHBoxLayout(0, 0, TITRAQ_SPACING, "Editlayout"); // For edits + m_pMainlayout = new Q3VBoxLayout(m_pCenframe, TITRAQ_MARGIN, TITRAQ_SPACING, "Mainlayout"); // For layouts + m_pPackagelayout = new Q3VBoxLayout(0, 0, TITRAQ_SPACING, "Packagelayout"); // For table + m_pEditlayout = new Q3HBoxLayout(0, 0, TITRAQ_SPACING, "Editlayout"); // For edits // Major sanity check wrapped in one call if (!(m_pMainlayout && m_pPackagelayout && m_pEditlayout)) @@ -620,8 +636,8 @@ m_pMaintable->setDirty(false); // Reset data to clean state m_pMaintable->setReadOnly(true); // Table is read only m_pMaintable->setColumnMovingEnabled(false); // Ctrl-drag disabled - m_pMaintable->setSelectionMode(QTable::MultiRow); // Multi row selection - m_pMaintable->setFocusStyle(QTable::FollowStyle); // How cells are drawn + m_pMaintable->setSelectionMode(Q3Table::MultiRow); // Multi row selection + m_pMaintable->setFocusStyle(Q3Table::FollowStyle); // How cells are drawn m_pMaintable->setLeftMargin(0); // Get rid of the vertical header m_pMaintable->verticalHeader()->hide(); // by hiding it with a margin of 0 m_pMaintable->horizontalHeader()->setResizeEnabled(true); @@ -636,7 +652,7 @@ // Table header row m_pTablehead = m_pMaintable->horizontalHeader(); - m_pMaintable->setHScrollBarMode(QScrollView::AlwaysOff); + m_pMaintable->setHScrollBarMode(Q3ScrollView::AlwaysOff); m_pTablehead->setLabel(TITRAQ_IDXSTATUS, QObject::trUtf8("Stat"), m_pPrefs->getNumber(TITRAQ_PREFSTATCOLWIDTH, TITRAQ_DEFSTATCOLWIDTH)); m_pMaintable->setColumnReadOnly (TITRAQ_IDXSTATUS, true); @@ -696,7 +712,7 @@ const char *kszStatustext = "The item status shows a green " "symbol for valid entries, a yellow symbol " "for warning, and a red symbol for flawed entries."; - QWhatsThis::add(m_pStatusedit, kszStatustext); + Q3WhatsThis::add(m_pStatusedit, kszStatustext); QToolTip::add(m_pStatusedit, trUtf8("Status Indicator")); m_pEditlayout->addWidget(m_pStatusedit); // Finally add the item status edit @@ -715,7 +731,7 @@ const char *kszLinenotext = "The line number helps identify " "an entry when a warning or error message " "appears."; - QWhatsThis::add(m_pLineedit, kszLinenotext); + Q3WhatsThis::add(m_pLineedit, kszLinenotext); QToolTip::add(m_pLineedit, trUtf8("Line Number")); m_pEditlayout->addWidget(m_pLineedit); // Finally add the line number edit @@ -733,7 +749,7 @@ const char *kszUsertext = "Edit the user name by clicking " "on this control and typing the user name " "you want to account."; - QWhatsThis::add(m_pUseredit, kszUsertext); + Q3WhatsThis::add(m_pUseredit, kszUsertext); QToolTip::add(m_pUseredit, trUtf8("User Name")); m_pEditlayout->addWidget(m_pUseredit); // Finally add the user edit @@ -751,7 +767,7 @@ const char *kszGuidtext = "Edit the GUID by clicking " "on this control and typing the GUID " "corresponding to this account item."; - QWhatsThis::add(m_pGuidedit, kszGuidtext); + Q3WhatsThis::add(m_pGuidedit, kszGuidtext); QToolTip::add(m_pGuidedit, trUtf8("GUID")); m_pEditlayout->addWidget(m_pGuidedit); // Finally add the GUID edit @@ -769,7 +785,7 @@ const char *kszCrctext = "Edit the CRC by clicking " "on this control and typing the new " "value for this account item."; - QWhatsThis::add(m_pCrcedit, kszCrctext); + Q3WhatsThis::add(m_pCrcedit, kszCrctext); QToolTip::add(m_pCrcedit, trUtf8("CRC")); m_pEditlayout->addWidget(m_pCrcedit); // Finally add the CRC edit @@ -787,7 +803,7 @@ const char *kszRevtext = "Edit the revision by clicking " "on this control and typing the new value " "for this account type."; - QWhatsThis::add(m_pRevedit, kszRevtext); + Q3WhatsThis::add(m_pRevedit, kszRevtext); QToolTip::add(m_pRevedit, trUtf8("Revision")); m_pEditlayout->addWidget(m_pRevedit); // Finally add the revision edit @@ -797,7 +813,7 @@ throw Genexcept("Main window date edit creation failed."); // Spew errors // Configure attributes - m_pDateedit->setOrder(QDateEdit::YMD); + m_pDateedit->setOrder(Q3DateEdit::YMD); m_pDateedit->setAutoAdvance(true); m_pDateedit->setSeparator(trUtf8("-")); m_pDateedit->setEnabled(false); @@ -806,17 +822,17 @@ const char *kszDateedit = "Edit the task date by clicking on " "the year, month, or day, and then changing their " "values with the arrow buttons."; - QWhatsThis::add(m_pDateedit, kszDateedit); + Q3WhatsThis::add(m_pDateedit, kszDateedit); QToolTip::add(m_pDateedit, trUtf8("Task Date")); m_pEditlayout->addWidget(m_pDateedit); // Finally add the date editor // Make the start time selector - m_pStarttime = new QTimeEdit(m_pCenframe, "StartTime"); + m_pStarttime = new Q3TimeEdit(m_pCenframe, "StartTime"); if (m_pStarttime == NULL) // Sanity check throw Genexcept("Main window start time creation failed."); // Spew errors // Configure attributes - m_pStarttime->setDisplay(QTimeEdit::Hours | QTimeEdit::Minutes); + m_pStarttime->setDisplay(Q3TimeEdit::Hours | Q3TimeEdit::Minutes); m_pStarttime->setAutoAdvance(true); m_pStarttime->setEnabled(false); @@ -824,17 +840,17 @@ const char *kszStarttime = "Edit the task starting time by clicking on " "the hour and minute, and then changing their " "values with the arrow buttons."; - QWhatsThis::add(m_pStarttime, kszStarttime); + Q3WhatsThis::add(m_pStarttime, kszStarttime); QToolTip::add(m_pStarttime, trUtf8("Task Starting Time")); m_pEditlayout->addWidget(m_pStarttime); // Finally add the start editor // Make the end time selector - m_pEndtime = new QTimeEdit(m_pCenframe, "EndTime"); + m_pEndtime = new Q3TimeEdit(m_pCenframe, "EndTime"); if (m_pEndtime == NULL) // Sanity check throw Genexcept("Main window end time creation failed."); // Spew errors // Configure attributes - m_pEndtime->setDisplay(QTimeEdit::Hours | QTimeEdit::Minutes); + m_pEndtime->setDisplay(Q3TimeEdit::Hours | Q3TimeEdit::Minutes); m_pEndtime->setAutoAdvance(true); m_pEndtime->setEnabled(false); @@ -842,7 +858,7 @@ const char *kszEndtime = "Edit the task ending time by clicking on " "the hour and minute, and then changing their " "values with the arrow buttons."; - QWhatsThis::add(m_pEndtime, kszEndtime); + Q3WhatsThis::add(m_pEndtime, kszEndtime); QToolTip::add(m_pEndtime, trUtf8("Task Ending Time")); m_pEditlayout->addWidget(m_pEndtime); // Finally add the end editor @@ -865,7 +881,7 @@ const char *kszAmount = "Edit the task amount by clicking on " "the amount, and then changing its " "value with the arrow buttons."; - QWhatsThis::add(m_pAmount, kszAmount); + Q3WhatsThis::add(m_pAmount, kszAmount); QToolTip::add(m_pAmount, trUtf8("Task Amount")); m_pAmount->setEnabled(false); // Don't enable until it's ready m_pEditlayout->addWidget(m_pAmount); // Finally add the amount editor @@ -883,7 +899,7 @@ this->loadAccounts(Filetemp); // Load account helper method // Make the combobox task edit - m_pTasks = new QComboBox(true, m_pCenframe, "Tasks"); + m_pTasks = new Q3ComboBox(true, m_pCenframe, "Tasks"); if (m_pTasks == NULL) // Sanity check throw Genexcept("Main window task edit creation failed."); m_pTasks->insertStringList(*m_pTaskentries); @@ -899,7 +915,7 @@ int nPopupwidth = m_pTasks->listBox()->maxItemWidth(); nPopupwidth += m_pTasks->listBox()->horizontalScrollBar()->height(); m_pTasks->listBox()->setFixedWidth(nPopupwidth); - m_pTasks->listBox()->setHScrollBarMode(QScrollView::Auto); + m_pTasks->listBox()->setHScrollBarMode(Q3ScrollView::Auto); m_pTasks->listBox()->sort(); } @@ -907,7 +923,7 @@ const char *kszTasktext = "Choose a task account by clicking on " "this box, and choosing whichever item most " "closely resembles your task."; - QWhatsThis::add(m_pTasks, kszTasktext); + Q3WhatsThis::add(m_pTasks, kszTasktext); QToolTip::add(m_pTasks, trUtf8("Task Selector")); m_pEditlayout->addWidget(m_pTasks); // Finally add the task edit @@ -925,7 +941,7 @@ const char *kszRemarktext = "Edit the task remarks by clicking on " "this line control and typing the remarks you " "have about the task."; - QWhatsThis::add(m_pRemark, kszRemarktext); + Q3WhatsThis::add(m_pRemark, kszRemarktext); QToolTip::add(m_pRemark, trUtf8("Remark Line")); m_pEditlayout->addWidget(m_pRemark); // Finally add the remark line diff -r e8292658d5b3 -r c1941114ca88 as_const.h --- a/as_const.h Fri Nov 28 14:20:00 2008 +0100 +++ b/as_const.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 diff -r e8292658d5b3 -r c1941114ca88 as_crc.cpp --- a/as_crc.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_crc.cpp 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 diff -r e8292658d5b3 -r c1941114ca88 as_crc.h --- a/as_crc.h Fri Nov 28 14:20:00 2008 +0100 +++ b/as_crc.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,6 +32,8 @@ #ifndef CRC_H #define CRC_H +#define QT3_SUPPORT + #include // For copy constructor using string #include // For deriving from QString @@ -51,7 +53,7 @@ Qualistring(void) : QString() {initCrc();}; // Default Qualistring(const QString &kCopy) : QString(kCopy) {initCrc();}; // Copy Qualistring(const char *pkcCopy) : QString(pkcCopy) {initCrc();}; // Copy - Qualistring(const std::string &kCopy) : QString(kCopy) {initCrc();}; // Copy + Qualistring(const std::string &kCopy) : QString(QString::fromStdString(kCopy)) {initCrc();}; // Copy U32 getCrc(void); // Generate and return a CRC32 Qualistring &operator=(const QString &); // Overload equals operator diff -r e8292658d5b3 -r c1941114ca88 as_dataop.cpp --- a/as_dataop.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_dataop.cpp 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,6 +29,8 @@ // as_dataops.cpp: ISO C++ implementation // +#define QT3_SUPPORT + // System headers #include #include @@ -37,9 +39,11 @@ #include // Portable regular expressions #include #include -#include -#include +#include +#include #include +//Added by qt3to4: +#include // User interface #include "as_const.h" // Application constants @@ -61,18 +65,18 @@ { if (Fileobj.isOpen()) { // Check state of file Fileobj.flush(); // Begin processing file cleanly - QTextStream Account(&Fileobj); // Convert data to stream + Q3TextStream Account(&Fileobj); // Convert data to stream this->loadAccounts(Account); // Pass off to do the real work } else { - if (!Fileobj.open(IO_ReadOnly)) { // Try to open file + if (!Fileobj.open(QIODevice::ReadOnly)) { // Try to open file QString Readerrstr; Readerrstr = trUtf8(TITRAQ_READAFILFAIL).arg(Fileobj.name()); throw Genexcept(Readerrstr.ascii()); } else Fileobj.flush(); // Begin processing file cleanly - QTextStream Account(&Fileobj); // Convert data to stream + Q3TextStream Account(&Fileobj); // Convert data to stream this->loadAccounts(Account); // Pass off to do the real work Fileobj.close(); // Finish fileop by closing } @@ -81,7 +85,7 @@ // // Load accounts themselves data from a stream // -void Titraqform::loadAccounts(QTextStream &Tstream) +void Titraqform::loadAccounts(Q3TextStream &Tstream) { using namespace std; // Needed for hash tables with hmap map Hashnames; // Hashtable for storing names @@ -109,14 +113,14 @@ // stream and parsing the corresponding account fields out of it while (!Line.isEmpty()) { QString Temp; // For reading from stream - QTextStream Asline(&Line, IO_ReadOnly); // Convert a single line + Q3TextStream Asline(&Line, QIODevice::ReadOnly); // Convert a single line Asline.skipWhiteSpace(); // Remove whitespaces Asline >> Temp; // Copy revision indicator if (Temp == QString(QChar('R'))) { // Copy the account field Asline >> Temp; // to temporary for transfer - string Convstring = Temp; // Convert to string (can't cast?) + string Convstring = Temp.toStdString(); // Convert to string (can't cast?) Hashnames[Convstring] += Hashnames[Convstring]; } @@ -138,11 +142,11 @@ for (Numiter = Hashnums.begin(); Numiter != Hashnums.end(); Numiter++) { // Count the number of lines of sorted task names - int nNumlines = QString(Numiter->second).contains('\n'); + int nNumlines = QString::fromStdString(Numiter->second).count('\n'); // Iterate through the lines of task names, feeding them into the menu for (int nIter = 0; nIter < nNumlines; nIter++) - *m_pTaskentries << QString(Numiter->second).section('\n', nIter, nIter); + *m_pTaskentries << QString::fromStdString(Numiter->second).section('\n', nIter, nIter); } } @@ -153,15 +157,15 @@ { if (Fileobj.isOpen()) { // Check state of file Fileobj.flush(); // Begin processing file cleanly - QTextStream Asentry(&Fileobj); // Convert data to stream + Q3TextStream Asentry(&Fileobj); // Convert data to stream this->loadData(Asentry); // Pass off to do the real work } else { - if (!Fileobj.open(IO_ReadOnly)) // Try to open file + if (!Fileobj.open(QIODevice::ReadOnly)) // Try to open file throw Genexcept(trUtf8(TITRAQ_READPFILFAIL)); else Fileobj.flush(); // Begin processing file cleanly - QTextStream Asentry(&Fileobj); // Convert data to stream + Q3TextStream Asentry(&Fileobj); // Convert data to stream this->loadData(Asentry); // Pass off to do the real work Fileobj.close(); // Finish fileop by closing } @@ -170,7 +174,7 @@ // // Load personal data from a stream // -void Titraqform::loadData(QTextStream &Tstream) +void Titraqform::loadData(Q3TextStream &Tstream) { bool bValid = true; // Used to warn on globally invalid accounting data int nIter = 0; // Iterator used in loop and also as a count @@ -211,7 +215,7 @@ bool bValid = true; // Warns on linewise invalid accounting data QString User, Guid, Crc, Rev; // Valid admin fields QString Date, Start, Finish, Account, Amount, Remark; // Valid user fields - QTextStream Asline(&Line, IO_ReadOnly); // Convert a single line now + Q3TextStream Asline(&Line, QIODevice::ReadOnly); // Convert a single line now if (nIter % g_knBlocks == 0) // Add blocks of rows to optimize loading m_pMaintable->setNumRows(m_pMaintable->numRows() + g_knBlocks); @@ -269,10 +273,10 @@ Asline.skipWhiteSpace(); // Remove whitespaces Asline >> Account; // Copy the account field if (!Account.isEmpty()) { - QTableItem *pOld = m_pMaintable->item(nIter, TITRAQ_IDXTASK); + Q3TableItem *pOld = m_pMaintable->item(nIter, TITRAQ_IDXTASK); delete(pOld); // Get rid of the old before going with the new - RtTableItem *pSwapitem = new RtTableItem(m_pMaintable, QTableItem::WhenCurrent, Account); - pSwapitem->setAlignment(AlignLeft | AlignVCenter); + RtTableItem *pSwapitem = new RtTableItem(m_pMaintable, Q3TableItem::WhenCurrent, Account); + pSwapitem->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); m_pMaintable->setItem(nIter, TITRAQ_IDXTASK, pSwapitem); } else @@ -305,7 +309,7 @@ else { AS::Uuid Guidi; // For GUID production Guidi.genId(); - m_pMaintable->setText(nIter, TITRAQ_IDXGUID, Guidi.getString()); + m_pMaintable->setText(nIter, TITRAQ_IDXGUID, QString::fromStdString(Guidi.getString())); } } else // if isEmpty() @@ -364,13 +368,13 @@ { if (Fileobj.isOpen()) { // Check state of file Fileobj.flush(); // Begin processing file cleanly - QTextStream Asentry(&Fileobj); // Convert data to stream + Q3TextStream Asentry(&Fileobj); // Convert data to stream this->saveData(Asentry); // Pass off to do the real work } else { - if (!Fileobj.open(IO_WriteOnly)) // Try to open file + if (!Fileobj.open(QIODevice::WriteOnly)) // Try to open file throw Genexcept(trUtf8(TITRAQ_READPFILFAIL)); - QTextStream Asentry(&Fileobj); // Convert data to stream + Q3TextStream Asentry(&Fileobj); // Convert data to stream this->saveData(Asentry); // Pass off to do the real work Fileobj.close(); // Finish fileop by closing } @@ -379,7 +383,7 @@ // // Save accounting data to a stream // -void Titraqform::saveData(QTextStream &Tstream) +void Titraqform::saveData(Q3TextStream &Tstream) { const int nRows = m_pMaintable->numRows(); // Max rows used in loop QString Tempfield; // Current field string @@ -393,45 +397,45 @@ // Linewise save from the main table date, time, account, and others for (int nIter = 0; nIter < nRows; nIter++) { Tempfield = m_pMaintable->text(nIter, TITRAQ_IDXUSER); // Load user field text - if (Tempfield != NULL) + if (Tempfield.isNull()) Tstream << Tempfield; // Save user field text Tempfield = m_pMaintable->text(nIter, TITRAQ_IDXGUID); // Load GUID field text - if (Tempfield != NULL) + if (Tempfield.isNull()) Tstream << trUtf8(" ") << Tempfield; // Save GUID field text Tempfield = m_pMaintable->text(nIter, TITRAQ_IDXCRC); // Load CRC field text Tempfield.remove("0x"); - if (Tempfield != NULL) + if (Tempfield.isNull()) Tstream << trUtf8(" ") << Tempfield; // Save CRC field text Tempfield = m_pMaintable->text(nIter, TITRAQ_IDXREV); // Load rev field text - if (Tempfield != NULL) + if (Tempfield.isNull()) Tstream << trUtf8(" ") << Tempfield; // Save rev field text Tempfield = m_pMaintable->text(nIter, TITRAQ_IDXDATE); // Load date field text - if (Tempfield != NULL) + if (Tempfield.isNull()) Tstream << trUtf8(" ") << Tempfield; // Save date field text Tempfield = m_pMaintable->text(nIter, TITRAQ_IDXSTART); // Load start field text - if (Tempfield != NULL) + if (Tempfield.isNull()) Tstream << trUtf8(" ") << Tempfield; // Save start field text Tempfield = m_pMaintable->text(nIter, TITRAQ_IDXFINISH); // Load end field text - if (Tempfield != NULL) + if (Tempfield.isNull()) Tstream << trUtf8(" ") << Tempfield; // Save end field text Tempfield = m_pMaintable->text(nIter, TITRAQ_IDXAMOUNT); // Load amount field text - if (Tempfield != NULL) + if (Tempfield.isNull()) Tstream << trUtf8(" ") << Tempfield; // Save amount Tempfield = m_pMaintable->text(nIter, TITRAQ_IDXTASK); // Load acct field text - if (Tempfield != NULL) + if (Tempfield.isNull()) Tstream << trUtf8(" ") << Tempfield; // Save acct field text Tempfield = m_pMaintable->text(nIter, TITRAQ_IDXREMARK); // Load remark field text Tstream << trUtf8(" \""); // Save beginning double quote - if (Tempfield != NULL) { + if (Tempfield.isNull()) { Strsearch = QRegExp::escape(Tempfield); // Incoming string escaped Stripper.search(Strsearch); Tempfield.truncate(Stripper.pos()); // Cut off whitespace @@ -451,23 +455,25 @@ const bool Titraqform::validateData(QFile &Filin) const { QString Firstline; // Will contain the first line of text + char *pReadline; // Contains the read line of text file bool bRet = false; // Set the initial return value if (Filin.isOpen()) { // Check open state of file Filin.flush(); // Not sure if this is needed Filin.reset(); // Set the file index position to 0 - Filin.readLine(Firstline, QString(TITRAQ_DATAPATTERN).length() + 2L); + Filin.readLine(pReadline, QString(TITRAQ_DATAPATTERN).length() + 2L); } else { - if (!Filin.open(IO_ReadOnly)) // Try to open file + if (!Filin.open(QIODevice::ReadOnly)) // Try to open file throw Genexcept(trUtf8(TITRAQ_READPFILFAIL)); else { // File is now open - Filin.readLine(Firstline, QString(TITRAQ_DATAPATTERN).length() + 2L); + Filin.readLine(pReadline, QString(TITRAQ_DATAPATTERN).length() + 2L); Filin.close(); // Remember to close } } try { // Pass off to worker method + Firstline = QString::fromAscii(pReadline); bRet = this->validateData(Firstline); } catch (Genexcept &) { @@ -489,21 +495,21 @@ QMessageBox Problema(QString(TITRAQ_APPTITLE) + ' ' + asgui_version.v_short, TITRAQ_NOPATTERNFOUND + QString(TITRAQ_DATAPATTERN) + TITRAQ_WASNOTFOUNDIN, QMessageBox::Critical, QMessageBox::Ok | QMessageBox::Escape, - QMessageBox::NoButton, QMessageBox::NoButton); + Qt::NoButton, Qt::NoButton); Problema.exec(); // Give the user the bad news throw Genexcept(TITRAQ_INVALIDDATA); } else if (Linin.section(Datapattern, 1).section('.', 0, 0).toInt() != TITRAQ_DATAVERSIONMAJ) { QMessageBox Problema(QString(TITRAQ_APPTITLE) + ' ' + asgui_version.v_short, TITRAQ_BADVERSIONMAJ, QMessageBox::Warning, QMessageBox::Ok | QMessageBox::Escape, - QMessageBox::NoButton, QMessageBox::NoButton); + Qt::NoButton, Qt::NoButton); Problema.exec(); // Give the user the bad news throw Genexcept(TITRAQ_INCOMPATDATA); } else if (Linin.section(Datapattern, 1).section('.', 1, 1).toInt() > TITRAQ_DATAVERSIONMIN) { QMessageBox Problema(QString(TITRAQ_APPTITLE) + ' ' + asgui_version.v_short, TITRAQ_BADVERSIONMIN, QMessageBox::Warning, QMessageBox::Ok | QMessageBox::Escape, - QMessageBox::NoButton, QMessageBox::NoButton); + Qt::NoButton, Qt::NoButton); Problema.exec(); // Give the user the bad news throw Genexcept(TITRAQ_INCOMPATDATA); } @@ -519,7 +525,7 @@ const QString Titraqform::getRowdata(void) const { QString Rowdata, Tempstring; // For output string - QTableSelection Select = m_pMaintable->selection(0); // Highlighted text + Q3TableSelection Select = m_pMaintable->selection(0); // Highlighted text int nTotal = Select.bottomRow() - Select.topRow() + 1; // Total row select // Calculate rows to delete from selection highlight @@ -569,16 +575,16 @@ // void Titraqform::setRowdata(QString &Rowdata) const { - int nRows = Rowdata.contains(QChar('\n')); // Set so many rows + int nRows = Rowdata.count(QChar('\n')); // Set so many rows int nCurrentrow = m_pMaintable->currentRow(); // Current table row - QTableItem *pItem = NULL; // Old item to change out + Q3TableItem *pItem = NULL; // Old item to change out QString Line, User, Guid, Crc, Rev; // Admin fields in table QString Date, Start, Finish, Amount, Task, Remark; // Viewable fields in table - QTextStream Datastream(&Rowdata, IO_ReadOnly); // Convert data to stream + Q3TextStream Datastream(&Rowdata, QIODevice::ReadOnly); // Convert data to stream for (int nIter = 0; nIter < nRows; ++nIter) { QString Singlerow = Datastream.readLine(); // For linewise operation - QTextStream Rowstream(&Singlerow, IO_ReadOnly); // Convert row to stream + Q3TextStream Rowstream(&Singlerow, QIODevice::ReadOnly); // Convert row to stream Rowstream >> Line >> User >> Guid >> Crc >> Rev; // Stream data fields Rowstream >> Date >> Start >> Finish >> Amount >> Task; // to corresponding vars @@ -604,8 +610,8 @@ // Change out old item and replace with new task data pItem = m_pMaintable->item(nCurrentrow + nIter, TITRAQ_IDXTASK); delete(pItem); // Get rid of the old before going with the new - RtTableItem *pSwapitem = new RtTableItem(m_pMaintable, QTableItem::WhenCurrent, Task); - pSwapitem->setAlignment(AlignLeft | AlignVCenter); + RtTableItem *pSwapitem = new RtTableItem(m_pMaintable, Q3TableItem::WhenCurrent, Task); + pSwapitem->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); m_pMaintable->setItem(nCurrentrow + nIter, TITRAQ_IDXTASK, pSwapitem); // Continue with field processing business as usual diff -r e8292658d5b3 -r c1941114ca88 as_datedit.h --- a/as_datedit.h Fri Nov 28 14:20:00 2008 +0100 +++ b/as_datedit.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,17 +32,17 @@ #ifndef DATEDIT_H #define DATEDIT_H -#include +#include #define TITRAQ_DAYSECTION 2 -class Daydatedit : public QDateEdit +class Daydatedit : public Q3DateEdit { public: Daydatedit(QWidget *pParent = 0, const char *m_kszName = NULL) : - QDateEdit(pParent, m_kszName) {}; + Q3DateEdit(pParent, m_kszName) {}; Daydatedit(const QDate &Date, QWidget *pParent = 0, const char *m_kszName = NULL) : - QDateEdit(Date, pParent, m_kszName) {}; + Q3DateEdit(Date, pParent, m_kszName) {}; bool setDayfocus(void) {return setFocusSection(TITRAQ_DAYSECTION);}; }; diff -r e8292658d5b3 -r c1941114ca88 as_except.cpp --- a/as_except.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_except.cpp 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 @@ -31,6 +31,9 @@ #include "as_except.h" +//Added by qt3to4: +#include + // Report general exception void Genexcept::reportErr(void) diff -r e8292658d5b3 -r c1941114ca88 as_except.h --- a/as_except.h Fri Nov 28 14:20:00 2008 +0100 +++ b/as_except.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,6 +32,8 @@ #ifndef TITRAQEXCEPT_H #define TITRAQEXCEPT_H +#define QT3_SUPPORT + #include diff -r e8292658d5b3 -r c1941114ca88 as_generic.cpp --- a/as_generic.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_generic.cpp 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,6 +29,8 @@ // as_generic.cpp: ISO C++ implementation // +#define QT3_SUPPORT + #include #include "as_generic.h" diff -r e8292658d5b3 -r c1941114ca88 as_generic.h --- a/as_generic.h Fri Nov 28 14:20:00 2008 +0100 +++ b/as_generic.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 diff -r e8292658d5b3 -r c1941114ca88 as_gfx/cwlogo.xpm --- a/as_gfx/cwlogo.xpm Fri Nov 28 14:20:00 2008 +0100 +++ b/as_gfx/cwlogo.xpm 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 diff -r e8292658d5b3 -r c1941114ca88 as_gfx/osspicon.xpm --- a/as_gfx/osspicon.xpm Fri Nov 28 14:20:00 2008 +0100 +++ b/as_gfx/osspicon.xpm 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 diff -r e8292658d5b3 -r c1941114ca88 as_gfx/ossplogo.xpm --- a/as_gfx/ossplogo.xpm Fri Nov 28 14:20:00 2008 +0100 +++ b/as_gfx/ossplogo.xpm 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 diff -r e8292658d5b3 -r c1941114ca88 as_gfx/refresh.xpm --- a/as_gfx/refresh.xpm Fri Nov 28 14:20:00 2008 +0100 +++ b/as_gfx/refresh.xpm 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 diff -r e8292658d5b3 -r c1941114ca88 as_gfx/refreshd.xpm --- a/as_gfx/refreshd.xpm Fri Nov 28 14:20:00 2008 +0100 +++ b/as_gfx/refreshd.xpm 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 diff -r e8292658d5b3 -r c1941114ca88 as_gfx/revcolour.xpm --- a/as_gfx/revcolour.xpm Fri Nov 28 14:20:00 2008 +0100 +++ b/as_gfx/revcolour.xpm 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 diff -r e8292658d5b3 -r c1941114ca88 as_gfx/rowadd.xpm --- a/as_gfx/rowadd.xpm Fri Nov 28 14:20:00 2008 +0100 +++ b/as_gfx/rowadd.xpm 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 diff -r e8292658d5b3 -r c1941114ca88 as_gfx/rowaddd.xpm --- a/as_gfx/rowaddd.xpm Fri Nov 28 14:20:00 2008 +0100 +++ b/as_gfx/rowaddd.xpm 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 diff -r e8292658d5b3 -r c1941114ca88 as_gfx/rowdel.xpm --- a/as_gfx/rowdel.xpm Fri Nov 28 14:20:00 2008 +0100 +++ b/as_gfx/rowdel.xpm 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 diff -r e8292658d5b3 -r c1941114ca88 as_gfx/rowdeld.xpm --- a/as_gfx/rowdeld.xpm Fri Nov 28 14:20:00 2008 +0100 +++ b/as_gfx/rowdeld.xpm 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 diff -r e8292658d5b3 -r c1941114ca88 as_gfx/sync.xpm --- a/as_gfx/sync.xpm Fri Nov 28 14:20:00 2008 +0100 +++ b/as_gfx/sync.xpm 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 diff -r e8292658d5b3 -r c1941114ca88 as_gui.cpp --- a/as_gui.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_gui.cpp 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 @@ -36,13 +36,16 @@ #include "as_const.h" // Application constants #include "as_pref.h" // Class Preferences +//Added by qt3to4: +#include + // // Construct a Titraqform which is a child of 'pParent', with the // name 'kszName' and widget flags set to 'Flags' // -Titraqform::Titraqform(QWidget *pParent, const char *kszName, WFlags Flags) : - QMainWindow(pParent, kszName, Flags) +Titraqform::Titraqform(QWidget *pParent, const char *kszName, Qt::WFlags Flags) : + Q3MainWindow(pParent, kszName, Flags) { // Early initializations m_pFiletools = NULL; @@ -81,8 +84,8 @@ // Rehydrate main window layout and doc positions QString Laystring = m_pPrefs->getString(TITRAQ_PREFFRAMELAY, NULL); // FIXME: Handle first case better - QTextStream Laystream(&Laystring, IO_ReadOnly); - Laystream >> *this; +// Q3TextStream Laystream(&Laystring, QIODevice::ReadOnly); +// Laystream >> *this; // // Lock down window size // setSizePolicy(QSizePolicy((QSizePolicy::SizeType)0, 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 }; diff -r e8292658d5b3 -r c1941114ca88 as_gui_test.sh --- a/as_gui_test.sh Fri Nov 28 14:20:00 2008 +0100 +++ b/as_gui_test.sh 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 diff -r e8292658d5b3 -r c1941114ca88 as_helpanel.cpp --- a/as_helpanel.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_helpanel.cpp 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,18 @@ // as_helpanel.cpp: ISO C++ implementation // +#define QT3_SUPPORT + #include #include -#include +#include #include #include -#include +#include + +//Added by qt3to4: +#include +#include #include "as_helpanel.h" @@ -48,7 +54,7 @@ // The dialog will by default be modal, unless you set 'bModal' to // false to construct a modeless dialog. // -Helpanel::Helpanel(const QString &kSource, QWidget *pParent, const char *kszName, bool bModal, WFlags Flags) +Helpanel::Helpanel(const QString &kSource, QWidget *pParent, const char *kszName, bool bModal, Qt::WFlags Flags) : QDialog(pParent, kszName, bModal, Flags) { // Boilerplate code to initialize the panel @@ -61,16 +67,16 @@ (QSizePolicy::SizeType)5, 0, 0, this->sizePolicy().hasHeightForWidth())); // Build panel using already constructed widgets and layouts - m_pFormlay = new QVBoxLayout(this, 11, 6, "Formlayout"); + m_pFormlay = new Q3VBoxLayout(this, 11, 6, "Formlayout"); // Groupbox and its text display - m_pBrowser = new QTextBrowser(this, "Helpbrowser"); + m_pBrowser = new Q3TextBrowser(this, "Helpbrowser"); m_pBrowser->setSource(QString(TITRAQ_DOCDIR) + QChar('/') + kSource); m_pBrowser->setReadOnly(true); m_pBrowser->setFocus(); // Add a spacer to sideline the otherwise massive dismiss button - m_pButtlay = new QHBoxLayout(0, 0, 6, "Buttonlayout"); + m_pButtlay = new Q3HBoxLayout(0, 0, 6, "Buttonlayout"); QSpacerItem *pSpacey = new QSpacerItem(40, 20, QSizePolicy::Minimum, QSizePolicy::Minimum); m_pButtlay->addItem(pSpacey); @@ -101,9 +107,9 @@ // Top level push buttons associated with accept and save slots m_pDismissbutt->setText(trUtf8("Dismiss", "Comment for Dismissbutton")); QToolTip::add(m_pDismissbutt, trUtf8("Closes the help panel", "Comment for tooltip Dismissbutton")); - QWhatsThis::add(m_pDismissbutt, trUtf8("The dismiss button dismisses the help panel", "Comment for whatsThis Dismissbutton")); + Q3WhatsThis::add(m_pDismissbutt, trUtf8("The dismiss button dismisses the help panel", "Comment for whatsThis Dismissbutton")); // The main text browser window which presents the HTML help contents - QWhatsThis::add(m_pBrowser, trUtf8("The text browser window displays the help contents", "Comment for whatsThis Browser")); + Q3WhatsThis::add(m_pBrowser, trUtf8("The text browser window displays the help contents", "Comment for whatsThis Browser")); } } // namespace AS diff -r e8292658d5b3 -r c1941114ca88 as_helpanel.h --- a/as_helpanel.h Fri Nov 28 14:20:00 2008 +0100 +++ b/as_helpanel.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,17 +29,23 @@ // as_helpanel.h: ISO C++ interface // +#define QT3_SUPPORT + #ifndef HELPANEL_H #define HELPANEL_H #include #include +//Added by qt3to4: +#include +#include -class QVBoxLayout; -class QHBoxLayout; + +class Q3VBoxLayout; +class Q3HBoxLayout; class QPushButton; -class QTextBrowser; +class Q3TextBrowser; namespace AS { @@ -49,16 +55,16 @@ public: Helpanel(const QString &, QWidget *pParent = 0, const char *kszName = 0, - bool bModal = true, WFlags Flags = 0); + bool bModal = true, Qt::WFlags Flags = 0); // ~Helpanel(void); // No need to destroy widgets, because qt does it for us public: - QTextBrowser *m_pBrowser; + Q3TextBrowser *m_pBrowser; QPushButton *m_pDismissbutt; protected: - QVBoxLayout *m_pFormlay; - QHBoxLayout *m_pButtlay; + Q3VBoxLayout *m_pFormlay; + Q3HBoxLayout *m_pButtlay; protected slots: virtual void textChange(void); diff -r e8292658d5b3 -r c1941114ca88 as_main.cpp --- a/as_main.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_main.cpp 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,6 +29,8 @@ // as_main.cpp: ISO C++ implementation // +#define QT3_SUPPORT + #include #include "as_gui.h" diff -r e8292658d5b3 -r c1941114ca88 as_numdial.cpp --- a/as_numdial.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_numdial.cpp 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,13 +32,17 @@ #include "as_numdial.h" #include -#include +#include #include #include #include #include #include -#include +#include + +//Added by qt3to4: +#include +#include #include "as_const.h" @@ -52,7 +56,7 @@ // The dialog will by default be modal, unless you set 'bModal' to // false to construct a modeless dialog. // -Numdial::Numdial(QWidget *pParent, const char *kszName, bool bModal, WFlags Flags) +Numdial::Numdial(QWidget *pParent, const char *kszName, bool bModal, Qt::WFlags Flags) : QDialog(pParent, kszName, bModal, Flags) { // Boilerplate code to initialize the panel @@ -64,12 +68,12 @@ this->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, this->sizePolicy().hasHeightForWidth())); - m_pFrame = new QFrame(this, "Mainframe"); - m_pFrame->setFrameShape(QFrame::StyledPanel); - m_pFrame->setFrameShadow(QFrame::Raised); - m_pFramelay = new QVBoxLayout(m_pFrame, 11, 6, "Framelay"); - m_pInputlay = new QHBoxLayout(0, 0, 6, "Horizontallayout"); - m_pFormlayout = new QVBoxLayout(this, 11, 6, "Formlayout"); + m_pFrame = new Q3Frame(this, "Mainframe"); + m_pFrame->setFrameShape(Q3Frame::StyledPanel); + m_pFrame->setFrameShadow(Q3Frame::Raised); + m_pFramelay = new Q3VBoxLayout(m_pFrame, 11, 6, "Framelay"); + m_pInputlay = new Q3HBoxLayout(0, 0, 6, "Horizontallayout"); + m_pFormlayout = new Q3VBoxLayout(this, 11, 6, "Formlayout"); m_pReportlabel = new QLabel(m_pFrame, "Reportlabel"); m_pReportlabel->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)4, (QSizePolicy::SizeType)5, 0, 0, m_pReportlabel->sizePolicy().hasHeightForWidth())); @@ -88,7 +92,7 @@ m_pFramelay->addLayout(m_pInputlay); // Push button suite - m_pButtlay = new QHBoxLayout(0, 0, 6, "Buttlay"); + m_pButtlay = new Q3HBoxLayout(0, 0, 6, "Buttlay"); m_pOkaybutt = new QPushButton(m_pFrame, "Okaybutton"); m_pOkaybutt->setPaletteBackgroundColor(QColor(198, 196, 186)); m_pOkaybutt->setCursor(QCursor(13)); @@ -122,13 +126,13 @@ // Top level push buttons associated with accept slot m_pCancelbutt->setText(trUtf8("Cancel", "Comment for Cancelbutton")); QToolTip::add(m_pCancelbutt, trUtf8("Closes the report panel", "Comment for tooltip Cancelbutton")); - QWhatsThis::add(m_pCancelbutt, trUtf8("The cancel button closes the report panel without further action", "Comment for whatsThis Cancelbutton")); + Q3WhatsThis::add(m_pCancelbutt, trUtf8("The cancel button closes the report panel without further action", "Comment for whatsThis Cancelbutton")); m_pOkaybutt->setText(trUtf8("Okay", "Comment for Okaybutton")); QToolTip::add(m_pOkaybutt, trUtf8("Aknowleges your input", "Comment for tooltip Okaybutton")); - QWhatsThis::add(m_pOkaybutt, trUtf8("The okay button aknowleges your input and prepares for action", "Comment for whatsThis Okaybutton")); + Q3WhatsThis::add(m_pOkaybutt, trUtf8("The okay button aknowleges your input and prepares for action", "Comment for whatsThis Okaybutton")); // Text help for spinbox number input QToolTip::add(m_pSpinbox, trUtf8("Input a number", "Comment for tooltip Spinbox")); - QWhatsThis::add(m_pSpinbox, trUtf8("Click on the arrows or type to input a number", "Comment for whatsThis Spinbox")); + Q3WhatsThis::add(m_pSpinbox, trUtf8("Click on the arrows or type to input a number", "Comment for whatsThis Spinbox")); } } // namespace AS diff -r e8292658d5b3 -r c1941114ca88 as_numdial.h --- a/as_numdial.h Fri Nov 28 14:20:00 2008 +0100 +++ b/as_numdial.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,6 +29,8 @@ // as_numdial.h: ISO C++ interface // +#define QT3_SUPPORT + #ifndef NUMDIALOG_H #define NUMDIALOG_H @@ -36,11 +38,18 @@ #include #include +//Added by qt3to4: +#include +#include +#include +#include +#include -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QFrame; + +class Q3VBoxLayout; +class Q3HBoxLayout; +class Q3GridLayout; +class Q3Frame; class QLabel; class QPushButton; @@ -51,10 +60,10 @@ Q_OBJECT public: - Numdial(QWidget *pParent = 0, const char *pkcName = 0, bool bModal = true, WFlags Flags = 0); + Numdial(QWidget *pParent = 0, const char *pkcName = 0, bool bModal = true, Qt::WFlags Flags = 0); // ~Numdial(void); // No need to destroy widgets, because qt does it for us - QFrame *m_pFrame; + Q3Frame *m_pFrame; QLabel *m_pReportlabel; QSpinBox *m_pSpinbox; QLabel *m_pWeeklabel; @@ -62,10 +71,10 @@ QPushButton *m_pCancelbutt; protected: - QVBoxLayout *m_pFormlayout; - QVBoxLayout *m_pFramelay; - QHBoxLayout *m_pInputlay; - QHBoxLayout *m_pButtlay; + Q3VBoxLayout *m_pFormlayout; + Q3VBoxLayout *m_pFramelay; + Q3HBoxLayout *m_pInputlay; + Q3HBoxLayout *m_pButtlay; protected slots: virtual void textChange(); diff -r e8292658d5b3 -r c1941114ca88 as_panel.cpp --- a/as_panel.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_panel.cpp 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,10 +29,18 @@ // as_panel.cpp: ISO C++ implementation // +#define QT3_SUPPORT + #include #include +//Added by qt3to4: +#include +#include +#include +#include + #include "as_panel.h" #include "as_generic.h" #include "as_const.h" @@ -46,7 +54,7 @@ // The dialog will by default be modal, unless you set 'bModal' to // false to construct a modeless dialog. // -Prefpanel::Prefpanel(QWidget *pParent, const char *kszName, bool bModal, WFlags Flags) +Prefpanel::Prefpanel(QWidget *pParent, const char *kszName, bool bModal, Qt::WFlags Flags) : QDialog(pParent, kszName, bModal, Flags) { if (!kszName) @@ -60,20 +68,20 @@ m_pLight = new QColor(); m_pDark = new QColor(); - m_pVlayout = new QVBoxLayout(this, 11, 6, "Formlayout"); + m_pVlayout = new Q3VBoxLayout(this, 11, 6, "Formlayout"); m_pTabselect = new QTabWidget(this, "Tabselector"); // Start of style chooser UI pieces m_pBoolpage = new QWidget(m_pTabselect, "Tabpage"); - m_pBoolayout = new QHBoxLayout(m_pBoolpage, 11, 6, "Genlayout"); - m_pBinlayout = new QVBoxLayout(0, 0, 6, "Binarylayout"); - m_pStylegroup = new QButtonGroup(m_pBoolpage, "Stylebuttongroup"); + m_pBoolayout = new Q3HBoxLayout(m_pBoolpage, 11, 6, "Genlayout"); + m_pBinlayout = new Q3VBoxLayout(0, 0, 6, "Binarylayout"); + m_pStylegroup = new Q3ButtonGroup(m_pBoolpage, "Stylebuttongroup"); m_pStylegroup->setColumnLayout(0, Qt::Vertical); m_pStylegroup->layout()->setSpacing(6); m_pStylegroup->layout()->setMargin(11); m_pStylegroup->setExclusive(true); - m_pStylelay = new QVBoxLayout(m_pStylegroup->layout()); + m_pStylelay = new Q3VBoxLayout(m_pStylegroup->layout()); m_pStylelay->setAlignment(Qt::AlignTop); // Block to handle a vector of radio buttons @@ -91,56 +99,56 @@ Stylevector[nIter]->sizePolicy().hasHeightForWidth()); QToolTip::add(Stylevector[nIter], trUtf8("The " + *Stylename + " style", "Comment for toolTip " + *Stylename)); - QWhatsThis::add(Stylevector[nIter], trUtf8("Click this button to enjoy the style of the " + Q3WhatsThis::add(Stylevector[nIter], trUtf8("Click this button to enjoy the style of the " + *Stylename + " user interface", "Comment whatsThis for " + *Stylename)); m_pStylelay->addWidget(Stylevector[nIter]); nIter++; } // Start of binary option UI pieces (like make backups, yes or no) - m_pSwitchgroup = new QButtonGroup(m_pBoolpage, "Switchbuttongroup"); + m_pSwitchgroup = new Q3ButtonGroup(m_pBoolpage, "Switchbuttongroup"); m_pSwitchgroup->setColumnLayout(0, Qt::Vertical); m_pSwitchgroup->layout()->setSpacing(6); m_pSwitchgroup->layout()->setMargin(11); m_pSwitchgroup->setExclusive(false); - m_pSwitchlay = new QVBoxLayout(m_pSwitchgroup->layout()); + m_pSwitchlay = new Q3VBoxLayout(m_pSwitchgroup->layout()); m_pSwitchlay->setAlignment(Qt::AlignTop); // Optional file backups with hard coded extension .bak m_pBackupcheck = new QCheckBox(m_pSwitchgroup, "Backupbutton"); m_pBackupcheck->setText(trUtf8("Make .bak file on save", "Comment for Backupcheck")); QToolTip::add(m_pBackupcheck, trUtf8("Make a .bak file when saving", "Comment for toolTip Backupcheck")); - QWhatsThis::add(m_pBackupcheck, trUtf8("Check this box to enable automatic file backups when overwriting an existing file", "Comment whatsThis for Backupcheck")); + Q3WhatsThis::add(m_pBackupcheck, trUtf8("Check this box to enable automatic file backups when overwriting an existing file", "Comment whatsThis for Backupcheck")); m_pSwitchlay->addWidget(m_pBackupcheck); // Optional easy filename appending with hard coded extension .as m_pExtendcheck = new QCheckBox(m_pSwitchgroup, "Extensionbutton"); m_pExtendcheck->setText(trUtf8("Append .as extension", "Comment for Extensioncheck")); QToolTip::add(m_pExtendcheck, trUtf8("Use the .as file extension", "Comment for toolTip Extensioncheck")); - QWhatsThis::add(m_pExtendcheck, trUtf8("Check this box to automatically append '.as' to new filenames when saving", "Comment whatsThis for Extensioncheck")); + Q3WhatsThis::add(m_pExtendcheck, trUtf8("Check this box to automatically append '.as' to new filenames when saving", "Comment whatsThis for Extensioncheck")); m_pSwitchlay->addWidget(m_pExtendcheck); // Start of report option UI pieces (like detailed report listings) - m_pReportgroup = new QButtonGroup(m_pBoolpage, "Reportbuttongroup"); + m_pReportgroup = new Q3ButtonGroup(m_pBoolpage, "Reportbuttongroup"); m_pReportgroup->setColumnLayout(0, Qt::Vertical); m_pReportgroup->layout()->setSpacing(6); m_pReportgroup->layout()->setMargin(11); m_pReportgroup->setExclusive(false); - m_pReportlay = new QVBoxLayout(m_pReportgroup->layout()); + m_pReportlay = new Q3VBoxLayout(m_pReportgroup->layout()); m_pReportlay->setAlignment(Qt::AlignTop); // Optional detailed report listings write all events in range m_pDetailcheck = new QCheckBox(m_pReportgroup, "Detailistbutton"); m_pDetailcheck->setText(trUtf8("Detailed listing", "Comment for Detailcheck")); QToolTip::add(m_pDetailcheck, trUtf8("Write detailed event listings", "Comment for toolTip Detailcheck")); - QWhatsThis::add(m_pDetailcheck, trUtf8("Check this box to enable writing of detailed event listings to the local report", "Comment whatsThis for Detailcheck")); + Q3WhatsThis::add(m_pDetailcheck, trUtf8("Check this box to enable writing of detailed event listings to the local report", "Comment whatsThis for Detailcheck")); m_pReportlay->addWidget(m_pDetailcheck); // Optional signature line in report footer m_pSigncheck = new QCheckBox(m_pReportgroup, "Signaturebutton"); m_pSigncheck->setText(trUtf8("Signature line", "Comment for Signaturecheck")); QToolTip::add(m_pSigncheck, trUtf8("Append a signature line", "Comment for toolTip Signaturecheck")); - QWhatsThis::add(m_pSigncheck, trUtf8("Check this box to write a signature line to the report footer", "Comment whatsThis for Signaturecheck")); + Q3WhatsThis::add(m_pSigncheck, trUtf8("Check this box to write a signature line to the report footer", "Comment whatsThis for Signaturecheck")); m_pReportlay->addWidget(m_pSigncheck); m_pBoolayout->addWidget(m_pStylegroup); m_pBinlayout->addWidget(m_pReportgroup); @@ -150,16 +158,16 @@ // Start of paths page UI pieces m_pGeneralpage = new QWidget(m_pTabselect, "Generalpage"); - m_pGenlayout = new QHBoxLayout(m_pGeneralpage, 11, 6, "Genlayout"); - m_pGenbox = new QGroupBox(m_pGeneralpage, "Groupboxlayout"); + m_pGenlayout = new Q3HBoxLayout(m_pGeneralpage, 11, 6, "Genlayout"); + m_pGenbox = new Q3GroupBox(m_pGeneralpage, "Groupboxlayout"); m_pGenbox->setColumnLayout(0, Qt::Vertical); m_pGenbox->layout()->setSpacing(6); m_pGenbox->layout()->setMargin(11); - m_pGenboxlay = new QHBoxLayout(m_pGenbox->layout()); + m_pGenboxlay = new Q3HBoxLayout(m_pGenbox->layout()); m_pGenboxlay->setAlignment(Qt::AlignTop); // Start of path text entry preferences UI pieces - m_pGeninner = new QGridLayout(0, 4, 2, 0, 16, "Innergrid"); + m_pGeninner = new Q3GridLayout(0, 4, 2, 0, 16, "Innergrid"); m_pAcctlabel = new QLabel(m_pGenbox, "Accfilelabel"); m_pGeninner->addWidget(m_pAcctlabel, 0, 0); m_pAcctline = new QLineEdit(m_pGenbox, "Accountline"); @@ -183,17 +191,17 @@ // Start of remote page UI pieces m_pRemotepage = new QWidget(m_pTabselect, "Remotepage"); - m_pRemlayout = new QHBoxLayout(m_pRemotepage, 11, 6, "Remlayout"); - m_pRembox = new QGroupBox(m_pRemotepage, "Remoteboxlayout"); + m_pRemlayout = new Q3HBoxLayout(m_pRemotepage, 11, 6, "Remlayout"); + m_pRembox = new Q3GroupBox(m_pRemotepage, "Remoteboxlayout"); m_pRembox->setColumnLayout(0, Qt::Vertical); m_pRembox->layout()->setSpacing(6); m_pRembox->layout()->setMargin(11); - m_pRemboxlay = new QHBoxLayout(m_pRembox->layout()); + m_pRemboxlay = new Q3HBoxLayout(m_pRembox->layout()); m_pRemboxlay->setAlignment(Qt::AlignTop); // Start of RPC preferences UI pieces - m_pReminner = new QGridLayout(0, 5, 2, 0, 12, "Innergrid"); + m_pReminner = new Q3GridLayout(0, 5, 2, 0, 12, "Innergrid"); m_pCorbalabel = new QLabel(m_pRembox, "Corbalabel"); m_pReminner->addWidget(m_pCorbalabel, 0, 0); m_pCorbaline = new QLineEdit(m_pRembox, "Corbaline"); @@ -215,20 +223,20 @@ // Start of color page UI pieces m_pColourpage = new QWidget(m_pTabselect, "Colourpage"); - m_pColourlayout = new QHBoxLayout(m_pColourpage, 11, 6, "Colourlayout"); - m_pShadebox = new QGroupBox(m_pColourpage, "Shadegroupbox"); + m_pColourlayout = new Q3HBoxLayout(m_pColourpage, 11, 6, "Colourlayout"); + m_pShadebox = new Q3GroupBox(m_pColourpage, "Shadegroupbox"); m_pShadebox->setColumnLayout(0, Qt::Horizontal); m_pShadebox->layout()->setSpacing(6); m_pShadebox->layout()->setMargin(11); - m_pShadeboxlay = new QVBoxLayout(m_pShadebox->layout()); + m_pShadeboxlay = new Q3VBoxLayout(m_pShadebox->layout()); m_pShadeboxlay->setAlignment(Qt::AlignTop); - m_pShadelayout = new QGridLayout(0, 2, 2, 6, 16, "Shadelayout"); + m_pShadelayout = new Q3GridLayout(0, 2, 2, 6, 16, "Shadelayout"); m_pLightlab = new QLabel(m_pShadebox, "Lightlabel"); m_pLightlab->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred, this->sizePolicy().hasHeightForWidth()); m_pShadelayout->addWidget(m_pLightlab, 0, 0); m_pLightbutt = new QToolButton(m_pShadebox, "Lightbutton"); - m_pLightbutt->setFocusPolicy(QToolButton::TabFocus); + m_pLightbutt->setFocusPolicy(Qt::TabFocus); m_pLightbutt->setCursor(QCursor(13)); m_pShadelayout->addWidget(m_pLightbutt, 0, 1); @@ -236,23 +244,23 @@ m_pDarklab->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred, this->sizePolicy().hasHeightForWidth()); m_pShadelayout->addWidget(m_pDarklab, 1, 0); m_pDarkbutt = new QToolButton(m_pShadebox, "Darkbutton"); - m_pDarkbutt->setFocusPolicy(QToolButton::TabFocus); + m_pDarkbutt->setFocusPolicy(Qt::TabFocus); m_pDarkbutt->setCursor(QCursor(13)); m_pShadelayout->addWidget(m_pDarkbutt, 1, 1); m_pRevertlab = new QLabel(m_pShadebox, "Revertlabel"); m_pShadelayout->addWidget(m_pRevertlab, 2, 0); m_pRevertbutt = new QToolButton(m_pShadebox, "Revertbutton"); - m_pRevertbutt->setFocusPolicy(QToolButton::TabFocus); + m_pRevertbutt->setFocusPolicy(Qt::TabFocus); // m_pRevertbutt->setIconSet(QIconSet(QPixmap(s_kpcRevcolour_xpm))); m_pRevertbutt->setCursor(QCursor(13)); m_pShadelayout->addWidget(m_pRevertbutt, 2, 1); - m_pThemebox = new QGroupBox(m_pColourpage, "Themegroupbox"); + m_pThemebox = new Q3GroupBox(m_pColourpage, "Themegroupbox"); m_pThemebox->setColumnLayout(0, Qt::Vertical); m_pThemebox->layout()->setSpacing(6); m_pThemebox->layout()->setMargin(11); - m_pThemeboxlay = new QVBoxLayout(m_pThemebox->layout()); + m_pThemeboxlay = new Q3VBoxLayout(m_pThemebox->layout()); QLabel *pPlaceholder = new QLabel(m_pThemebox, "Placeholderlabel"); pPlaceholder->setText(trUtf8("Reserved for future use", "Comment for Placeholderlabel")); @@ -271,7 +279,7 @@ m_pVlayout->addWidget(m_pTabselect); // Start of bottom buttons for aknowlegement and commital of changes - m_pButtlay = new QHBoxLayout(0, 0, 12, "Buttonlayout"); + m_pButtlay = new Q3HBoxLayout(0, 0, 12, "Buttonlayout"); m_pOkaybutton = new QPushButton(this, "Okaybutton"); m_pOkaybutton->setMinimumWidth(120); m_pOkaybutton->setPaletteBackgroundColor(QColor(202, 194, 182)); @@ -371,15 +379,15 @@ m_pOkaybutton->setText(trUtf8("Okay", "Comment for Okaybutton")); QToolTip::add(m_pOkaybutton, trUtf8("Applies and saves changes", "Comment for tooltip Okaybutton")); - QWhatsThis::add(m_pOkaybutton, trUtf8("The okay button applies and saves changes", "Comment for whatsThis Okaybutton")); + Q3WhatsThis::add(m_pOkaybutton, trUtf8("The okay button applies and saves changes", "Comment for whatsThis Okaybutton")); m_pApplybutton->setText(trUtf8("Apply", "Comment for Applybutton")); QToolTip::add(m_pApplybutton, trUtf8("Apply changes immediately", "Comment for toolTip Applybutton")); - QWhatsThis::add(m_pApplybutton, trUtf8("The apply button applies changes immediately", "Comment for whatsThis Applybutton")); + Q3WhatsThis::add(m_pApplybutton, trUtf8("The apply button applies changes immediately", "Comment for whatsThis Applybutton")); m_pCancelbutton->setText(trUtf8("Cancel", "Comment for Cancelbutton")); QToolTip::add(m_pCancelbutton, trUtf8("Cancel any changes", "Comment for toolTip Cancelbutton")); - QWhatsThis::add(m_pCancelbutton, trUtf8("The cancel button cancels any changes", "Comment for whatsThis Cancelbutton")); + Q3WhatsThis::add(m_pCancelbutton, trUtf8("The cancel button cancels any changes", "Comment for whatsThis Cancelbutton")); m_pGenbox->setTitle(trUtf8("File and directory paths", "Comment for Genbox")); m_pAcctlabel->setText(trUtf8("Accounts path", "Comment for Acctlabel")); @@ -399,11 +407,11 @@ m_pCorbacheck->setText(trUtf8("Enable IIOP transmission", "Comment for Corbacheck")); QToolTip::add(m_pCorbacheck, trUtf8("Will enable transmission over IIOP", "Comment for toolTip Corbacheck")); - QWhatsThis::add(m_pCorbacheck, trUtf8("Check this box to enable transmission to a CORBA host", "Comment whatsThis for Corbacheck")); + Q3WhatsThis::add(m_pCorbacheck, trUtf8("Check this box to enable transmission to a CORBA host", "Comment whatsThis for Corbacheck")); m_pSoapcheck->setText(trUtf8("Enable SOAP transmission", "Comment for Soapcheck")); QToolTip::add(m_pSoapcheck, trUtf8("Will enable transmission over SOAP", "Comment for toolTip Soapcheck")); - QWhatsThis::add(m_pSoapcheck, trUtf8("Check this box to enable transmission to a SOAP host", "Comment whatsThis for Soapcheck")); + Q3WhatsThis::add(m_pSoapcheck, trUtf8("Check this box to enable transmission to a SOAP host", "Comment whatsThis for Soapcheck")); m_pShadebox->setTitle(trUtf8("Row shading", "Comment for Shadebox")); m_pThemebox->setTitle(trUtf8("Skin themes", "Comment for Themebox")); @@ -412,9 +420,9 @@ m_pDarklab->setText(trUtf8("Dark", "Comment for Darklabel")); m_pRevertlab->setText(trUtf8("Revert", "Comment for Revertlabel")); QToolTip::add(m_pLightbutt, trUtf8("Light row shading colour", "Comment for tooltip Lightbutt")); - QWhatsThis::add(m_pLightbutt, trUtf8("The Light button sets the light row shading colour.", "Comment for whatsThis Lightbutt")); + Q3WhatsThis::add(m_pLightbutt, trUtf8("The Light button sets the light row shading colour.", "Comment for whatsThis Lightbutt")); QToolTip::add(m_pDarkbutt, trUtf8("Dark row shading colour", "Comment for tooltip Darkbutt")); - QWhatsThis::add(m_pDarkbutt, trUtf8("The Dark button sets the light row shading colour.", "Comment for whatsThis Darkbutt")); + Q3WhatsThis::add(m_pDarkbutt, trUtf8("The Dark button sets the light row shading colour.", "Comment for whatsThis Darkbutt")); m_pStylegroup->setTitle(trUtf8("Available styles", "Comment for Stylebuttons")); m_pReportgroup->setTitle(trUtf8("Report options", "Comment for Reportbox")); 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; diff -r e8292658d5b3 -r c1941114ca88 as_pref.cpp --- a/as_pref.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_pref.cpp Fri Dec 05 23:14:02 2008 +0100 @@ -28,7 +28,9 @@ // TODO: Fix up error reporting -#include +#define QT3_SUPPORT + +#include #include #include @@ -235,7 +237,7 @@ { // open file QFile* datafile = new QFile(file_); - if (!datafile->open(IO_ReadOnly)) { + if (!datafile->open(QIODevice::ReadOnly)) { // error opening file qWarning("Error: cannot open preferences file " + file_); datafile->close(); @@ -335,7 +337,7 @@ // open file QFile* datafile = new QFile(file_); - if (!datafile->open(IO_WriteOnly)) { + if (!datafile->open(QIODevice::WriteOnly)) { // error opening file qWarning("Error: Cannot open preferences file " + file_); datafile->close(); diff -r e8292658d5b3 -r c1941114ca88 as_rand.cpp --- a/as_rand.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_rand.cpp 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 diff -r e8292658d5b3 -r c1941114ca88 as_rand.h --- a/as_rand.h Fri Nov 28 14:20:00 2008 +0100 +++ b/as_rand.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 diff -r e8292658d5b3 -r c1941114ca88 as_reportpanel.cpp --- a/as_reportpanel.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_reportpanel.cpp 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,23 +29,30 @@ // as_reportpanel.cpp: ISO C++ implementation // +#define QT3_SUPPORT + #include #include -#include +#include #include -#include -#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include #include #include +//Added by qt3to4: +#include +#include +#include + #include "as_reportpanel.h" #include "as_numdial.h" #include "as_table.h" @@ -71,7 +78,7 @@ // Reportpanel::Reportpanel(TiTable *pTable, Preferences *pPreferences, QWidget *pParent, const char *kszName, - bool bModal, WFlags Flags) + bool bModal, Qt::WFlags Flags) : QDialog(pParent, kszName, bModal, Flags) { // Boilerplate code to initialize the panel @@ -93,13 +100,13 @@ m_nMonths = m_pReprefs->getNumber(TITRAQ_PREFREPORTMONTHS, TITRAQ_DEFREPORTMONTHS); // Build panel using already constructed widgets and layouts - m_pFormlay = new QVBoxLayout(this, 11, 6, "Formlayout"); - m_pToolay = new QHBoxLayout(0, 0, 6, "Toolbuttonlay"); - m_pPushlay = new QHBoxLayout(0, 0, 6, "Pushbuttonlay"); + m_pFormlay = new Q3VBoxLayout(this, 11, 6, "Formlayout"); + m_pToolay = new Q3HBoxLayout(0, 0, 6, "Toolbuttonlay"); + m_pPushlay = new Q3HBoxLayout(0, 0, 6, "Pushbuttonlay"); // Groupbox and its text display - m_pBrowser = new QTextEdit(this, "Reportbrowser"); - m_pBrowser->setTextFormat(PlainText); + m_pBrowser = new Q3TextEdit(this, "Reportbrowser"); + m_pBrowser->setTextFormat(Qt::PlainText); m_pBrowser->setReadOnly(true); m_pBrowser->setFont(QFont("Courier", 10)); m_pFormlay->addWidget(m_pBrowser); @@ -109,26 +116,26 @@ m_pFormlay->addLayout(m_pPushlay); // Tool button suite - m_pWeekmonthgroup = new QButtonGroup(this, "Weekmonthgroup"); + m_pWeekmonthgroup = new Q3ButtonGroup(this, "Weekmonthgroup"); m_pWeekmonthgroup->setColumnLayout(0, Qt::Horizontal); m_pWeekmonthgroup->layout()->setSpacing(11); m_pWeekmonthgroup->layout()->setMargin(0); - m_pWeekmonthlay = new QHBoxLayout(m_pWeekmonthgroup->layout()); - m_pWeekmonthgroup->setFrameShape(QFrame::NoFrame); + m_pWeekmonthlay = new Q3HBoxLayout(m_pWeekmonthgroup->layout()); + //m_pWeekmonthgroup->setFrameShape(QFrame::NoFrame); m_pWeekmonthgroup->setExclusive(true); m_pWeeklybutt = new QToolButton(m_pWeekmonthgroup, "Weeklybutton"); // m_pWeeklybutt->setPaletteBackgroundColor(QColor(198, 196, 186)); - m_pWeeklybutt->setFocusPolicy(QWidget::TabFocus); + m_pWeeklybutt->setFocusPolicy(Qt::TabFocus); m_pWeeklybutt->setCursor(QCursor(13)); m_pWeeklybutt->setToggleButton(true); m_pMonthlybutt = new QToolButton(m_pWeekmonthgroup, "Monthlybutton"); // m_pMonthlybutt->setPaletteBackgroundColor(QColor(198, 196, 186)); - m_pMonthlybutt->setFocusPolicy(QWidget::TabFocus); + m_pMonthlybutt->setFocusPolicy(Qt::TabFocus); m_pMonthlybutt->setCursor(QCursor(13)); m_pMonthlybutt->setToggleButton(true); // Popup for number of weeks - m_pWeekpop = new QPopupMenu(this); + m_pWeekpop = new Q3PopupMenu(this); if (m_pWeekpop == NULL) // Sanity check throw Genexcept("Weekly toolbutton popup creation failed."); m_pWeekpop->insertItem(trUtf8("One week"), this, SLOT(reportWeeks(int))); @@ -146,7 +153,7 @@ } // Popup for number of months - m_pMonthpop = new QPopupMenu(this); + m_pMonthpop = new Q3PopupMenu(this); if (m_pMonthpop == NULL) // Sanity check throw Genexcept("Monthly toolbutton popup creation failed."); m_pMonthpop->insertItem(trUtf8("One month"), this, SLOT(reportMonths(int))); @@ -525,15 +532,16 @@ Tempstring = m_pReptable->text(nIter, TITRAQ_IDXTASK); Tempdate = QDate::fromString(m_pReptable->text(nIter, TITRAQ_IDXDATE), Qt::ISODate); if (!Tempstring.isEmpty() && Firstday <= Tempdate && Tempdate < Lastday) { - string Convstring = Tempstring; // Convert to string (can't cast?) + string Convstring = Tempstring.toStdString(); // Convert to string (can't cast?) QTime Intable = QTime::fromString(m_pReptable->text(nIter, TITRAQ_IDXAMOUNT), Qt::ISODate); - int nTothours = QString(Hashtasks[Convstring]).section(':', 0, 0).toInt() + Intable.hour(); - int nTotminut = QString(Hashtasks[Convstring]).section(':', 1, 1).toInt() + Intable.minute(); + string Gethashed = Hashtasks[Convstring]; + int nTothours = QString::fromStdString(Gethashed).section(':', 0, 0).toInt() + Intable.hour();; + int nTotminut = QString::fromStdString(Gethashed).section(':', 1, 1).toInt() + Intable.minute(); nTothours += nTotminut / 60; nTotminut %= 60; QString Hours = QString::number(nTothours).rightJustify(3, ' '); QString Mins = QString::number(nTotminut).rightJustify(2, '0'); - string Timestring = Hours + ':' + Mins; // Convert to string (can't cast?) + string Timestring = Hours.toStdString() + ':' + Mins.toStdString(); // Convert to string (can't cast?) Hashtasks[Convstring] = Timestring; // Finally store in hashtable } } @@ -544,7 +552,7 @@ // Write the actual data totals to the outgoing string in reverse order for (Houriter = Hashhours.begin(); Houriter != Hashhours.end(); Houriter++) - Totals = Houriter->first + ' ' + Houriter->second + '\n' + Totals; + Totals = QString::fromStdString(Houriter->first + ' ' + Houriter->second + '\n' + Totals.toStdString()); // Write some quick header text to the outgoing string in reverse order Totals = QString("------ ----------------------------------------\n") + Totals; @@ -631,16 +639,17 @@ Tempstring = m_pReptable->text(nIter, TITRAQ_IDXTASK); Tempdate = QDate::fromString(m_pReptable->text(nIter, TITRAQ_IDXDATE), Qt::ISODate); if (!Tempstring.isEmpty() && Firstday <= Tempdate && Tempdate < Lastday) { - string Convstring = Tempstring; // Convert to string (can't cast?) + string Convstring = Tempstring.toStdString(); // Convert to string (can't cast?) QTime Intable = QTime::fromString(m_pReptable->text(nIter, TITRAQ_IDXAMOUNT), Qt::ISODate); - int nTothours = QString(Hashtasks[Convstring]).section(':', 0, 0).toInt() + Intable.hour(); - int nTotminut = QString(Hashtasks[Convstring]).section(':', 1, 1).toInt() + Intable.minute(); + string Gethashed = Hashtasks[Convstring]; + int nTothours = QString::fromStdString(Gethashed).section(':', 0, 0).toInt() + Intable.hour();; + int nTotminut = QString::fromStdString(Gethashed).section(':', 1, 1).toInt() + Intable.minute(); nTothours += nTotminut / 60; nTotminut %= 60; QString Hours = QString::number(nTothours).rightJustify(3, ' '); QString Mins = QString::number(nTotminut).rightJustify(2, '0'); - string Timestring = Hours + ':' + Mins; // Convert to string (can't cast?) - Hashtasks[Convstring] = Timestring; // Finally store in hashtable + QString Timestring = Hours + ':' + Mins; // Convert to string (can't cast?) + Hashtasks[Convstring] = Timestring.toStdString(); // Finally store in hashtable } } @@ -650,7 +659,7 @@ // Write the actual data totals to the outgoing string in reverse order for (Houriter = Hashhours.begin(); Houriter != Hashhours.end(); Houriter++) - Totals = Houriter->first + ' ' + Houriter->second + '\n' + Totals; + Totals = QString::fromStdString(Houriter->first + ' ' + Houriter->second + '\n' + Totals.toStdString()); // Write some quick header text to the outgoing string in reverse order Totals = QString("------ ----------------------------------------\n") + Totals; @@ -670,7 +679,7 @@ QString Openas = m_pReprefs->getString(TITRAQ_PREFHOME, TITRAQ_DEFHOME); // And then get the name of the selected file to save to - Filestring = QFileDialog::getSaveFileName(Openas, trUtf8("Text files (*.txt);;All Files (*)"), this, trUtf8("ChooserDialog"), trUtf8("Choose a file to save"), NULL, false); + Filestring = Q3FileDialog::getSaveFileName(Openas, trUtf8("Text files (*.txt);;All Files (*)"), this, trUtf8("ChooserDialog"), trUtf8("Choose a file to save"), NULL, false); if (!Filestring.isEmpty()) { if (QFile::exists(Filestring)) { nResult = QMessageBox::warning(this, QString(TITRAQ_APPTITLE) @@ -678,16 +687,16 @@ trUtf8("&Yes"), trUtf8("&No"), NULL, 1, 1); if (nResult = QMessageBox::Ok) { // Overwrite a file Report.setName(Filestring); // User wished name - Report.open(IO_WriteOnly | IO_Truncate); // Open report file - QTextStream Outstream(&Report); // Convert to stream + Report.open(QIODevice::WriteOnly | QIODevice::Truncate); // Open report file + Q3TextStream Outstream(&Report); // Convert to stream Outstream << m_pBrowser->text(); // Write the data Report.close(); // Finish by closing } } else { // User gave a file name, and there was no preexisting file there Report.setName(Filestring); // User wished name - Report.open(IO_WriteOnly | IO_Truncate); // Open report file - QTextStream Outstream(&Report); // Convert to stream + Report.open(QIODevice::WriteOnly | QIODevice::Truncate); // Open report file + Q3TextStream Outstream(&Report); // Convert to stream Outstream << m_pBrowser->text(); // Write the data Report.close(); // Finish by closing } @@ -707,7 +716,7 @@ Paint.begin(m_pPrinter); // Paint on printer Paint.setFont(m_pBrowser->font()); QFontMetrics Fontmetrics = Paint.fontMetrics(); - QPaintDeviceMetrics Devmetrics(m_pPrinter); // Need width/height of printer surface + Q3PaintDeviceMetrics Devmetrics(m_pPrinter); // Need width/height of printer surface const int knMargin = Devmetrics.logicalDpiX() / 2; // Half-inch margin int nYpos = knMargin; // Y position for each line int nPageno = 1; // The starting page number @@ -743,20 +752,20 @@ // Top level push buttons associated with accept and save slots m_pSavebutt->setText(trUtf8("Save As...", "Comment for Savebutton")); QToolTip::add(m_pSavebutt, trUtf8("Saves the report text", "Comment for tooltip Savebutton")); - QWhatsThis::add(m_pSavebutt, trUtf8("The save button saves the report text to a file", "Comment for whatsThis Savebutton")); + Q3WhatsThis::add(m_pSavebutt, trUtf8("The save button saves the report text to a file", "Comment for whatsThis Savebutton")); m_pPrintbutt->setText(trUtf8("Print...", "Comment for Printbutton")); QToolTip::add(m_pPrintbutt, trUtf8("Print the report text", "Comment for tooltip Printbutton")); - QWhatsThis::add(m_pPrintbutt, trUtf8("The print button prints the report text to a file", "Comment for whatsThis Printbutton")); + Q3WhatsThis::add(m_pPrintbutt, trUtf8("The print button prints the report text to a file", "Comment for whatsThis Printbutton")); m_pDismissbutt->setText(trUtf8("Dismiss", "Comment for Dismissbutton")); QToolTip::add(m_pDismissbutt, trUtf8("Closes the report panel", "Comment for tooltip Dismissbutton")); - QWhatsThis::add(m_pDismissbutt, trUtf8("The dismiss button dismisses the report panel", "Comment for whatsThis Dismissbutton")); + Q3WhatsThis::add(m_pDismissbutt, trUtf8("The dismiss button dismisses the report panel", "Comment for whatsThis Dismissbutton")); // Inner tool buttons for new local report generation m_pWeeklybutt->setText(trUtf8("Weekly", "Comment for Weeklybutt")); QToolTip::add(m_pWeeklybutt, trUtf8("Hold down for options", "Comment for tooltip Weeklybutt")); - QWhatsThis::add(m_pWeeklybutt, trUtf8("The Weekly button generates a new weekly report.\nHold this button down to specify many weeks.", "Comment for whatsThis Weeklybutt")); + Q3WhatsThis::add(m_pWeeklybutt, trUtf8("The Weekly button generates a new weekly report.\nHold this button down to specify many weeks.", "Comment for whatsThis Weeklybutt")); m_pMonthlybutt->setText(trUtf8("Monthly", "Comment for Monthlybutt")); QToolTip::add(m_pMonthlybutt, trUtf8("Hold down for options", "Comment for tooltip Monthlybutt")); - QWhatsThis::add(m_pMonthlybutt, trUtf8("The Monthly button makes a new monthly report.\nHold this button down to specify how many months.", "Comment for whatsThis Monthlybutt")); + Q3WhatsThis::add(m_pMonthlybutt, trUtf8("The Monthly button makes a new monthly report.\nHold this button down to specify how many months.", "Comment for whatsThis Monthlybutt")); } } // namespace AS diff -r e8292658d5b3 -r c1941114ca88 as_reportpanel.h --- a/as_reportpanel.h Fri Nov 28 14:20:00 2008 +0100 +++ b/as_reportpanel.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,6 +29,8 @@ // as_reportpanel.h: ISO C++ interface // +#define QT3_SUPPORT + #ifndef REPORTPANEL_H #define REPORTPANEL_H @@ -36,17 +38,23 @@ #include #include +//Added by qt3to4: +#include +#include +#include +#include + class TiTable; class Preferences; -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; +class Q3VBoxLayout; +class Q3HBoxLayout; +class Q3GridLayout; class QPushButton; -class QTextEdit; +class Q3TextEdit; class QToolButton; -class QButtonGroup; -class QPopupMenu; +class Q3ButtonGroup; +class Q3PopupMenu; class QPrinter; namespace AS { @@ -57,26 +65,26 @@ public: Reportpanel(TiTable *, Preferences *, QWidget *pParent = 0, - const char *kszName = 0, bool bModal = true, WFlags Flags = 0); + const char *kszName = 0, bool bModal = true, Qt::WFlags Flags = 0); // ~Reportpanel(void); // No need to destroy widgets, because qt does it for us public: - QButtonGroup *m_pWeekmonthgroup; + Q3ButtonGroup *m_pWeekmonthgroup; QToolButton *m_pWeeklybutt; QToolButton *m_pMonthlybutt; - QTextEdit *m_pBrowser; + Q3TextEdit *m_pBrowser; QPushButton *m_pSavebutt; QPushButton *m_pDismissbutt; QPushButton *m_pPrintbutt; protected: - QVBoxLayout *m_pFormlay; - QVBoxLayout *m_pGrouplay; - QHBoxLayout *m_pToolay; - QHBoxLayout *m_pPushlay; - QHBoxLayout *m_pWeekmonthlay; - QPopupMenu *m_pWeekpop; - QPopupMenu *m_pMonthpop; + Q3VBoxLayout *m_pFormlay; + Q3VBoxLayout *m_pGrouplay; + Q3HBoxLayout *m_pToolay; + Q3HBoxLayout *m_pPushlay; + Q3HBoxLayout *m_pWeekmonthlay; + Q3PopupMenu *m_pWeekpop; + Q3PopupMenu *m_pMonthpop; private: int m_nWeeks; diff -r e8292658d5b3 -r c1941114ca88 as_sfile.cpp --- a/as_sfile.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_sfile.cpp 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,6 +32,9 @@ #include "as_sfile.h" #include "as_except.h" +//Added by qt3to4: +#include + // // Serialize a backup of an incoming file object @@ -41,17 +44,17 @@ QFile Filein; // Input readonly file QFile Filebak; // Backup writeonly file QString Fname; // Filename of input file - QTextStream Streamin; // Stream to read from (Filein) - QTextStream Streambak; // Stream to write to (Filebak) + Q3TextStream Streamin; // Stream to read from (Filein) + Q3TextStream Streambak; // Stream to write to (Filebak) try { if(!this->exists()) // Conditionally short circuit if return; // file to backup does not exist Fname = this->name(); // Copy filename from original Filein.setName(Fname); // Set filename of original - Filein.open(IO_ReadOnly); // Open original read-only + Filein.open(QIODevice::ReadOnly); // Open original read-only Filebak.setName(Fname + ".bak"); // Set filename of backup - Filebak.open(IO_WriteOnly); // Open backup write-only + Filebak.open(QIODevice::WriteOnly); // Open backup write-only Streamin.setDevice(&Filein); // Set incoming stream Streambak.setDevice(&Filebak); // Set outgoing stream Streambak << Streamin.read(); // Do actual writing diff -r e8292658d5b3 -r c1941114ca88 as_sfile.h --- a/as_sfile.h Fri Nov 28 14:20:00 2008 +0100 +++ b/as_sfile.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,6 +32,8 @@ #ifndef SIMPLEFILE_H #define SIMPLEFILE_H +#define QT3_SUPPORT + #include #include diff -r e8292658d5b3 -r c1941114ca88 as_slot.cpp --- a/as_slot.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_slot.cpp 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,27 +29,40 @@ // as_slot.cpp: ISO C++ implementation // +#define QT3_SUPPORT + // system headers #include #include // Qt headers -#include +#include #include #include #include #include #include #include -#include +#include // Qt style headers #include -#include +#include +#include #include -#include -#include +#include +#include +#include #include +#include +#include + +//Added by qt3to4: +#include +#include +#include +#include +#include // User interface #include "as_const.h" // Application constants @@ -122,8 +135,8 @@ pClip = QApplication::clipboard(); // Prime the clips Selection = pClip->text(QClipboard::Clipboard); // Windows and Unix - nRows = Selection.contains(QChar('\n')); // How many rows - if (Selection != NULL && nRows > 0) { // Ignore empty clipboards + nRows = Selection.count(QChar('\n')); // How many rows + if (Selection.isNull() && nRows > 0) { // Ignore empty clipboards this->addEntry(nRows); // Reuse slot setRowdata(Selection); // Use accessor @@ -147,7 +160,7 @@ // void Titraqform::addEntry(int nRows) { - QTableSelection Select; // Highlighted text + Q3TableSelection Select; // Highlighted text int nTotal = 0; // Total row select int nCurrent = 0; // Current row std::auto_ptr pGuid(new AS::Uuid); // For GUID production @@ -180,7 +193,7 @@ m_pMaintable->setPixmap(Select.topRow() + nIter, TITRAQ_IDXSTATUS, QPixmap(s_kpcStatwarn_xpm)); m_pMaintable->setText(Select.topRow() + nIter, TITRAQ_IDXUSER, m_pPrefs->getString(TITRAQ_PREFUSER, TITRAQ_DEFUSER)); pGuid->genId(); - m_pMaintable->setText(Select.topRow() + nIter, TITRAQ_IDXGUID, pGuid->getString()); + m_pMaintable->setText(Select.topRow() + nIter, TITRAQ_IDXGUID, QString::fromStdString(pGuid->getString())); m_pMaintable->setText(Select.topRow() + nIter, TITRAQ_IDXCRC, "0"); // 0 = invalid entry m_pMaintable->setText(Select.topRow() + nIter, TITRAQ_IDXREV, "0"); // Entry not revised m_pMaintable->setText(Select.topRow() + nIter, TITRAQ_IDXDATE, QDate::currentDate().toString(Qt::ISODate)); @@ -210,7 +223,7 @@ m_pMaintable->setPixmap(Select.bottomRow() + nIter, TITRAQ_IDXSTATUS, QPixmap(s_kpcStatwarn_xpm)); m_pMaintable->setText(Select.bottomRow() + nIter, TITRAQ_IDXUSER, m_pPrefs->getString(TITRAQ_PREFUSER, TITRAQ_DEFUSER)); pGuid->genId(); - m_pMaintable->setText(Select.bottomRow() + nIter, TITRAQ_IDXGUID, pGuid->getString()); + m_pMaintable->setText(Select.bottomRow() + nIter, TITRAQ_IDXGUID, QString::fromStdString(pGuid->getString())); m_pMaintable->setText(Select.bottomRow() + nIter, TITRAQ_IDXCRC, "0"); m_pMaintable->setText(Select.bottomRow() + nIter, TITRAQ_IDXREV, "0"); m_pMaintable->setText(Select.bottomRow() + nIter, TITRAQ_IDXDATE, QDate::currentDate().toString(Qt::ISODate)); @@ -269,9 +282,9 @@ // void Titraqform::delEntry(int nRows) { - QTableSelection Select = m_pMaintable->selection(0); // Highlighted text + Q3TableSelection Select = m_pMaintable->selection(0); // Highlighted text int nTotal = Select.bottomRow() - Select.topRow() + 1; // Total row select - QMemArray Rowselect(nTotal); // Row array + Q3MemArray Rowselect(nTotal); // Row array // Calculate rows to delete from selection highlight for (int nIter = 0; nIter < nTotal; ++nIter) @@ -424,7 +437,7 @@ Openas = QDir::homeDirPath() + Openas.remove(0, QString(TITRAQ_HOMEDIRTOK).length() - 1); // This dialog asks which file the user wants to open - QString Filestring = QFileDialog::getOpenFileName(Openas, + QString Filestring = Q3FileDialog::getOpenFileName(Openas, trUtf8("Accounting Data (*.as);;Text files (*.txt);;All Files (*)"), this, trUtf8("ChooserDialog"), trUtf8("Choose a file to open"), NULL, false); @@ -504,7 +517,7 @@ Openas = QDir::homeDirPath() + Openas.remove(0, QString(TITRAQ_HOMEDIRTOK).length() - 1); // And then get the name of the selected file to save to - QString Filestring = QFileDialog::getSaveFileName(Openas, trUtf8("Accounting Data (*.as);;Text files (*.txt);;All Files (*)"), this, trUtf8("ChooserDialog"), trUtf8("Choose a file to save"), NULL, false); + QString Filestring = Q3FileDialog::getSaveFileName(Openas, trUtf8("Accounting Data (*.as);;Text files (*.txt);;All Files (*)"), this, trUtf8("ChooserDialog"), trUtf8("Choose a file to save"), NULL, false); if (!Filestring.isEmpty()) { if (QFile::exists(Filestring)) { nResult = QMessageBox::warning(this, QString(TITRAQ_APPTITLE) @@ -551,7 +564,7 @@ nResult = 1; // We loop on this dialog only if an indecisive user while (nResult > 0) { // is hesitant to overwrite a file over and over again - QString Filestring = QFileDialog::getSaveFileName(Openas, trUtf8("Accounting Data (*.as);;Text files (*.txt);;All Files (*)"), this, trUtf8("ChooserDialog"), trUtf8("Choose a file to save"), NULL, false); + QString Filestring = Q3FileDialog::getSaveFileName(Openas, trUtf8("Accounting Data (*.as);;Text files (*.txt);;All Files (*)"), this, trUtf8("ChooserDialog"), trUtf8("Choose a file to save"), NULL, false); if (!Filestring.isEmpty()) { if (QFile::exists(Filestring)) { nResult = QMessageBox::warning(this, QString(TITRAQ_APPTITLE) @@ -1361,7 +1374,7 @@ } // Make sure switch take place right away and sizes are handled - m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXSTATCOL)); + //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXSTATCOL)); this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next } @@ -1383,7 +1396,7 @@ } // Make sure switch take place right away and sizes are handled - m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXLCOL)); + //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXLCOL)); this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next } @@ -1406,7 +1419,7 @@ // Make sure switch take place right away and sizes are handled this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next - m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXUCOL)); + //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXUCOL)); } // @@ -1427,7 +1440,7 @@ } // Make sure switch take place right away and sizes are handled - m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXGCOL)); + //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXGCOL)); this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next } @@ -1449,7 +1462,7 @@ } // Make sure switch take place right away and sizes are handled - m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXCCOL)); + //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXCCOL)); this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next } @@ -1471,7 +1484,7 @@ } // Make sure switch take place right away and sizes are handled - m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXREVCOL)); + //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXREVCOL)); this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next } @@ -1493,7 +1506,7 @@ } // Make sure switch take place right away and sizes are handled - m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXDCOL)); + //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXDCOL)); this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next } @@ -1515,7 +1528,7 @@ } // Make sure switch take place right away and sizes are handled - m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXSTARTCOL)); + //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXSTARTCOL)); this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next } @@ -1537,7 +1550,7 @@ } // Make sure switch take place right away and sizes are handled - m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXFCOL)); + //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXFCOL)); this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next } @@ -1559,7 +1572,7 @@ } // Make sure switch take place right away and sizes are handled - m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXACOL)); + //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXACOL)); this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next } @@ -1581,7 +1594,7 @@ } // Make sure switch take place right away and sizes are handled - m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXTCOL)); + //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXTCOL)); this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next } @@ -1603,7 +1616,7 @@ } // Make sure switch take place right away and sizes are handled - m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXREMCOL)); + //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXREMCOL)); this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next } @@ -1726,7 +1739,7 @@ // Fill account log object(s) to marshall and transmit int nRow = m_pMaintable->currentRow(); - QTableSelection Select = m_pMaintable->selection(0); // Capture selected rows + Q3TableSelection Select = m_pMaintable->selection(0); // Capture selected rows int nTotal = Select.bottomRow() - Select.topRow() + 1; // Total rows selected // Remember, CORBA::stri_dup creates smart pointers @@ -1785,7 +1798,7 @@ SOAPProxy Proxy(Endpoint.ascii()); // Fill account log object(s) to marshall and transmit - QTableSelection Select = m_pMaintable->selection(0); // Capture selected rows + Q3TableSelection Select = m_pMaintable->selection(0); // Capture selected rows int nTotal = Select.bottomRow() - Select.topRow() + 1; // Total rows selected // Iterate through the selection of row entries to transmit @@ -1879,8 +1892,8 @@ // Remember main window layout and doc positions QString Laystring; - QTextStream Laystream(&Laystring, IO_WriteOnly); - Laystream << *this; // Persist the main window + Q3TextStream Laystream(&Laystring, QIODevice::WriteOnly); + //Laystream << *this; // Persist the main window m_pPrefs->setString(TITRAQ_PREFFRAMELAY, Laystring); } @@ -1993,22 +2006,22 @@ m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLECDE); qApp->setStyle(new QCDEStyle); } - else if (pPrefpanel->getStyle() == TITRAQ_STRSGI) { - m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLESGI); - qApp->setStyle(new QSGIStyle); - } + //else if (pPrefpanel->getStyle() == TITRAQ_STRSGI) { // Not supported + // m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLESGI); + // qApp->setStyle(new QSGIStyle); + //} else if (pPrefpanel->getStyle() == TITRAQ_STRMOTIF) { m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLEMOTIF); qApp->setStyle(new QMotifStyle); } - else if (pPrefpanel->getStyle() == TITRAQ_STRMPLUS) { - m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLEMPLUS); - qApp->setStyle(new QMotifPlusStyle); - } - else if (pPrefpanel->getStyle() == TITRAQ_STRPLAT) { - m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLEPLAT); - qApp->setStyle(new QPlatinumStyle); - } + //else if (pPrefpanel->getStyle() == TITRAQ_STRMPLUS) { // Not supported + // m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLEMPLUS); + // qApp->setStyle(new QMotifPlusStyle); + //} + //else if (pPrefpanel->getStyle() == TITRAQ_STRPLAT) { // Not supported + // m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLEPLAT); + // qApp->setStyle(new QPlatinumStyle); + //} else if (pPrefpanel->getStyle() == TITRAQ_STRMSOFT) { m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLEMSOFT); qApp->setStyle(new QWindowsStyle); diff -r e8292658d5b3 -r c1941114ca88 as_stub.idl --- a/as_stub.idl Fri Nov 28 14:20:00 2008 +0100 +++ b/as_stub.idl 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 diff -r e8292658d5b3 -r c1941114ca88 as_table.cpp --- a/as_table.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_table.cpp 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,7 +29,14 @@ // as_table.cpp: ISO C++ implementation // -#include +#define QT3_SUPPORT + +#include + +//Added by qt3to4: +#include +#include +#include #include "as_const.h" #include "as_table.h" @@ -41,8 +48,8 @@ if (pObject == horizontalHeader() && pEvent->type() == QEvent::MouseButtonDblClick) return true; if (pEvent->type() == QEvent::MouseButtonPress && // Ignore mid, right clicks - ((QMouseEvent *)pEvent)->button() == QMouseEvent::RightButton || - ((QMouseEvent *)pEvent)->button() == QMouseEvent::MidButton) + ((QMouseEvent *)pEvent)->button() == Qt::RightButton || + ((QMouseEvent *)pEvent)->button() == Qt::MidButton) return true; else if (pEvent->type() == QEvent::KeyPress) { if (((QKeyEvent *)pEvent)->key() == Qt::Key_Tab) { // Handle tab key @@ -119,10 +126,10 @@ return true; // Capture // Forward incompletely handled key events - return QTable::eventFilter(pObject, pEvent); + return Q3Table::eventFilter(pObject, pEvent); } else // Default behaviour is to pass the event onwards - return QTable::eventFilter(pObject, pEvent); + return Q3Table::eventFilter(pObject, pEvent); } // Overridden member hack to allow externally connected control @@ -135,7 +142,7 @@ if (nText != this->text(nRow, nCol) && nCol != TITRAQ_IDXLINE) emit textEdited(nRow, nCol); - QTable::setText(nRow, nCol, nText); + Q3Table::setText(nRow, nCol, nText); } } @@ -150,7 +157,7 @@ this->setSortdir(bAscend); this->setSortcol(nCol); - QTable::sortColumn(nCol, this->getSortdir(), true); + Q3Table::sortColumn(nCol, this->getSortdir(), true); // // Announce sorting policy with multiple selections // QTableSelection Testsel = this->selection(this->currentSelection()); @@ -217,7 +224,7 @@ } } - QTable::paintCell(pPainter, nRow, nCol, Recto, bSelect, Cgroup); + Q3Table::paintCell(pPainter, nRow, nCol, Recto, bSelect, Cgroup); }; // Blah @@ -242,7 +249,7 @@ // Overriden member to properly handle read only attribute after edition void TiTable::endEdit(int nRow, int nCol, bool bAccept, bool bReplace) { - QTable::endEdit(nRow, nCol, bAccept, bReplace); + Q3Table::endEdit(nRow, nCol, bAccept, bReplace); // Table read only attribute must be set to return to the normal // row highlight and selection behaviour of AS. The reason it was diff -r e8292658d5b3 -r c1941114ca88 as_table.h --- a/as_table.h Fri Nov 28 14:20:00 2008 +0100 +++ b/as_table.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,12 +32,15 @@ #ifndef TITABLE_H #define TITABLE_H -#include +#include + +//Added by qt3to4: +#include #include "as_pref.h" -class TiTable : public QTable +class TiTable : public Q3Table { Q_OBJECT @@ -49,7 +52,7 @@ public: // Try to match QTable's default constructor with an initializer list - TiTable(Preferences *pPrefs, QWidget *pParent = 0, const char *szName = 0) : QTable(pParent, szName) + TiTable(Preferences *pPrefs, QWidget *pParent = 0, const char *szName = 0) : Q3Table(pParent, szName) { this->setSortcol(0); this->setSortdir(true); diff -r e8292658d5b3 -r c1941114ca88 as_tableitem.h --- a/as_tableitem.h Fri Nov 28 14:20:00 2008 +0100 +++ b/as_tableitem.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,14 +32,14 @@ #ifndef RTTABLEITEM_H #define RTTABLEITEM_H -#include +#include -class RtTableItem : public QTableItem +class RtTableItem : public Q3TableItem { public: - RtTableItem(QTable *pTable, EditType eType, const QString &Text) : QTableItem(pTable, eType, Text) {m_nOwnalign = AlignRight | AlignVCenter;}; - void setAlignment(int nAlign = AlignRight | AlignVCenter) {m_nOwnalign = nAlign;}; + RtTableItem(Q3Table *pTable, EditType eType, const QString &Text) : Q3TableItem(pTable, eType, Text) {m_nOwnalign = Qt::AlignRight | Qt::AlignVCenter;}; + void setAlignment(int nAlign = Qt::AlignRight | Qt::AlignVCenter) {m_nOwnalign = nAlign;}; int alignment() const {return m_nOwnalign;}; private: diff -r e8292658d5b3 -r c1941114ca88 as_user.cpp --- a/as_user.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_user.cpp 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 diff -r e8292658d5b3 -r c1941114ca88 as_user.h --- a/as_user.h Fri Nov 28 14:20:00 2008 +0100 +++ b/as_user.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 diff -r e8292658d5b3 -r c1941114ca88 as_uuid.cpp --- a/as_uuid.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_uuid.cpp 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 diff -r e8292658d5b3 -r c1941114ca88 as_uuid.h --- a/as_uuid.h Fri Nov 28 14:20:00 2008 +0100 +++ b/as_uuid.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 diff -r e8292658d5b3 -r c1941114ca88 as_version.cpp --- a/as_version.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_version.cpp Fri Dec 05 23:14:02 2008 +0100 @@ -8,7 +8,7 @@ #ifndef _AS_VERSION_CPP_ #define _AS_VERSION_CPP_ -#define ASGUI_VERSION 0x007207 +#define ASGUI_VERSION 0x007208 typedef struct { const int v_hex; @@ -32,14 +32,14 @@ #undef _AS_VERSION_CPP_AS_HEADER_ asgui_version_t asgui_version = { - 0x007207, - "0.7.7", - "0.7.7 (24-Aug-2004)", - "This is OSSP as-gui, Version 0.7.7 (24-Aug-2004)", - "OSSP as-gui 0.7.7 (24-Aug-2004)", - "OSSP as-gui/0.7.7", - "@(#)OSSP as-gui 0.7.7 (24-Aug-2004)", - "$Id: as_version.cpp,v 1.45 2004/08/24 22:00:30 ms Exp $" + 0x007208, + "0.7.8", + "0.7.8 (05-Dec-2008)", + "This is OSSP as-gui, Version 0.7.8 (05-Dec-2008)", + "OSSP as-gui 0.7.8 (05-Dec-2008)", + "OSSP as-gui/0.7.8", + "@(#)OSSP as-gui 0.7.8 (05-Dec-2008)", + "$Id: OSSP as-gui 0.7.8 (05-Dec-2008) $" }; #endif /* _AS_VERSION_CPP_AS_HEADER_ */ diff -r e8292658d5b3 -r c1941114ca88 configure.in --- a/configure.in Fri Nov 28 14:20:00 2008 +0100 +++ b/configure.in 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 @@ -63,7 +63,7 @@ LIBS="`echo $PTHREAD_CFLAGS | sed -e 's;.*\(-[[pmk]]thread[[s]]*\).*;\1;'` $LIBS" dnl Do Qt checks -PKG_CHECK_MODULES(QT, qt >= 3.2.0, have_qt=true, AC_MSG_ERROR([No qt installation found])) +PKG_CHECK_MODULES(QT, Qt3Support, have_qt=true, AC_MSG_ERROR([No qt installation found])) AC_SUBST(QT_LIBS) AC_SUBST(QT_CFLAGS) diff -r e8292658d5b3 -r c1941114ca88 devtool.conf --- a/devtool.conf Fri Nov 28 14:20:00 2008 +0100 +++ b/devtool.conf Fri Dec 05 23:14:02 2008 +0100 @@ -3,8 +3,8 @@ ## %autogen - @autogen shtool 2.0.0 "2.0.*" echo fixperm install mkdir tarball version - @autogen autoconf 2.59 "2.5[3-9]*" + @autogen shtool 2.0.7 "2.0.*" echo fixperm install mkdir tarball version + @autogen autoconf 2.63 "2.6[0-9]*" %autoclean @autoclean shtool @@ -60,6 +60,6 @@ gunzip