As-gui Sources / changeset

     1.1 --- a/ChangeLog	Fri Nov 28 14:20:00 2008 +0100
     1.2 +++ b/ChangeLog	Fri Dec 05 23:14:02 2008 +0100
     1.3 @@ -1,5 +1,9 @@
     1.4  Geschichte des OSSP titraq in Vorwaerts Cronordnung
     1.5  
     1.6 +081205 Ported to build under the Qt4 API, using the Qt3 support layer logic
     1.7 +       Made minor corrections to more closely adhere to the C++ standard
     1.8 +       Removed branding in some places where branding is now irrelevant
     1.9 +
    1.10  040824 Corrected with-qt expression as already indicated by configure --help
    1.11         Avoid forgotten save data loss by connecting QTable's valueChanged signal
    1.12         Corrected in place edition logic to work with newer Qt library editCell()

     2.1 --- a/Makefile.in	Fri Nov 28 14:20:00 2008 +0100
     2.2 +++ b/Makefile.in	Fri Dec 05 23:14:02 2008 +0100
     2.3 @@ -1,12 +1,12 @@
     2.4  ##
     2.5  ##  OSSP asgui - Accounting system graphical user interface
     2.6 -##  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
     2.7 -##  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
     2.8 -##  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
     2.9 -##  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
    2.10 +##  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
    2.11 +##  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
    2.12 +##  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
    2.13 +##  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
    2.14  ##
    2.15  ##  This file is part of OSSP asgui, an accounting system graphical user
    2.16 -##  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
    2.17 +##  interface which can be found at http://asgui.europalab.com/.
    2.18  ##
    2.19  ##  Permission to use, copy, modify, and distribute this software for
    2.20  ##  any purpose with or without fee is hereby granted, provided that

     3.1 --- a/README	Fri Nov 28 14:20:00 2008 +0100
     3.2 +++ b/README	Fri Dec 05 23:14:02 2008 +0100
     3.3 @@ -15,13 +15,13 @@
     3.4  
     3.5    COPYRIGHT AND LICENSE
     3.6  
     3.7 -  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
     3.8 -  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
     3.9 -  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    3.10 -  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
    3.11 +  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
    3.12 +  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
    3.13 +  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
    3.14 +  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
    3.15  
    3.16    This file is part of OSSP asgui, an accounting system interface which
    3.17 -  can be found at http://www.ossp.org/pkg/tool/asgui/.
    3.18 +  can be found at http://asgui.europalab.com/.
    3.19  
    3.20    Permission to use, copy, modify, and distribute this software for
    3.21    any purpose with or without fee is hereby granted, provided that
    3.22 @@ -45,5 +45,5 @@
    3.23  
    3.24    The documentation and latest release can be found on
    3.25  
    3.26 -  o http://www.ossp.org/pkg/tool/asgui/
    3.27 +  o http://asgui.europalab.com/
    3.28    o  ftp://ftp.ossp.org/pkg/tool/asgui/

     4.1 --- a/aclocal.m4	Fri Nov 28 14:20:00 2008 +0100
     4.2 +++ b/aclocal.m4	Fri Dec 05 23:14:02 2008 +0100
     4.3 @@ -1,12 +1,12 @@
     4.4  ##
     4.5  ##  OSSP asgui - Accounting system graphical user interface
     4.6 -##  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
     4.7 -##  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
     4.8 -##  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
     4.9 -##  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
    4.10 +##  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
    4.11 +##  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
    4.12 +##  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
    4.13 +##  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
    4.14  ##
    4.15  ##  This file is part of OSSP GUI, a graphical user interface
    4.16 -##  for OSSP which can be found at http://www.ossp.org/
    4.17 +##  for OSSP which can be found at http://asgui.europalab.com/
    4.18  ##
    4.19  ##  Permission to use, copy, modify, and distribute this software for
    4.20  ##  any purpose with or without fee is hereby granted, provided that
    4.21 @@ -313,52 +313,14 @@
    4.22      AC_MSG_ERROR([Neither \$QTDIR nor --with-qt=[DIR] paths exist])
    4.23  fi
    4.24  
    4.25 -dnl ## Now search for libs and headers
    4.26 -changequote(, )dnl
    4.27 -for file in x `find $QTBASE/include -name "qapplication.h" -print`; do
    4.28 -    test .$file = .x && continue
    4.29 -    c_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
    4.30 -done
    4.31 -
    4.32 -dnl ## Scan to find out which Qt library to link against
    4.33 -dnl ## FIXME Merge static and dynamic library search blocks
    4.34 -dnl ## FIXME Remove this qt-mt check and do --enable-threads instead
    4.35 -for file in x `find $QTBASE/lib -name "libqt.so" -print`; do
    4.36 -    test .$file = .x && continue
    4.37 -    l_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
    4.38 -    lib=`echo $file | sed -e 's;^.*/\(.*\)$;\1;' -e 's;lib\(.*\)\.so;\1;'`
    4.39 -done
    4.40 -
    4.41 -dnl ## If we have a multithreaded shared library, then it's better
    4.42 -for file in x `find $QTBASE/lib -name "libqt-mt.so" -print`; do
    4.43 -    test .$file = .x && continue
    4.44 -    l_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
    4.45 -    lib=`echo $file | sed -e 's;^.*/\(.*\)$;\1;' -e 's;lib\(.*\)\.so;\1;'`
    4.46 -done
    4.47 -
    4.48 -dnl ## If we have static libraries, then prefer to use those
    4.49 -for file in x `find $QTBASE/lib -name "libqt.a" -print`; do
    4.50 -    test .$file = .x && continue
    4.51 -    l_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
    4.52 -    lib=`echo $file | sed -e 's;^.*/\(.*\)$;\1;' -e 's;lib\(.*\)\.a;\1;'`
    4.53 -done
    4.54 -
    4.55 -dnl ## But the static multithreaded library is preferred above all
    4.56 -for file in x `find $QTBASE/lib -name "libqt-mt.a" -print`; do
    4.57 -    test .$file = .x && continue
    4.58 -    l_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
    4.59 -    lib=`echo $file | sed -e 's;^.*/\(.*\)$;\1;' -e 's;lib\(.*\)\.a;\1;'`
    4.60 -done
    4.61 -changequote([, ])dnl
    4.62 -
    4.63  dnl ## Append paths of libs and headers
    4.64  if test ".$lib" != .; then
    4.65      LIBS="$LIBS -l$lib"
    4.66  fi
    4.67 -LDFLAGS="$LDFLAGS -L$l_dir"
    4.68 +LDFLAGS="$LDFLAGS `$PKG_CONFIG --ldlags Qt3Support QtCore QtGui`"
    4.69  CPPFLAGS="$CPPFLAGS -DQT_THREAD_SUPPORT"
    4.70  CXXCPP="$CXXCPP -DQT_THREAD_SUPPORT"
    4.71 -CXXFLAGS="$CXXFLAGS -I$c_dir"
    4.72 +CXXFLAGS="$CXXFLAGS `$PKG_CONFIG --cflags-only-I Qt3Support QtCore QtGui`"
    4.73  ])
    4.74  
    4.75  

     5.1 --- a/as-accounts.pod	Fri Nov 28 14:20:00 2008 +0100
     5.2 +++ b/as-accounts.pod	Fri Dec 05 23:14:02 2008 +0100
     5.3 @@ -1,12 +1,12 @@
     5.4  ##
     5.5  ##  OSSP asgui - Accounting system graphical user interface
     5.6 -##  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
     5.7 -##  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
     5.8 -##  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
     5.9 -##  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
    5.10 +##  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
    5.11 +##  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
    5.12 +##  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
    5.13 +##  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
    5.14  ##
    5.15  ##  This file is part of OSSP asgui, an accounting system graphical user
    5.16 -##  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
    5.17 +##  interface which can be found at http://asgui.europalab.com/.
    5.18  ##
    5.19  ##  Permission to use, copy, modify, and distribute this software for
    5.20  ##  any purpose with or without fee is hereby granted, provided that

     6.1 --- a/as-events.pod	Fri Nov 28 14:20:00 2008 +0100
     6.2 +++ b/as-events.pod	Fri Dec 05 23:14:02 2008 +0100
     6.3 @@ -1,12 +1,12 @@
     6.4  ##
     6.5  ##  OSSP asgui - Accounting system graphical user interface
     6.6 -##  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
     6.7 -##  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
     6.8 -##  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
     6.9 -##  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
    6.10 +##  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
    6.11 +##  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
    6.12 +##  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
    6.13 +##  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
    6.14  ##
    6.15  ##  This file is part of OSSP asgui, an accounting system graphical user
    6.16 -##  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
    6.17 +##  interface which can be found at http://asgui.europalab.com/.
    6.18  ##
    6.19  ##  Permission to use, copy, modify, and distribute this software for
    6.20  ##  any purpose with or without fee is hereby granted, provided that

     7.1 --- a/as-gui.conf.pod	Fri Nov 28 14:20:00 2008 +0100
     7.2 +++ b/as-gui.conf.pod	Fri Dec 05 23:14:02 2008 +0100
     7.3 @@ -1,12 +1,12 @@
     7.4  ##
     7.5  ##  OSSP asgui - Accounting system graphical user interface
     7.6 -##  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
     7.7 -##  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
     7.8 -##  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
     7.9 -##  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
    7.10 +##  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
    7.11 +##  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
    7.12 +##  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
    7.13 +##  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
    7.14  ##
    7.15  ##  This file is part of OSSP asgui, an accounting system graphical user
    7.16 -##  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
    7.17 +##  interface which can be found at http://asgui.europalab.com/.
    7.18  ##
    7.19  ##  Permission to use, copy, modify, and distribute this software for
    7.20  ##  any purpose with or without fee is hereby granted, provided that

     8.1 --- a/as-gui.html	Fri Nov 28 14:20:00 2008 +0100
     8.2 +++ b/as-gui.html	Fri Dec 05 23:14:02 2008 +0100
     8.3 @@ -2,7 +2,7 @@
     8.4  <html xmlns="http://www.w3.org/1999/xhtml">
     8.5  <head>
     8.6  <title>as-gui help reference</title>
     8.7 -<link rev="made" href="mailto:ms@dt4.dev.de.cw.net" />
     8.8 +<link rev="made" href="mailto:michael@schloh.com" />
     8.9  </head>
    8.10  
    8.11  <body style="background-color: white">

     9.1 --- a/as-gui.pod	Fri Nov 28 14:20:00 2008 +0100
     9.2 +++ b/as-gui.pod	Fri Dec 05 23:14:02 2008 +0100
     9.3 @@ -1,12 +1,12 @@
     9.4  ##
     9.5  ##  OSSP asgui - Accounting system graphical user interface
     9.6 -##  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
     9.7 -##  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
     9.8 -##  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
     9.9 -##  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
    9.10 +##  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
    9.11 +##  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
    9.12 +##  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
    9.13 +##  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
    9.14  ##
    9.15  ##  This file is part of OSSP asgui, an accounting system graphical user
    9.16 -##  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
    9.17 +##  interface which can be found at http://asgui.europalab.com/.
    9.18  ##
    9.19  ##  Permission to use, copy, modify, and distribute this software for
    9.20  ##  any purpose with or without fee is hereby granted, provided that

    10.1 --- a/as_amount.cpp	Fri Nov 28 14:20:00 2008 +0100
    10.2 +++ b/as_amount.cpp	Fri Dec 05 23:14:02 2008 +0100
    10.3 @@ -1,12 +1,12 @@
    10.4  //
    10.5  //  OSSP asgui - Accounting system graphical user interface
    10.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    10.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    10.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    10.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   10.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   10.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   10.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   10.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   10.14  //
   10.15  //  This file is part of OSSP asgui, an accounting system graphical user
   10.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   10.17 +//  interface which can be found at http://asgui.europalab.com/.
   10.18  //
   10.19  //  Permission to use, copy, modify, and distribute this software for
   10.20  //  any purpose with or without fee is hereby granted, provided that

    11.1 --- a/as_amount.h	Fri Nov 28 14:20:00 2008 +0100
    11.2 +++ b/as_amount.h	Fri Dec 05 23:14:02 2008 +0100
    11.3 @@ -1,12 +1,12 @@
    11.4  //
    11.5  //  OSSP asgui - Accounting system graphical user interface
    11.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    11.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    11.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    11.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   11.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   11.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   11.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   11.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   11.14  //
   11.15  //  This file is part of OSSP asgui, an accounting system graphical user
   11.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   11.17 +//  interface which can be found at http://asgui.europalab.com/.
   11.18  //
   11.19  //  Permission to use, copy, modify, and distribute this software for
   11.20  //  any purpose with or without fee is hereby granted, provided that
   11.21 @@ -32,16 +32,16 @@
   11.22  #ifndef AMOUNTBOX_H
   11.23  #define AMOUNTBOX_H
   11.24  
   11.25 -#include <qdatetimeedit.h>
   11.26 +#include <q3datetimeedit.h>
   11.27  
   11.28  
   11.29 -class ASTimeEdit : public QTimeEdit
   11.30 +class ASTimeEdit : public Q3TimeEdit
   11.31  {
   11.32  public:
   11.33 -    ASTimeEdit(QWidget *pParent = 0, const char *szName = 0) : QTimeEdit(pParent, szName)
   11.34 +    ASTimeEdit(QWidget *pParent = 0, const char *szName = 0) : Q3TimeEdit(pParent, szName)
   11.35      {
   11.36          this->setTime(QTime::QTime(0, 0));
   11.37 -        this->setDisplay(QTimeEdit::Hours | QTimeEdit::Minutes);
   11.38 +        this->setDisplay(Q3TimeEdit::Hours | Q3TimeEdit::Minutes);
   11.39          this->setAutoAdvance(true);
   11.40  //        this->setMaxValue();
   11.41  //        this->setSuffix(trUtf8(" Mins"));

    12.1 --- a/as_assist.cpp	Fri Nov 28 14:20:00 2008 +0100
    12.2 +++ b/as_assist.cpp	Fri Dec 05 23:14:02 2008 +0100
    12.3 @@ -1,12 +1,12 @@
    12.4  //
    12.5  //  OSSP asgui - Accounting system graphical user interface
    12.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    12.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    12.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    12.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   12.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   12.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   12.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   12.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   12.14  //
   12.15  //  This file is part of OSSP asgui, an accounting system graphical user
   12.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   12.17 +//  interface which can be found at http://asgui.europalab.com/.
   12.18  //
   12.19  //  Permission to use, copy, modify, and distribute this software for
   12.20  //  any purpose with or without fee is hereby granted, provided that
   12.21 @@ -29,21 +29,29 @@
   12.22  //  as_assist.cpp: ISO C++ implementation
   12.23  //
   12.24  
   12.25 +#define QT3_SUPPORT
   12.26 +
   12.27 +#include <Qt3Support>
   12.28 +
   12.29  // Qt style headers
   12.30  #include <qcdestyle.h>
   12.31 -#include <qsgistyle.h>
   12.32 +#include <qcleanlooksstyle.h>
   12.33 +#include <qcommonstyle.h>
   12.34  #include <qmotifstyle.h>
   12.35 -#include <qmotifplusstyle.h>
   12.36 -#include <qplatinumstyle.h>
   12.37 +#include <qplastiquestyle.h>
   12.38 +#include <qwindowscestyle.h>
   12.39 +#include <qwindowsmobilestyle.h>
   12.40  #include <qwindowsstyle.h>
   12.41 +#include <qwindowsvistastyle.h>
   12.42 +#include <qwindowsxpstyle.h>
   12.43  
   12.44  // Qt general headers
   12.45  #include <qtooltip.h>
   12.46 -#include <qwhatsthis.h>
   12.47 +#include <q3whatsthis.h>
   12.48  #include <qstringlist.h>
   12.49 -#include <qpopupmenu.h>
   12.50 +#include <q3popupmenu.h>
   12.51  #include <qcombobox.h>
   12.52 -#include <qlistbox.h>
   12.53 +#include <q3listbox.h>
   12.54  #include <qstatusbar.h>
   12.55  #include <qmenubar.h>
   12.56  #include <qcursor.h>
   12.57 @@ -51,6 +59,14 @@
   12.58  #include <qrect.h>
   12.59  #include <qdir.h>
   12.60  
   12.61 +//Added by qt3to4:
   12.62 +#include <QLabel>
   12.63 +#include <QPixmap>
   12.64 +#include <Q3TextStream>
   12.65 +#include <Q3HBoxLayout>
   12.66 +#include <Q3VBoxLayout>
   12.67 +#include <Q3Frame>
   12.68 +
   12.69  // User interface
   12.70  #include "as_amount.h"          // AmountBox class
   12.71  #include "as_user.h"            // User class
   12.72 @@ -97,8 +113,8 @@
   12.73  {
   12.74      // Can't bootstrap until we know who is using our tool, so find out
   12.75      User Localuser   = User();
   12.76 -    QString Username = Localuser.getName();
   12.77 -    QString Homedir  = Localuser.getHomedir();
   12.78 +    QString Username = QString::fromStdString(Localuser.getName());
   12.79 +    QString Homedir  = QString::fromStdString(Localuser.getHomedir());
   12.80  
   12.81      // Bootstrap a user preferences object from operating system info
   12.82      m_pPrefs = new Preferences(Homedir + QChar('/') +
   12.83 @@ -141,7 +157,7 @@
   12.84          m_pPrefs->setNumber(TITRAQ_PREFDARKGREEN, TITRAQ_DEFDARKGREEN);
   12.85          m_pPrefs->setNumber(TITRAQ_PREFDARKBLUE, TITRAQ_DEFDARKBLUE);
   12.86          m_pPrefs->flush();  // Write the new conf file
   12.87 -        QTextStream cerr(stderr, IO_WriteOnly);
   12.88 +        Q3TextStream cerr(stderr, QIODevice::WriteOnly);
   12.89          cerr << trUtf8("Created new preferences file ") << Homedir << QChar('/')
   12.90               << QString::fromLocal8Bit(TITRAQ_PREFNAME) << endl;
   12.91      }
   12.92 @@ -151,18 +167,18 @@
   12.93      case TITRAQ_STYLECDE:
   12.94          qApp->setStyle(new QCDEStyle);
   12.95          break;
   12.96 -    case TITRAQ_STYLESGI:
   12.97 -        qApp->setStyle(new QSGIStyle);
   12.98 -        break;
   12.99 +    //case TITRAQ_STYLESGI:               // SGI Style is unsupported
  12.100 +    //    qApp->setStyle(new QSGIStyle);
  12.101 +    //    break;
  12.102      case TITRAQ_STYLEMOTIF:
  12.103          qApp->setStyle(new QMotifStyle);
  12.104          break;
  12.105 -    case TITRAQ_STYLEMPLUS:
  12.106 -        qApp->setStyle(new QMotifPlusStyle);
  12.107 -        break;
  12.108 -    case TITRAQ_STYLEPLAT:
  12.109 -        qApp->setStyle(new QPlatinumStyle);
  12.110 -        break;
  12.111 +    //case TITRAQ_STYLEMPLUS:             // MotifPlus Style is unsupported
  12.112 +    //    qApp->setStyle(new QMotifPlusStyle);
  12.113 +    //    break;
  12.114 +    //case TITRAQ_STYLEPLAT:              // Platinum Style is unsupported
  12.115 +    //    qApp->setStyle(new QPlatinumStyle);
  12.116 +    //    break;
  12.117      case TITRAQ_STYLEMSOFT:
  12.118          qApp->setStyle(new QWindowsStyle);
  12.119          break;
  12.120 @@ -177,47 +193,47 @@
  12.121  //
  12.122  void Titraqform::setupActions(void)
  12.123  {
  12.124 -    QIconSet Saveiset, Cutiset, Copyiset, Pasteiset;
  12.125 -    QIconSet Rowaddiset, Rowdeliset, Refreshiset;
  12.126 -    QIconSet Synciset, Reportiset;
  12.127 +    QIcon Saveiset, Cutiset, Copyiset, Pasteiset;
  12.128 +    QIcon Rowaddiset, Rowdeliset, Refreshiset;
  12.129 +    QIcon Synciset, Reportiset;
  12.130  
  12.131      // Construct iconsets to use later for multistate action images
  12.132 -    Saveiset.setPixmap(QPixmap(s_kpcFilesave_xpm), QIconSet::Automatic, QIconSet::Normal);
  12.133 -    Saveiset.setPixmap(QPixmap(s_kpcDfilesave_xpm), QIconSet::Automatic, QIconSet::Disabled);
  12.134 -    Cutiset.setPixmap(QPixmap(s_kpcCut_xpm), QIconSet::Automatic, QIconSet::Normal);
  12.135 -    Cutiset.setPixmap(QPixmap(s_kpcDcut_xpm), QIconSet::Automatic, QIconSet::Disabled);
  12.136 -    Copyiset.setPixmap(QPixmap(s_kpcCopy_xpm), QIconSet::Automatic, QIconSet::Normal);
  12.137 -    Copyiset.setPixmap(QPixmap(s_kpcDcopy_xpm), QIconSet::Automatic, QIconSet::Disabled);
  12.138 -    Pasteiset.setPixmap(QPixmap(s_kpcPaste_xpm), QIconSet::Automatic, QIconSet::Normal);
  12.139 -    Pasteiset.setPixmap(QPixmap(s_kpcDpaste_xpm), QIconSet::Automatic, QIconSet::Disabled);
  12.140 -    Rowaddiset.setPixmap(QPixmap(s_kpcRowadd_xpm), QIconSet::Automatic, QIconSet::Normal);
  12.141 -    Rowaddiset.setPixmap(QPixmap(s_kpcDrowadd_xpm), QIconSet::Automatic, QIconSet::Disabled);
  12.142 -    Rowdeliset.setPixmap(QPixmap(s_kpcRowdel_xpm), QIconSet::Automatic, QIconSet::Normal);
  12.143 -    Rowdeliset.setPixmap(QPixmap(s_kpcDrowdel_xpm), QIconSet::Automatic, QIconSet::Disabled);
  12.144 -    Refreshiset.setPixmap(QPixmap(s_kpcRefresh_xpm), QIconSet::Automatic, QIconSet::Normal);
  12.145 -    Refreshiset.setPixmap(QPixmap(s_kpcDrefresh_xpm), QIconSet::Automatic, QIconSet::Disabled);
  12.146 -    Synciset.setPixmap(QPixmap(s_kpcSync_xpm), QIconSet::Automatic, QIconSet::Normal);
  12.147 -    Synciset.setPixmap(QPixmap(s_kpcDsync_xpm), QIconSet::Automatic, QIconSet::Disabled);
  12.148 -    Reportiset.setPixmap(QPixmap(s_kpcReport_xpm), QIconSet::Automatic, QIconSet::Normal);
  12.149 -    Reportiset.setPixmap(QPixmap(s_kpcDreport_xpm), QIconSet::Automatic, QIconSet::Disabled);
  12.150 +    Saveiset.setPixmap(QPixmap(s_kpcFilesave_xpm), QIcon::Automatic, QIcon::Normal);
  12.151 +    Saveiset.setPixmap(QPixmap(s_kpcDfilesave_xpm), QIcon::Automatic, QIcon::Disabled);
  12.152 +    Cutiset.setPixmap(QPixmap(s_kpcCut_xpm), QIcon::Automatic, QIcon::Normal);
  12.153 +    Cutiset.setPixmap(QPixmap(s_kpcDcut_xpm), QIcon::Automatic, QIcon::Disabled);
  12.154 +    Copyiset.setPixmap(QPixmap(s_kpcCopy_xpm), QIcon::Automatic, QIcon::Normal);
  12.155 +    Copyiset.setPixmap(QPixmap(s_kpcDcopy_xpm), QIcon::Automatic, QIcon::Disabled);
  12.156 +    Pasteiset.setPixmap(QPixmap(s_kpcPaste_xpm), QIcon::Automatic, QIcon::Normal);
  12.157 +    Pasteiset.setPixmap(QPixmap(s_kpcDpaste_xpm), QIcon::Automatic, QIcon::Disabled);
  12.158 +    Rowaddiset.setPixmap(QPixmap(s_kpcRowadd_xpm), QIcon::Automatic, QIcon::Normal);
  12.159 +    Rowaddiset.setPixmap(QPixmap(s_kpcDrowadd_xpm), QIcon::Automatic, QIcon::Disabled);
  12.160 +    Rowdeliset.setPixmap(QPixmap(s_kpcRowdel_xpm), QIcon::Automatic, QIcon::Normal);
  12.161 +    Rowdeliset.setPixmap(QPixmap(s_kpcDrowdel_xpm), QIcon::Automatic, QIcon::Disabled);
  12.162 +    Refreshiset.setPixmap(QPixmap(s_kpcRefresh_xpm), QIcon::Automatic, QIcon::Normal);
  12.163 +    Refreshiset.setPixmap(QPixmap(s_kpcDrefresh_xpm), QIcon::Automatic, QIcon::Disabled);
  12.164 +    Synciset.setPixmap(QPixmap(s_kpcSync_xpm), QIcon::Automatic, QIcon::Normal);
  12.165 +    Synciset.setPixmap(QPixmap(s_kpcDsync_xpm), QIcon::Automatic, QIcon::Disabled);
  12.166 +    Reportiset.setPixmap(QPixmap(s_kpcReport_xpm), QIcon::Automatic, QIcon::Normal);
  12.167 +    Reportiset.setPixmap(QPixmap(s_kpcDreport_xpm), QIcon::Automatic, QIcon::Disabled);
  12.168  
  12.169      // First associate the graphics with MIME types
  12.170 -    QMimeSourceFactory::defaultFactory()->setPixmap("osspicon", QPixmap(s_kpcOsspicon_xpm));
  12.171 -    QMimeSourceFactory::defaultFactory()->setPixmap("filenew", QPixmap(s_kpcFilenew_xpm));
  12.172 -    QMimeSourceFactory::defaultFactory()->setPixmap("fileopen", QPixmap(s_kpcFileopen_xpm));
  12.173 -    QMimeSourceFactory::defaultFactory()->setPixmap("filesave", QPixmap(s_kpcFilesave_xpm));
  12.174 -    QMimeSourceFactory::defaultFactory()->setPixmap("cut", QPixmap(s_kpcCut_xpm));
  12.175 -    QMimeSourceFactory::defaultFactory()->setPixmap("copy", QPixmap(s_kpcCopy_xpm));
  12.176 -    QMimeSourceFactory::defaultFactory()->setPixmap("paste", QPixmap(s_kpcPaste_xpm));
  12.177 -    QMimeSourceFactory::defaultFactory()->setPixmap("rowadd", QPixmap(s_kpcRowadd_xpm));
  12.178 -    QMimeSourceFactory::defaultFactory()->setPixmap("rowdel", QPixmap(s_kpcRowdel_xpm));
  12.179 -    QMimeSourceFactory::defaultFactory()->setPixmap("refresh", QPixmap(s_kpcRefresh_xpm));
  12.180 -    QMimeSourceFactory::defaultFactory()->setPixmap("syncrpc", QPixmap(s_kpcSync_xpm));
  12.181 -    QMimeSourceFactory::defaultFactory()->setPixmap("locreport", QPixmap(s_kpcReport_xpm));
  12.182 -    QMimeSourceFactory::defaultFactory()->setPixmap("prefs", QPixmap(s_kpcPrefs_xpm));
  12.183 +    Q3MimeSourceFactory::defaultFactory()->setPixmap("osspicon", QPixmap(s_kpcOsspicon_xpm));
  12.184 +    Q3MimeSourceFactory::defaultFactory()->setPixmap("filenew", QPixmap(s_kpcFilenew_xpm));
  12.185 +    Q3MimeSourceFactory::defaultFactory()->setPixmap("fileopen", QPixmap(s_kpcFileopen_xpm));
  12.186 +    Q3MimeSourceFactory::defaultFactory()->setPixmap("filesave", QPixmap(s_kpcFilesave_xpm));
  12.187 +    Q3MimeSourceFactory::defaultFactory()->setPixmap("cut", QPixmap(s_kpcCut_xpm));
  12.188 +    Q3MimeSourceFactory::defaultFactory()->setPixmap("copy", QPixmap(s_kpcCopy_xpm));
  12.189 +    Q3MimeSourceFactory::defaultFactory()->setPixmap("paste", QPixmap(s_kpcPaste_xpm));
  12.190 +    Q3MimeSourceFactory::defaultFactory()->setPixmap("rowadd", QPixmap(s_kpcRowadd_xpm));
  12.191 +    Q3MimeSourceFactory::defaultFactory()->setPixmap("rowdel", QPixmap(s_kpcRowdel_xpm));
  12.192 +    Q3MimeSourceFactory::defaultFactory()->setPixmap("refresh", QPixmap(s_kpcRefresh_xpm));
  12.193 +    Q3MimeSourceFactory::defaultFactory()->setPixmap("syncrpc", QPixmap(s_kpcSync_xpm));
  12.194 +    Q3MimeSourceFactory::defaultFactory()->setPixmap("locreport", QPixmap(s_kpcReport_xpm));
  12.195 +    Q3MimeSourceFactory::defaultFactory()->setPixmap("prefs", QPixmap(s_kpcPrefs_xpm));
  12.196  
  12.197      // File new action
  12.198 -    m_pFilenewact = new QAction(trUtf8("New File"), QPixmap(s_kpcFilenew_xpm), trUtf8("&New"), CTRL+Key_N, this, "New");
  12.199 +    m_pFilenewact = new Q3Action(trUtf8("New File"), QPixmap(s_kpcFilenew_xpm), trUtf8("&New"), Qt::CTRL+Qt::Key_N, this, "New");
  12.200      if (m_pFilenewact == NULL)  // Sanity check
  12.201          throw Genexcept("Main window file new action creation failed.");
  12.202      connect(m_pFilenewact, SIGNAL(activated()), SLOT(newDoc()));
  12.203 @@ -229,7 +245,7 @@
  12.204      m_pFilenewact->setWhatsThis(kszFilenewtext);
  12.205  
  12.206      // File open action
  12.207 -    m_pFileopenact = new QAction(trUtf8("Open File"), QPixmap(s_kpcFileopen_xpm), trUtf8("&Open..."), CTRL+Key_O, this, "Open");
  12.208 +    m_pFileopenact = new Q3Action(trUtf8("Open File"), QPixmap(s_kpcFileopen_xpm), trUtf8("&Open..."), Qt::CTRL+Qt::Key_O, this, "Open");
  12.209      if (m_pFileopenact == NULL) // Sanity check
  12.210          throw Genexcept("Main window file open action creation failed.");
  12.211      connect(m_pFileopenact, SIGNAL(activated()), SLOT(openDoc()));
  12.212 @@ -241,7 +257,7 @@
  12.213      m_pFileopenact->setWhatsThis(kszFileopentext);
  12.214  
  12.215      // File save current action
  12.216 -    m_pFilesaveact = new QAction(trUtf8("Save File"), Saveiset, trUtf8("&Save"), CTRL+Key_S, this, "Save");
  12.217 +    m_pFilesaveact = new Q3Action(trUtf8("Save File"), Saveiset, trUtf8("&Save"), Qt::CTRL+Qt::Key_S, this, "Save");
  12.218      if (m_pFilesaveact == NULL) // Sanity check
  12.219          throw Genexcept("Main window file save action creation failed.");
  12.220      connect(m_pFilesaveact, SIGNAL(activated()), SLOT(saveFile()));
  12.221 @@ -254,26 +270,26 @@
  12.222      m_pFilesaveact->setWhatsThis(kszFilesavetext);
  12.223  
  12.224      // File save selected action
  12.225 -    m_pFilesaveasact = new QAction(trUtf8("Save File As"), trUtf8("Save &As..."), 0, this, "SaveAs");
  12.226 +    m_pFilesaveasact = new Q3Action(trUtf8("Save File As"), trUtf8("Save &As..."), 0, this, "SaveAs");
  12.227      if (m_pFilesaveasact == NULL)   // Sanity check
  12.228          throw Genexcept("Main window file save as action creation failed.");
  12.229      connect(m_pFilesaveasact, SIGNAL(activated()), SLOT(saveAs()));
  12.230      m_pFilesaveasact->setWhatsThis(kszFilesavetext);
  12.231  
  12.232      // File close current action
  12.233 -    m_pFilecloseact = new QAction(trUtf8("Close"), trUtf8("&Close"), CTRL+Key_W, this, "Close");
  12.234 +    m_pFilecloseact = new Q3Action(trUtf8("Close"), trUtf8("&Close"), Qt::CTRL+Qt::Key_W, this, "Close");
  12.235      if (m_pFilecloseact == NULL)    // Sanity check
  12.236          throw Genexcept("Main window file close action creation failed.");
  12.237      connect(m_pFilecloseact, SIGNAL(activated()), SLOT(close()));
  12.238  
  12.239      // File quit action
  12.240 -    m_pFilequitact = new QAction(trUtf8("Exit"), trUtf8("E&xit"), CTRL+Key_Q, this, "Exit");
  12.241 +    m_pFilequitact = new Q3Action(trUtf8("Exit"), trUtf8("E&xit"), Qt::CTRL+Qt::Key_Q, this, "Exit");
  12.242      if (m_pFilequitact == NULL)     // Sanity check
  12.243          throw Genexcept("Main window file quit action creation failed.");
  12.244      connect(m_pFilequitact, SIGNAL(activated()), SLOT(quitApp()));
  12.245  
  12.246      // Cut action
  12.247 -    m_pCutact = new QAction(trUtf8("Cut"), Cutiset, trUtf8("&Cut"), CTRL+Key_X, this, "Cut");
  12.248 +    m_pCutact = new Q3Action(trUtf8("Cut"), Cutiset, trUtf8("&Cut"), Qt::CTRL+Qt::Key_X, this, "Cut");
  12.249      if (m_pCutact == NULL)      // Sanity check
  12.250          throw Genexcept("Main window cut edit action creation failed.");
  12.251      connect(m_pCutact, SIGNAL(activated()), SLOT(cutEntry()));
  12.252 @@ -284,7 +300,7 @@
  12.253      m_pCutact->setWhatsThis(kszCuttext);
  12.254  
  12.255      // Copy action
  12.256 -    m_pCopyact = new QAction(trUtf8("Copy"), Copyiset, trUtf8("&Copy"), CTRL+Key_C, this, "Copy");
  12.257 +    m_pCopyact = new Q3Action(trUtf8("Copy"), Copyiset, trUtf8("&Copy"), Qt::CTRL+Qt::Key_C, this, "Copy");
  12.258      if (m_pCopyact == NULL)     // Sanity check
  12.259          throw Genexcept("Main window copy edit action creation failed.");
  12.260      connect(m_pCopyact, SIGNAL(activated()), SLOT(copyEntry()));
  12.261 @@ -295,7 +311,7 @@
  12.262      m_pCopyact->setWhatsThis(kszCopytext);
  12.263  
  12.264      // Paste action
  12.265 -    m_pPasteact = new QAction(trUtf8("Paste"), Pasteiset, trUtf8("&Paste"), CTRL+Key_V, this, "Paste");
  12.266 +    m_pPasteact = new Q3Action(trUtf8("Paste"), Pasteiset, trUtf8("&Paste"), Qt::CTRL+Qt::Key_V, this, "Paste");
  12.267      if (m_pPasteact == NULL)    // Sanity check
  12.268          throw Genexcept("Main window paste edit action creation failed.");
  12.269      connect(m_pPasteact, SIGNAL(activated()), SLOT(pasteEntry()));
  12.270 @@ -306,7 +322,7 @@
  12.271      m_pPasteact->setWhatsThis(kszPastetext);
  12.272  
  12.273      // Add data row action
  12.274 -    m_pAddrowact = new QAction(trUtf8("Add Entry"), Rowaddiset, trUtf8("&Add entry"), Key_Insert, this, "Addentry");
  12.275 +    m_pAddrowact = new Q3Action(trUtf8("Add Entry"), Rowaddiset, trUtf8("&Add entry"), Qt::Key_Insert, this, "Addentry");
  12.276      if (m_pAddrowact == NULL)   // Sanity check
  12.277          throw Genexcept("Main window add entry action creation failed.");
  12.278      connect(m_pAddrowact, SIGNAL(activated()), SLOT(addEntry()));
  12.279 @@ -317,7 +333,7 @@
  12.280      m_pAddrowact->setWhatsThis(kszAddrowtext);
  12.281  
  12.282      // Delete data row action
  12.283 -    m_pDelrowact = new QAction(trUtf8("Delete Entry"), Rowdeliset, trUtf8("&Delete entry"), Key_Delete, this, "Delentry");
  12.284 +    m_pDelrowact = new Q3Action(trUtf8("Delete Entry"), Rowdeliset, trUtf8("&Delete entry"), Qt::Key_Delete, this, "Delentry");
  12.285      if (m_pDelrowact == NULL)   // Sanity check
  12.286          throw Genexcept("Main window delete entry action creation failed.");
  12.287      connect(m_pDelrowact, SIGNAL(activated()), SLOT(delEntry()));
  12.288 @@ -328,7 +344,7 @@
  12.289      m_pDelrowact->setWhatsThis(kszDelrowtext);
  12.290  
  12.291      // Refresh data display action
  12.292 -    m_pRefreshact = new QAction(trUtf8("Refresh Display"), Refreshiset, trUtf8("&Refresh display"), CTRL+Key_R, this, "Refresh");
  12.293 +    m_pRefreshact = new Q3Action(trUtf8("Refresh Display"), Refreshiset, trUtf8("&Refresh display"), Qt::CTRL+Qt::Key_R, this, "Refresh");
  12.294      if (m_pRefreshact == NULL)  // Sanity check
  12.295          throw Genexcept("Main window refresh action creation failed.");
  12.296      connect(m_pRefreshact, SIGNAL(activated()), SLOT(refreshDisplay()));
  12.297 @@ -339,7 +355,7 @@
  12.298      m_pRefreshact->setWhatsThis(kszRefreshtext);
  12.299  
  12.300      // Syncronize data with remote server over IIOP or SOAP action
  12.301 -    m_pSyncact = new QAction(trUtf8("Synchronize with server"), Synciset, trUtf8("&Synchronize"), CTRL+Key_E, this, "Synchronize");
  12.302 +    m_pSyncact = new Q3Action(trUtf8("Synchronize with server"), Synciset, trUtf8("&Synchronize"), Qt::CTRL+Qt::Key_E, this, "Synchronize");
  12.303      if (m_pSyncact == NULL) // Sanity check
  12.304          throw Genexcept("Main window synchronize RPC action creation failed.");
  12.305      connect(m_pSyncact, SIGNAL(activated()), SLOT(syncIiop()));
  12.306 @@ -352,7 +368,7 @@
  12.307      m_pSyncact->setWhatsThis(kszSynctext);
  12.308  
  12.309      // Local report generation action
  12.310 -    m_pReportact = new QAction(trUtf8("Generate a local report"), Reportiset, trUtf8("&Report"), CTRL+Key_T, this, "LocalReport");
  12.311 +    m_pReportact = new Q3Action(trUtf8("Generate a local report"), Reportiset, trUtf8("&Report"), Qt::CTRL+Qt::Key_T, this, "LocalReport");
  12.312      if (m_pReportact == NULL) // Sanity check
  12.313          throw Genexcept("Main window local report action creation failed.");
  12.314      connect(m_pReportact, SIGNAL(activated()), SLOT(genReport()));
  12.315 @@ -364,7 +380,7 @@
  12.316      m_pReportact->setWhatsThis(kszReporttext);
  12.317  
  12.318      // Offer a formatted preferences panel for intuitive prefs object editing
  12.319 -    m_pPrefsact = new QAction(trUtf8("Edit the preferences"), QPixmap(s_kpcPrefs_xpm), trUtf8("P&references..."), CTRL+Key_F, this, "Prefspanel");
  12.320 +    m_pPrefsact = new Q3Action(trUtf8("Edit the preferences"), QPixmap(s_kpcPrefs_xpm), trUtf8("P&references..."), Qt::CTRL+Qt::Key_F, this, "Prefspanel");
  12.321      if (m_pPrefsact == NULL) // Sanity check
  12.322          throw Genexcept("Main window preferences panel action creation failed.");
  12.323      connect(m_pPrefsact, SIGNAL(activated()), SLOT(configPrefs()));
  12.324 @@ -391,7 +407,7 @@
  12.325  //    QToolTip::add(m_pMenubar, QRect(0, 0, 2, 2), trUtf8("Easter Egg"));
  12.326  
  12.327      // Construct and populate the file menu with actions
  12.328 -    QPopupMenu *pFilepopup = new QPopupMenu(this);
  12.329 +    Q3PopupMenu *pFilepopup = new Q3PopupMenu(this);
  12.330      if (pFilepopup == NULL) // Sanity check
  12.331          throw Genexcept("Main window file popup creation failed.");
  12.332      m_pMenubar->insertItem(trUtf8("&File"), pFilepopup);
  12.333 @@ -406,7 +422,7 @@
  12.334      m_pFilequitact->addTo(pFilepopup);
  12.335  
  12.336      // Construct and populate the edit menu with subitems
  12.337 -    QPopupMenu *pEditpopup = new QPopupMenu(this);
  12.338 +    Q3PopupMenu *pEditpopup = new Q3PopupMenu(this);
  12.339      if (pEditpopup == NULL) // Sanity check
  12.340          throw Genexcept("Main window edit popup creation failed.");
  12.341      m_pMenubar->insertItem(trUtf8("&Edit"), pEditpopup);
  12.342 @@ -420,9 +436,9 @@
  12.343      m_pPrefsact->addTo(pEditpopup);
  12.344  
  12.345      // Construct the view menu and submenus
  12.346 -    m_pViewpopup = new QPopupMenu(this);
  12.347 -    m_pTbarspopup = new QPopupMenu(this);
  12.348 -    m_pColspopup = new QPopupMenu(this);
  12.349 +    m_pViewpopup = new Q3PopupMenu(this);
  12.350 +    m_pTbarspopup = new Q3PopupMenu(this);
  12.351 +    m_pColspopup = new Q3PopupMenu(this);
  12.352  
  12.353      // Give the new menus krass attributes
  12.354      m_pTbarspopup->insertTearOffHandle();
  12.355 @@ -482,7 +498,7 @@
  12.356      m_pColspopup->setItemChecked(nMenuid, true);
  12.357  
  12.358      // Construct and populate the report menu with subitems
  12.359 -    QPopupMenu *pReportpopup = new QPopupMenu(this);
  12.360 +    Q3PopupMenu *pReportpopup = new Q3PopupMenu(this);
  12.361      if (pReportpopup == NULL) // Sanity check
  12.362          throw Genexcept("Main window report popup creation failed.");
  12.363      m_pMenubar->insertItem(trUtf8("&Report"), pReportpopup);
  12.364 @@ -497,17 +513,17 @@
  12.365      m_pMenubar->insertSeparator();
  12.366  
  12.367      // Construct and populate the help menu with subitems
  12.368 -    QPopupMenu *pHelppopup = new QPopupMenu(this);
  12.369 +    Q3PopupMenu *pHelppopup = new Q3PopupMenu(this);
  12.370      if (pHelppopup == NULL) // Sanity check
  12.371          throw Genexcept("Main window help popup creation failed.");
  12.372      m_pMenubar->insertItem(trUtf8("&Help"), pHelppopup);
  12.373 -    pHelppopup->insertItem(trUtf8("&Contents"), this, SLOT(helpContents()), Key_F1);
  12.374 +    pHelppopup->insertItem(trUtf8("&Contents"), this, SLOT(helpContents()), Qt::Key_F1);
  12.375      pHelppopup->insertSeparator();
  12.376      pHelppopup->insertItem(trUtf8("About &as-gui"), this, SLOT(aboutTitraq()));
  12.377      pHelppopup->insertItem(trUtf8("About &OSSP"), this, SLOT(aboutOSSP()));
  12.378      pHelppopup->insertItem(trUtf8("About &Qt"), this, SLOT(aboutQt()));
  12.379      pHelppopup->insertSeparator();
  12.380 -    pHelppopup->insertItem(QPixmap(s_kpcWhatsthis_xpm), trUtf8("What's &This"), this, SLOT(whatsThis()), SHIFT+Key_F1);
  12.381 +    pHelppopup->insertItem(QPixmap(s_kpcWhatsthis_xpm), trUtf8("What's &This"), this, SLOT(whatsThis()), Qt::SHIFT+Qt::Key_F1);
  12.382  }
  12.383  
  12.384  //
  12.385 @@ -516,23 +532,23 @@
  12.386  void Titraqform::setupToolbars(void)
  12.387  {
  12.388      // Construct and populate the file tool bar
  12.389 -    m_pFiletools = new QToolBar("Toolfile", this, DockTop);
  12.390 +    m_pFiletools = new Q3ToolBar("Toolfile", this, Qt::DockTop);
  12.391      if (m_pFiletools == NULL)                   // Sanity check
  12.392          throw Genexcept("File tool bar creation failed.");
  12.393      m_pFiletools->setLabel(trUtf8("File Ops"));
  12.394      m_pFiletools->setOpaqueMoving(false);
  12.395 -    m_pFiletools->setCloseMode(QDockWindow::Never);
  12.396 +    m_pFiletools->setCloseMode(Q3DockWindow::Never);
  12.397      m_pFilenewact->addTo(m_pFiletools);
  12.398      m_pFileopenact->addTo(m_pFiletools);
  12.399      m_pFilesaveact->addTo(m_pFiletools);
  12.400  
  12.401      // Construct and populate the edit tool bar
  12.402 -    m_pEdittools = new QToolBar("Tooledit", this, DockTop);
  12.403 +    m_pEdittools = new Q3ToolBar("Tooledit", this, Qt::DockTop);
  12.404      if (m_pEdittools == NULL)                   // Sanity check
  12.405          throw Genexcept("Edit tool bar creation failed.");
  12.406      m_pEdittools->setLabel(trUtf8("Edit Ops"));
  12.407      m_pEdittools->setOpaqueMoving(false);
  12.408 -    m_pEdittools->setCloseMode(QDockWindow::Never);
  12.409 +    m_pEdittools->setCloseMode(Q3DockWindow::Never);
  12.410      m_pCutact->addTo(m_pEdittools);
  12.411      m_pCopyact->addTo(m_pEdittools);
  12.412      m_pPasteact->addTo(m_pEdittools);
  12.413 @@ -541,33 +557,33 @@
  12.414      m_pDelrowact->addTo(m_pEdittools);
  12.415  
  12.416      // Construct and populate the view tool bar
  12.417 -    m_pViewtools = new QToolBar("Toolview", this, DockTop);
  12.418 +    m_pViewtools = new Q3ToolBar("Toolview", this, Qt::DockTop);
  12.419      if (m_pViewtools == NULL)                   // Sanity check
  12.420          throw Genexcept("View tool bar creation failed.");
  12.421      m_pViewtools->setLabel(trUtf8("View Ops"));
  12.422      m_pViewtools->setOpaqueMoving(false);
  12.423 -    m_pViewtools->setCloseMode(QDockWindow::Never);
  12.424 +    m_pViewtools->setCloseMode(Q3DockWindow::Never);
  12.425      m_pRefreshact->addTo(m_pViewtools);
  12.426      m_pReportact->addTo(m_pViewtools);
  12.427      m_pSyncact->addTo(m_pViewtools);
  12.428  
  12.429      // Construct and populate the lonely preferences tool bar
  12.430 -    m_pPrefstools = new QToolBar("Preferences", this, DockTop);
  12.431 +    m_pPrefstools = new Q3ToolBar("Preferences", this, Qt::DockTop);
  12.432      if (m_pPrefstools == NULL)                   // Sanity check
  12.433          throw Genexcept("Prefs tool bar creation failed.");
  12.434      m_pPrefstools->setLabel(trUtf8("Preferences editor"));
  12.435      m_pPrefstools->setOpaqueMoving(false);
  12.436 -    m_pPrefstools->setCloseMode(QDockWindow::Never);
  12.437 +    m_pPrefstools->setCloseMode(Q3DockWindow::Never);
  12.438      m_pPrefsact->addTo(m_pPrefstools);
  12.439  
  12.440      // Construct and populate the lonely whatsthis tool bar
  12.441 -    m_pWhatstools = new QToolBar("Toolwhats", this, DockTop);
  12.442 +    m_pWhatstools = new Q3ToolBar("Toolwhats", this, Qt::DockTop);
  12.443      if (m_pWhatstools == NULL)                  // Sanity check
  12.444          throw Genexcept("Whats this tool bar creation failed.");
  12.445      m_pWhatstools->setLabel(trUtf8("Whats this"));
  12.446      m_pWhatstools->setOpaqueMoving(false);
  12.447 -    m_pWhatstools->setCloseMode(QDockWindow::Never);
  12.448 -    QWhatsThis::whatsThisButton(m_pWhatstools); // Preconfigured whats this button
  12.449 +    m_pWhatstools->setCloseMode(Q3DockWindow::Never);
  12.450 +    Q3WhatsThis::whatsThisButton(m_pWhatstools); // Preconfigured whats this button
  12.451  }
  12.452  
  12.453  //
  12.454 @@ -576,17 +592,17 @@
  12.455  void Titraqform::setupCentralwidget(void)
  12.456  {
  12.457      // Create a central frame and associated layout for QMainWindow
  12.458 -    m_pCenframe = new QFrame(this, "Centralframe");
  12.459 +    m_pCenframe = new Q3Frame(this, "Centralframe");
  12.460      if (m_pCenframe == NULL)    // Sanity check
  12.461          throw Genexcept("Main window central frame creation failed.");
  12.462 -    m_pCenframe->setFrameShape(QFrame::StyledPanel);
  12.463 -    m_pCenframe->setFrameShadow(QFrame::Sunken);
  12.464 +    m_pCenframe->setFrameShape(Q3Frame::StyledPanel);
  12.465 +    m_pCenframe->setFrameShadow(Q3Frame::Sunken);
  12.466      this->setCentralWidget(m_pCenframe);
  12.467  
  12.468      // Layout controls for table, editing widgets
  12.469 -    m_pMainlayout = new QVBoxLayout(m_pCenframe, TITRAQ_MARGIN, TITRAQ_SPACING, "Mainlayout");  // For layouts
  12.470 -    m_pPackagelayout = new QVBoxLayout(0, 0, TITRAQ_SPACING, "Packagelayout");  // For table
  12.471 -    m_pEditlayout = new QHBoxLayout(0, 0, TITRAQ_SPACING, "Editlayout");        // For edits
  12.472 +    m_pMainlayout = new Q3VBoxLayout(m_pCenframe, TITRAQ_MARGIN, TITRAQ_SPACING, "Mainlayout");  // For layouts
  12.473 +    m_pPackagelayout = new Q3VBoxLayout(0, 0, TITRAQ_SPACING, "Packagelayout");  // For table
  12.474 +    m_pEditlayout = new Q3HBoxLayout(0, 0, TITRAQ_SPACING, "Editlayout");        // For edits
  12.475  
  12.476      // Major sanity check wrapped in one call
  12.477      if (!(m_pMainlayout && m_pPackagelayout && m_pEditlayout))
  12.478 @@ -620,8 +636,8 @@
  12.479      m_pMaintable->setDirty(false);              // Reset data to clean state
  12.480      m_pMaintable->setReadOnly(true);                    // Table is read only
  12.481      m_pMaintable->setColumnMovingEnabled(false);        // Ctrl-drag disabled
  12.482 -    m_pMaintable->setSelectionMode(QTable::MultiRow);   // Multi row selection
  12.483 -    m_pMaintable->setFocusStyle(QTable::FollowStyle);   // How cells are drawn
  12.484 +    m_pMaintable->setSelectionMode(Q3Table::MultiRow);   // Multi row selection
  12.485 +    m_pMaintable->setFocusStyle(Q3Table::FollowStyle);   // How cells are drawn
  12.486      m_pMaintable->setLeftMargin(0);             // Get rid of the vertical header
  12.487      m_pMaintable->verticalHeader()->hide();     // by hiding it with a margin of 0
  12.488      m_pMaintable->horizontalHeader()->setResizeEnabled(true);
  12.489 @@ -636,7 +652,7 @@
  12.490  
  12.491      // Table header row
  12.492      m_pTablehead = m_pMaintable->horizontalHeader();
  12.493 -    m_pMaintable->setHScrollBarMode(QScrollView::AlwaysOff);
  12.494 +    m_pMaintable->setHScrollBarMode(Q3ScrollView::AlwaysOff);
  12.495      m_pTablehead->setLabel(TITRAQ_IDXSTATUS, QObject::trUtf8("Stat"),
  12.496          m_pPrefs->getNumber(TITRAQ_PREFSTATCOLWIDTH, TITRAQ_DEFSTATCOLWIDTH));
  12.497      m_pMaintable->setColumnReadOnly (TITRAQ_IDXSTATUS, true);
  12.498 @@ -696,7 +712,7 @@
  12.499      const char *kszStatustext = "The <em>item status</em> shows a green "
  12.500                                  "symbol for valid entries, a yellow symbol "
  12.501                                  "for warning, and a red symbol for flawed entries.";
  12.502 -    QWhatsThis::add(m_pStatusedit, kszStatustext);
  12.503 +    Q3WhatsThis::add(m_pStatusedit, kszStatustext);
  12.504      QToolTip::add(m_pStatusedit, trUtf8("Status Indicator"));
  12.505      m_pEditlayout->addWidget(m_pStatusedit);  // Finally add the item status edit
  12.506  
  12.507 @@ -715,7 +731,7 @@
  12.508      const char *kszLinenotext = "The <em>line number</em> helps identify "
  12.509                                  "an entry when a warning or error message "
  12.510                                  "appears.";
  12.511 -    QWhatsThis::add(m_pLineedit, kszLinenotext);
  12.512 +    Q3WhatsThis::add(m_pLineedit, kszLinenotext);
  12.513      QToolTip::add(m_pLineedit, trUtf8("Line Number"));
  12.514      m_pEditlayout->addWidget(m_pLineedit);  // Finally add the line number edit
  12.515  
  12.516 @@ -733,7 +749,7 @@
  12.517      const char *kszUsertext = "Edit the <em>user name</em> by clicking "
  12.518                                "on this control and typing the user name "
  12.519                                "you want to account.";
  12.520 -    QWhatsThis::add(m_pUseredit, kszUsertext);
  12.521 +    Q3WhatsThis::add(m_pUseredit, kszUsertext);
  12.522      QToolTip::add(m_pUseredit, trUtf8("User Name"));
  12.523      m_pEditlayout->addWidget(m_pUseredit);  // Finally add the user edit
  12.524  
  12.525 @@ -751,7 +767,7 @@
  12.526      const char *kszGuidtext = "Edit the <em>GUID</em> by clicking "
  12.527                                "on this control and typing the GUID "
  12.528                                "corresponding to this account item.";
  12.529 -    QWhatsThis::add(m_pGuidedit, kszGuidtext);
  12.530 +    Q3WhatsThis::add(m_pGuidedit, kszGuidtext);
  12.531      QToolTip::add(m_pGuidedit, trUtf8("GUID"));
  12.532      m_pEditlayout->addWidget(m_pGuidedit);  // Finally add the GUID edit
  12.533  
  12.534 @@ -769,7 +785,7 @@
  12.535      const char *kszCrctext = "Edit the <em>CRC</em> by clicking "
  12.536                               "on this control and typing the new "
  12.537                               "value for this account item.";
  12.538 -    QWhatsThis::add(m_pCrcedit, kszCrctext);
  12.539 +    Q3WhatsThis::add(m_pCrcedit, kszCrctext);
  12.540      QToolTip::add(m_pCrcedit, trUtf8("CRC"));
  12.541      m_pEditlayout->addWidget(m_pCrcedit);  // Finally add the CRC edit
  12.542  
  12.543 @@ -787,7 +803,7 @@
  12.544      const char *kszRevtext = "Edit the <em>revision</em> by clicking "
  12.545                               "on this control and typing the new value "
  12.546                               "for this account type.";
  12.547 -    QWhatsThis::add(m_pRevedit, kszRevtext);
  12.548 +    Q3WhatsThis::add(m_pRevedit, kszRevtext);
  12.549      QToolTip::add(m_pRevedit, trUtf8("Revision"));
  12.550      m_pEditlayout->addWidget(m_pRevedit);  // Finally add the revision edit
  12.551  
  12.552 @@ -797,7 +813,7 @@
  12.553          throw Genexcept("Main window date edit creation failed.");  // Spew errors
  12.554  
  12.555      // Configure attributes
  12.556 -    m_pDateedit->setOrder(QDateEdit::YMD);
  12.557 +    m_pDateedit->setOrder(Q3DateEdit::YMD);
  12.558      m_pDateedit->setAutoAdvance(true);
  12.559      m_pDateedit->setSeparator(trUtf8("-"));
  12.560      m_pDateedit->setEnabled(false);
  12.561 @@ -806,17 +822,17 @@
  12.562      const char *kszDateedit = "Edit the <em>task date</em> by clicking on "
  12.563                                "the year, month, or day, and then changing their "
  12.564                                "values with the arrow buttons.";
  12.565 -    QWhatsThis::add(m_pDateedit, kszDateedit);
  12.566 +    Q3WhatsThis::add(m_pDateedit, kszDateedit);
  12.567      QToolTip::add(m_pDateedit, trUtf8("Task Date"));
  12.568      m_pEditlayout->addWidget(m_pDateedit);                          // Finally add the date editor
  12.569  
  12.570      // Make the start time selector
  12.571 -    m_pStarttime = new QTimeEdit(m_pCenframe, "StartTime");
  12.572 +    m_pStarttime = new Q3TimeEdit(m_pCenframe, "StartTime");
  12.573      if (m_pStarttime == NULL)                                       // Sanity check
  12.574          throw Genexcept("Main window start time creation failed."); // Spew errors
  12.575  
  12.576      // Configure attributes
  12.577 -    m_pStarttime->setDisplay(QTimeEdit::Hours | QTimeEdit::Minutes);
  12.578 +    m_pStarttime->setDisplay(Q3TimeEdit::Hours | Q3TimeEdit::Minutes);
  12.579      m_pStarttime->setAutoAdvance(true);
  12.580      m_pStarttime->setEnabled(false);
  12.581  
  12.582 @@ -824,17 +840,17 @@
  12.583      const char *kszStarttime = "Edit the <em>task starting time</em> by clicking on "
  12.584                                 "the hour and minute, and then changing their "
  12.585                                 "values with the arrow buttons.";
  12.586 -    QWhatsThis::add(m_pStarttime, kszStarttime);
  12.587 +    Q3WhatsThis::add(m_pStarttime, kszStarttime);
  12.588      QToolTip::add(m_pStarttime, trUtf8("Task Starting Time"));
  12.589      m_pEditlayout->addWidget(m_pStarttime);                         // Finally add the start editor
  12.590  
  12.591      // Make the end time selector
  12.592 -    m_pEndtime = new QTimeEdit(m_pCenframe, "EndTime");
  12.593 +    m_pEndtime = new Q3TimeEdit(m_pCenframe, "EndTime");
  12.594      if (m_pEndtime == NULL)                                         // Sanity check
  12.595          throw Genexcept("Main window end time creation failed.");   // Spew errors
  12.596  
  12.597      // Configure attributes
  12.598 -    m_pEndtime->setDisplay(QTimeEdit::Hours | QTimeEdit::Minutes);
  12.599 +    m_pEndtime->setDisplay(Q3TimeEdit::Hours | Q3TimeEdit::Minutes);
  12.600      m_pEndtime->setAutoAdvance(true);
  12.601      m_pEndtime->setEnabled(false);
  12.602  
  12.603 @@ -842,7 +858,7 @@
  12.604      const char *kszEndtime = "Edit the <em>task ending time</em> by clicking on "
  12.605                               "the hour and minute, and then changing their "
  12.606                               "values with the arrow buttons.";
  12.607 -    QWhatsThis::add(m_pEndtime, kszEndtime);
  12.608 +    Q3WhatsThis::add(m_pEndtime, kszEndtime);
  12.609      QToolTip::add(m_pEndtime, trUtf8("Task Ending Time"));
  12.610      m_pEditlayout->addWidget(m_pEndtime);                           // Finally add the end editor
  12.611  
  12.612 @@ -865,7 +881,7 @@
  12.613      const char *kszAmount = "Edit the <em>task amount</em> by clicking on "
  12.614                              "the amount, and then changing its "
  12.615                              "value with the arrow buttons.";
  12.616 -    QWhatsThis::add(m_pAmount, kszAmount);
  12.617 +    Q3WhatsThis::add(m_pAmount, kszAmount);
  12.618      QToolTip::add(m_pAmount, trUtf8("Task Amount"));
  12.619      m_pAmount->setEnabled(false);           // Don't enable until it's ready
  12.620      m_pEditlayout->addWidget(m_pAmount);    // Finally add the amount editor
  12.621 @@ -883,7 +899,7 @@
  12.622      this->loadAccounts(Filetemp);   // Load account helper method
  12.623  
  12.624      // Make the combobox task edit
  12.625 -    m_pTasks = new QComboBox(true, m_pCenframe, "Tasks");
  12.626 +    m_pTasks = new Q3ComboBox(true, m_pCenframe, "Tasks");
  12.627      if (m_pTasks == NULL)   // Sanity check
  12.628          throw Genexcept("Main window task edit creation failed.");
  12.629      m_pTasks->insertStringList(*m_pTaskentries);
  12.630 @@ -899,7 +915,7 @@
  12.631          int nPopupwidth = m_pTasks->listBox()->maxItemWidth();
  12.632          nPopupwidth += m_pTasks->listBox()->horizontalScrollBar()->height();
  12.633          m_pTasks->listBox()->setFixedWidth(nPopupwidth);
  12.634 -        m_pTasks->listBox()->setHScrollBarMode(QScrollView::Auto);
  12.635 +        m_pTasks->listBox()->setHScrollBarMode(Q3ScrollView::Auto);
  12.636          m_pTasks->listBox()->sort();
  12.637      }
  12.638  
  12.639 @@ -907,7 +923,7 @@
  12.640      const char *kszTasktext = "Choose a <em>task account</em> by clicking on "
  12.641                                "this box, and choosing whichever item most "
  12.642                                "closely resembles your task.";
  12.643 -    QWhatsThis::add(m_pTasks, kszTasktext);
  12.644 +    Q3WhatsThis::add(m_pTasks, kszTasktext);
  12.645      QToolTip::add(m_pTasks, trUtf8("Task Selector"));
  12.646      m_pEditlayout->addWidget(m_pTasks); // Finally add the task edit
  12.647  
  12.648 @@ -925,7 +941,7 @@
  12.649      const char *kszRemarktext = "Edit the <em>task remarks</em> by clicking on "
  12.650                                  "this line control and typing the remarks you "
  12.651                                  "have about the task.";
  12.652 -    QWhatsThis::add(m_pRemark, kszRemarktext);
  12.653 +    Q3WhatsThis::add(m_pRemark, kszRemarktext);
  12.654      QToolTip::add(m_pRemark, trUtf8("Remark Line"));
  12.655      m_pEditlayout->addWidget(m_pRemark);    // Finally add the remark line
  12.656  

    13.1 --- a/as_const.h	Fri Nov 28 14:20:00 2008 +0100
    13.2 +++ b/as_const.h	Fri Dec 05 23:14:02 2008 +0100
    13.3 @@ -1,12 +1,12 @@
    13.4  //
    13.5  //  OSSP asgui - Accounting system graphical user interface
    13.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    13.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    13.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    13.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   13.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   13.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   13.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   13.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   13.14  //
   13.15  //  This file is part of OSSP asgui, an accounting system graphical user
   13.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   13.17 +//  interface which can be found at http://asgui.europalab.com/.
   13.18  //
   13.19  //  Permission to use, copy, modify, and distribute this software for
   13.20  //  any purpose with or without fee is hereby granted, provided that

    14.1 --- a/as_crc.cpp	Fri Nov 28 14:20:00 2008 +0100
    14.2 +++ b/as_crc.cpp	Fri Dec 05 23:14:02 2008 +0100
    14.3 @@ -1,12 +1,12 @@
    14.4  //
    14.5  //  OSSP asgui - Accounting system graphical user interface
    14.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    14.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    14.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    14.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   14.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   14.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   14.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   14.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   14.14  //
   14.15  //  This file is part of OSSP asgui, an accounting system graphical user
   14.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   14.17 +//  interface which can be found at http://asgui.europalab.com/.
   14.18  //
   14.19  //  Permission to use, copy, modify, and distribute this software for
   14.20  //  any purpose with or without fee is hereby granted, provided that

    15.1 --- a/as_crc.h	Fri Nov 28 14:20:00 2008 +0100
    15.2 +++ b/as_crc.h	Fri Dec 05 23:14:02 2008 +0100
    15.3 @@ -1,12 +1,12 @@
    15.4  //
    15.5  //  OSSP asgui - Accounting system graphical user interface
    15.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    15.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    15.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    15.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   15.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   15.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   15.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   15.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   15.14  //
   15.15  //  This file is part of OSSP asgui, an accounting system graphical user
   15.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   15.17 +//  interface which can be found at http://asgui.europalab.com/.
   15.18  //
   15.19  //  Permission to use, copy, modify, and distribute this software for
   15.20  //  any purpose with or without fee is hereby granted, provided that
   15.21 @@ -32,6 +32,8 @@
   15.22  #ifndef CRC_H
   15.23  #define CRC_H
   15.24  
   15.25 +#define QT3_SUPPORT
   15.26 +
   15.27  #include <string>       // For copy constructor using string
   15.28  #include <qstring.h>    // For deriving from QString
   15.29  
   15.30 @@ -51,7 +53,7 @@
   15.31      Qualistring(void) : QString() {initCrc();};                          // Default
   15.32      Qualistring(const QString &kCopy) : QString(kCopy) {initCrc();};     // Copy
   15.33      Qualistring(const char *pkcCopy) : QString(pkcCopy) {initCrc();};    // Copy
   15.34 -    Qualistring(const std::string &kCopy) : QString(kCopy) {initCrc();}; // Copy
   15.35 +    Qualistring(const std::string &kCopy) : QString(QString::fromStdString(kCopy)) {initCrc();}; // Copy
   15.36  
   15.37      U32 getCrc(void);                           // Generate and return a CRC32
   15.38      Qualistring &operator=(const QString &);    // Overload equals operator

    16.1 --- a/as_dataop.cpp	Fri Nov 28 14:20:00 2008 +0100
    16.2 +++ b/as_dataop.cpp	Fri Dec 05 23:14:02 2008 +0100
    16.3 @@ -1,12 +1,12 @@
    16.4  //
    16.5  //  OSSP asgui - Accounting system graphical user interface
    16.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    16.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    16.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    16.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   16.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   16.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   16.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   16.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   16.14  //
   16.15  //  This file is part of OSSP asgui, an accounting system graphical user
   16.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   16.17 +//  interface which can be found at http://asgui.europalab.com/.
   16.18  //
   16.19  //  Permission to use, copy, modify, and distribute this software for
   16.20  //  any purpose with or without fee is hereby granted, provided that
   16.21 @@ -29,6 +29,8 @@
   16.22  //  as_dataops.cpp: ISO C++ implementation
   16.23  //
   16.24  
   16.25 +#define QT3_SUPPORT
   16.26 +
   16.27  // System headers
   16.28  #include <map>
   16.29  #include <string>
   16.30 @@ -37,9 +39,11 @@
   16.31  #include <qregexp.h>            // Portable regular expressions
   16.32  #include <qdatetime.h>
   16.33  #include <qmessagebox.h>
   16.34 -#include <qtextstream.h>
   16.35 -#include <qpopupmenu.h>
   16.36 +#include <q3textstream.h>
   16.37 +#include <q3popupmenu.h>
   16.38  #include <qfile.h>
   16.39 +//Added by qt3to4:
   16.40 +#include <QPixmap>
   16.41  
   16.42  // User interface
   16.43  #include "as_const.h"           // Application constants
   16.44 @@ -61,18 +65,18 @@
   16.45  {
   16.46      if (Fileobj.isOpen()) {             // Check state of file
   16.47          Fileobj.flush();                // Begin processing file cleanly
   16.48 -        QTextStream Account(&Fileobj);  // Convert data to stream
   16.49 +        Q3TextStream Account(&Fileobj);  // Convert data to stream
   16.50          this->loadAccounts(Account);    // Pass off to do the real work
   16.51      }
   16.52      else {
   16.53 -        if (!Fileobj.open(IO_ReadOnly)) {   // Try to open file
   16.54 +        if (!Fileobj.open(QIODevice::ReadOnly)) {   // Try to open file
   16.55              QString Readerrstr;
   16.56              Readerrstr = trUtf8(TITRAQ_READAFILFAIL).arg(Fileobj.name());
   16.57              throw Genexcept(Readerrstr.ascii());
   16.58          }
   16.59          else
   16.60              Fileobj.flush();                // Begin processing file cleanly
   16.61 -            QTextStream Account(&Fileobj);  // Convert data to stream
   16.62 +            Q3TextStream Account(&Fileobj);  // Convert data to stream
   16.63              this->loadAccounts(Account);    // Pass off to do the real work
   16.64              Fileobj.close();                // Finish fileop by closing
   16.65      }
   16.66 @@ -81,7 +85,7 @@
   16.67  //
   16.68  // Load accounts themselves data from a stream
   16.69  //
   16.70 -void Titraqform::loadAccounts(QTextStream &Tstream)
   16.71 +void Titraqform::loadAccounts(Q3TextStream &Tstream)
   16.72  {
   16.73      using namespace std;                // Needed for hash tables with hmap
   16.74      map<string, int> Hashnames;         // Hashtable for storing names
   16.75 @@ -109,14 +113,14 @@
   16.76      // stream and parsing the corresponding account fields out of it
   16.77      while (!Line.isEmpty()) {
   16.78          QString Temp;                           // For reading from stream
   16.79 -        QTextStream Asline(&Line, IO_ReadOnly); // Convert a single line
   16.80 +        Q3TextStream Asline(&Line, QIODevice::ReadOnly); // Convert a single line
   16.81  
   16.82          Asline.skipWhiteSpace();            // Remove whitespaces
   16.83          Asline >> Temp;                     // Copy revision indicator
   16.84  
   16.85          if (Temp == QString(QChar('R'))) {  // Copy the account field
   16.86              Asline >> Temp;                 // to temporary for transfer
   16.87 -            string Convstring = Temp;       // Convert to string (can't cast?)
   16.88 +            string Convstring = Temp.toStdString();  // Convert to string (can't cast?)
   16.89              Hashnames[Convstring] += Hashnames[Convstring];
   16.90          }
   16.91  
   16.92 @@ -138,11 +142,11 @@
   16.93      for (Numiter = Hashnums.begin(); Numiter != Hashnums.end(); Numiter++) {
   16.94  
   16.95          // Count the number of lines of sorted task names
   16.96 -        int nNumlines = QString(Numiter->second).contains('\n');
   16.97 +        int nNumlines = QString::fromStdString(Numiter->second).count('\n');
   16.98  
   16.99          // Iterate through the lines of task names, feeding them into the menu
  16.100          for (int nIter = 0; nIter < nNumlines; nIter++)
  16.101 -            *m_pTaskentries << QString(Numiter->second).section('\n', nIter, nIter);
  16.102 +            *m_pTaskentries << QString::fromStdString(Numiter->second).section('\n', nIter, nIter);
  16.103      }
  16.104  }
  16.105  
  16.106 @@ -153,15 +157,15 @@
  16.107  {
  16.108      if (Fileobj.isOpen()) {             // Check state of file
  16.109          Fileobj.flush();                // Begin processing file cleanly
  16.110 -        QTextStream Asentry(&Fileobj);  // Convert data to stream
  16.111 +        Q3TextStream Asentry(&Fileobj);  // Convert data to stream
  16.112          this->loadData(Asentry);        // Pass off to do the real work
  16.113      }
  16.114      else {
  16.115 -        if (!Fileobj.open(IO_ReadOnly)) // Try to open file
  16.116 +        if (!Fileobj.open(QIODevice::ReadOnly)) // Try to open file
  16.117              throw Genexcept(trUtf8(TITRAQ_READPFILFAIL));
  16.118          else
  16.119              Fileobj.flush();                // Begin processing file cleanly
  16.120 -            QTextStream Asentry(&Fileobj);  // Convert data to stream
  16.121 +            Q3TextStream Asentry(&Fileobj);  // Convert data to stream
  16.122              this->loadData(Asentry);        // Pass off to do the real work
  16.123              Fileobj.close();                // Finish fileop by closing
  16.124      }
  16.125 @@ -170,7 +174,7 @@
  16.126  //
  16.127  // Load personal data from a stream
  16.128  //
  16.129 -void Titraqform::loadData(QTextStream &Tstream)
  16.130 +void Titraqform::loadData(Q3TextStream &Tstream)
  16.131  {
  16.132      bool bValid = true; // Used to warn on globally invalid accounting data
  16.133      int nIter = 0;      // Iterator used in loop and also as a count
  16.134 @@ -211,7 +215,7 @@
  16.135          bool bValid = true; // Warns on linewise invalid accounting data
  16.136          QString User, Guid, Crc, Rev;                           // Valid admin fields
  16.137          QString Date, Start, Finish, Account, Amount, Remark;   // Valid user fields
  16.138 -        QTextStream Asline(&Line, IO_ReadOnly); // Convert a single line now
  16.139 +        Q3TextStream Asline(&Line, QIODevice::ReadOnly); // Convert a single line now
  16.140  
  16.141          if (nIter % g_knBlocks == 0) // Add blocks of rows to optimize loading
  16.142              m_pMaintable->setNumRows(m_pMaintable->numRows() + g_knBlocks);
  16.143 @@ -269,10 +273,10 @@
  16.144          Asline.skipWhiteSpace();    // Remove whitespaces
  16.145          Asline >> Account;          // Copy the account field
  16.146          if (!Account.isEmpty()) {
  16.147 -            QTableItem *pOld = m_pMaintable->item(nIter, TITRAQ_IDXTASK);
  16.148 +            Q3TableItem *pOld = m_pMaintable->item(nIter, TITRAQ_IDXTASK);
  16.149              delete(pOld);   // Get rid of the old before going with the new
  16.150 -            RtTableItem *pSwapitem = new RtTableItem(m_pMaintable, QTableItem::WhenCurrent, Account);
  16.151 -            pSwapitem->setAlignment(AlignLeft | AlignVCenter);
  16.152 +            RtTableItem *pSwapitem = new RtTableItem(m_pMaintable, Q3TableItem::WhenCurrent, Account);
  16.153 +            pSwapitem->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
  16.154              m_pMaintable->setItem(nIter, TITRAQ_IDXTASK, pSwapitem);
  16.155          }
  16.156          else
  16.157 @@ -305,7 +309,7 @@
  16.158              else {
  16.159                  AS::Uuid Guidi; // For GUID production
  16.160                  Guidi.genId();
  16.161 -                m_pMaintable->setText(nIter, TITRAQ_IDXGUID, Guidi.getString());
  16.162 +                m_pMaintable->setText(nIter, TITRAQ_IDXGUID, QString::fromStdString(Guidi.getString()));
  16.163              }
  16.164          }
  16.165          else // if isEmpty()
  16.166 @@ -364,13 +368,13 @@
  16.167  {
  16.168      if (Fileobj.isOpen()) {             // Check state of file
  16.169          Fileobj.flush();                // Begin processing file cleanly
  16.170 -        QTextStream Asentry(&Fileobj);  // Convert data to stream
  16.171 +        Q3TextStream Asentry(&Fileobj);  // Convert data to stream
  16.172          this->saveData(Asentry);        // Pass off to do the real work
  16.173      }
  16.174      else {
  16.175 -        if (!Fileobj.open(IO_WriteOnly)) // Try to open file
  16.176 +        if (!Fileobj.open(QIODevice::WriteOnly)) // Try to open file
  16.177              throw Genexcept(trUtf8(TITRAQ_READPFILFAIL));
  16.178 -        QTextStream Asentry(&Fileobj);  // Convert data to stream
  16.179 +        Q3TextStream Asentry(&Fileobj);  // Convert data to stream
  16.180          this->saveData(Asentry);        // Pass off to do the real work
  16.181          Fileobj.close();                // Finish fileop by closing
  16.182      }
  16.183 @@ -379,7 +383,7 @@
  16.184  //
  16.185  // Save accounting data to a stream
  16.186  //
  16.187 -void Titraqform::saveData(QTextStream &Tstream)
  16.188 +void Titraqform::saveData(Q3TextStream &Tstream)
  16.189  {
  16.190      const int nRows = m_pMaintable->numRows();      // Max rows used in loop
  16.191      QString Tempfield;                              // Current field string
  16.192 @@ -393,45 +397,45 @@
  16.193      // Linewise save from the main table date, time, account, and others
  16.194      for (int nIter = 0; nIter < nRows; nIter++) {
  16.195          Tempfield = m_pMaintable->text(nIter, TITRAQ_IDXUSER);      // Load user field text
  16.196 -        if (Tempfield != NULL)
  16.197 +        if (Tempfield.isNull())
  16.198              Tstream << Tempfield;                                   // Save user field text
  16.199  
  16.200          Tempfield = m_pMaintable->text(nIter, TITRAQ_IDXGUID);      // Load GUID field text
  16.201 -        if (Tempfield != NULL)
  16.202 +        if (Tempfield.isNull())
  16.203              Tstream << trUtf8(" ") << Tempfield;                    // Save GUID field text
  16.204  
  16.205          Tempfield = m_pMaintable->text(nIter, TITRAQ_IDXCRC);       // Load CRC field text
  16.206          Tempfield.remove("0x");
  16.207 -        if (Tempfield != NULL)
  16.208 +        if (Tempfield.isNull())
  16.209              Tstream << trUtf8(" ") << Tempfield;                    // Save CRC field text
  16.210  
  16.211          Tempfield = m_pMaintable->text(nIter, TITRAQ_IDXREV);       // Load rev field text
  16.212 -        if (Tempfield != NULL)
  16.213 +        if (Tempfield.isNull())
  16.214              Tstream << trUtf8(" ") << Tempfield;                    // Save rev field text
  16.215  
  16.216          Tempfield = m_pMaintable->text(nIter, TITRAQ_IDXDATE);      // Load date field text
  16.217 -        if (Tempfield != NULL)
  16.218 +        if (Tempfield.isNull())
  16.219              Tstream << trUtf8(" ") << Tempfield;                    // Save date field text
  16.220  
  16.221          Tempfield = m_pMaintable->text(nIter, TITRAQ_IDXSTART);     // Load start field text
  16.222 -        if (Tempfield != NULL)
  16.223 +        if (Tempfield.isNull())
  16.224              Tstream << trUtf8(" ") << Tempfield;                    // Save start field text
  16.225  
  16.226          Tempfield = m_pMaintable->text(nIter, TITRAQ_IDXFINISH);    // Load end field text
  16.227 -        if (Tempfield != NULL)
  16.228 +        if (Tempfield.isNull())
  16.229              Tstream << trUtf8(" ") << Tempfield;                    // Save end field text
  16.230  
  16.231          Tempfield = m_pMaintable->text(nIter, TITRAQ_IDXAMOUNT);    // Load amount field text
  16.232 -        if (Tempfield != NULL)
  16.233 +        if (Tempfield.isNull())
  16.234              Tstream << trUtf8(" ") << Tempfield;                    // Save amount
  16.235  
  16.236          Tempfield = m_pMaintable->text(nIter, TITRAQ_IDXTASK);      // Load acct field text
  16.237 -        if (Tempfield != NULL)
  16.238 +        if (Tempfield.isNull())
  16.239              Tstream << trUtf8(" ") << Tempfield;                    // Save acct field text
  16.240  
  16.241          Tempfield = m_pMaintable->text(nIter, TITRAQ_IDXREMARK);    // Load remark field text
  16.242          Tstream << trUtf8(" \"");                                   // Save beginning double quote
  16.243 -        if (Tempfield != NULL) {
  16.244 +        if (Tempfield.isNull()) {
  16.245              Strsearch = QRegExp::escape(Tempfield);                 // Incoming string escaped
  16.246              Stripper.search(Strsearch);
  16.247              Tempfield.truncate(Stripper.pos());                     // Cut off whitespace
  16.248 @@ -451,23 +455,25 @@
  16.249  const bool Titraqform::validateData(QFile &Filin) const
  16.250  {
  16.251      QString Firstline;      // Will contain the first line of text
  16.252 +    char *pReadline;        // Contains the read line of text file
  16.253      bool bRet = false;      // Set the initial return value
  16.254  
  16.255      if (Filin.isOpen()) {   // Check open state of file
  16.256          Filin.flush();      // Not sure if this is needed
  16.257          Filin.reset();      // Set the file index position to 0
  16.258 -        Filin.readLine(Firstline, QString(TITRAQ_DATAPATTERN).length() + 2L);
  16.259 +        Filin.readLine(pReadline, QString(TITRAQ_DATAPATTERN).length() + 2L);
  16.260      }
  16.261      else {
  16.262 -        if (!Filin.open(IO_ReadOnly))   // Try to open file
  16.263 +        if (!Filin.open(QIODevice::ReadOnly))   // Try to open file
  16.264              throw Genexcept(trUtf8(TITRAQ_READPFILFAIL));
  16.265          else {                          // File is now open
  16.266 -            Filin.readLine(Firstline, QString(TITRAQ_DATAPATTERN).length() + 2L);
  16.267 +            Filin.readLine(pReadline, QString(TITRAQ_DATAPATTERN).length() + 2L);
  16.268              Filin.close();              // Remember to close
  16.269          }
  16.270      }
  16.271  
  16.272      try {   // Pass off to worker method
  16.273 +        Firstline = QString::fromAscii(pReadline);
  16.274          bRet = this->validateData(Firstline);
  16.275      }
  16.276      catch (Genexcept &) {
  16.277 @@ -489,21 +495,21 @@
  16.278          QMessageBox Problema(QString(TITRAQ_APPTITLE) + ' ' + asgui_version.v_short,
  16.279              TITRAQ_NOPATTERNFOUND + QString(TITRAQ_DATAPATTERN) + TITRAQ_WASNOTFOUNDIN,
  16.280              QMessageBox::Critical, QMessageBox::Ok | QMessageBox::Escape,
  16.281 -            QMessageBox::NoButton, QMessageBox::NoButton);
  16.282 +            Qt::NoButton, Qt::NoButton);
  16.283          Problema.exec(); // Give the user the bad news
  16.284          throw Genexcept(TITRAQ_INVALIDDATA);
  16.285      }
  16.286      else if (Linin.section(Datapattern, 1).section('.', 0, 0).toInt() != TITRAQ_DATAVERSIONMAJ) {
  16.287          QMessageBox Problema(QString(TITRAQ_APPTITLE) + ' ' + asgui_version.v_short,
  16.288              TITRAQ_BADVERSIONMAJ, QMessageBox::Warning, QMessageBox::Ok | QMessageBox::Escape,
  16.289 -            QMessageBox::NoButton, QMessageBox::NoButton);
  16.290 +            Qt::NoButton, Qt::NoButton);
  16.291          Problema.exec(); // Give the user the bad news
  16.292          throw Genexcept(TITRAQ_INCOMPATDATA);
  16.293      }
  16.294      else if (Linin.section(Datapattern, 1).section('.', 1, 1).toInt() > TITRAQ_DATAVERSIONMIN) {
  16.295          QMessageBox Problema(QString(TITRAQ_APPTITLE) + ' ' + asgui_version.v_short,
  16.296              TITRAQ_BADVERSIONMIN, QMessageBox::Warning, QMessageBox::Ok | QMessageBox::Escape,
  16.297 -            QMessageBox::NoButton, QMessageBox::NoButton);
  16.298 +            Qt::NoButton, Qt::NoButton);
  16.299          Problema.exec(); // Give the user the bad news
  16.300          throw Genexcept(TITRAQ_INCOMPATDATA);
  16.301      }
  16.302 @@ -519,7 +525,7 @@
  16.303  const QString Titraqform::getRowdata(void) const
  16.304  {
  16.305      QString Rowdata, Tempstring;                            // For output string
  16.306 -    QTableSelection Select = m_pMaintable->selection(0);    // Highlighted text
  16.307 +    Q3TableSelection Select = m_pMaintable->selection(0);    // Highlighted text
  16.308      int nTotal = Select.bottomRow() - Select.topRow() + 1;  // Total row select
  16.309  
  16.310      // Calculate rows to delete from selection highlight
  16.311 @@ -569,16 +575,16 @@
  16.312  //
  16.313  void Titraqform::setRowdata(QString &Rowdata) const
  16.314  {
  16.315 -    int nRows = Rowdata.contains(QChar('\n'));          // Set so many rows
  16.316 +    int nRows = Rowdata.count(QChar('\n'));             // Set so many rows
  16.317      int nCurrentrow = m_pMaintable->currentRow();       // Current table row
  16.318 -    QTableItem *pItem = NULL;                           // Old item to change out
  16.319 +    Q3TableItem *pItem = NULL;                          // Old item to change out
  16.320      QString Line, User, Guid, Crc, Rev;                 // Admin fields in table
  16.321      QString Date, Start, Finish, Amount, Task, Remark;  // Viewable fields in table
  16.322 -    QTextStream Datastream(&Rowdata, IO_ReadOnly);      // Convert data to stream
  16.323 +    Q3TextStream Datastream(&Rowdata, QIODevice::ReadOnly);      // Convert data to stream
  16.324  
  16.325      for (int nIter = 0; nIter < nRows; ++nIter) {
  16.326          QString Singlerow = Datastream.readLine();              // For linewise operation
  16.327 -        QTextStream Rowstream(&Singlerow, IO_ReadOnly);         // Convert row to stream
  16.328 +        Q3TextStream Rowstream(&Singlerow, QIODevice::ReadOnly);         // Convert row to stream
  16.329  
  16.330          Rowstream >> Line >> User >> Guid >> Crc >> Rev;        // Stream data fields
  16.331          Rowstream >> Date >> Start >> Finish >> Amount >> Task; // to corresponding vars
  16.332 @@ -604,8 +610,8 @@
  16.333          // Change out old item and replace with new task data
  16.334          pItem = m_pMaintable->item(nCurrentrow + nIter, TITRAQ_IDXTASK);
  16.335          delete(pItem);  // Get rid of the old before going with the new
  16.336 -        RtTableItem *pSwapitem = new RtTableItem(m_pMaintable, QTableItem::WhenCurrent, Task);
  16.337 -        pSwapitem->setAlignment(AlignLeft | AlignVCenter);
  16.338 +        RtTableItem *pSwapitem = new RtTableItem(m_pMaintable, Q3TableItem::WhenCurrent, Task);
  16.339 +        pSwapitem->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
  16.340          m_pMaintable->setItem(nCurrentrow + nIter, TITRAQ_IDXTASK, pSwapitem);
  16.341  
  16.342          // Continue with field processing business as usual

    17.1 --- a/as_datedit.h	Fri Nov 28 14:20:00 2008 +0100
    17.2 +++ b/as_datedit.h	Fri Dec 05 23:14:02 2008 +0100
    17.3 @@ -1,12 +1,12 @@
    17.4  //
    17.5  //  OSSP asgui - Accounting system graphical user interface
    17.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    17.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    17.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    17.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   17.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   17.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   17.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   17.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   17.14  //
   17.15  //  This file is part of OSSP asgui, an accounting system graphical user
   17.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   17.17 +//  interface which can be found at http://asgui.europalab.com/.
   17.18  //
   17.19  //  Permission to use, copy, modify, and distribute this software for
   17.20  //  any purpose with or without fee is hereby granted, provided that
   17.21 @@ -32,17 +32,17 @@
   17.22  #ifndef DATEDIT_H
   17.23  #define DATEDIT_H
   17.24  
   17.25 -#include <qdatetimeedit.h>
   17.26 +#include <q3datetimeedit.h>
   17.27  
   17.28  #define TITRAQ_DAYSECTION 2
   17.29  
   17.30 -class Daydatedit : public QDateEdit
   17.31 +class Daydatedit : public Q3DateEdit
   17.32  {
   17.33  public:
   17.34      Daydatedit(QWidget *pParent = 0,  const char *m_kszName = NULL) :
   17.35 -        QDateEdit(pParent, m_kszName) {};
   17.36 +        Q3DateEdit(pParent, m_kszName) {};
   17.37      Daydatedit(const QDate &Date, QWidget *pParent = 0,  const char *m_kszName = NULL) :
   17.38 -        QDateEdit(Date, pParent, m_kszName) {};
   17.39 +        Q3DateEdit(Date, pParent, m_kszName) {};
   17.40      bool setDayfocus(void) {return setFocusSection(TITRAQ_DAYSECTION);};
   17.41  };
   17.42  

    18.1 --- a/as_except.cpp	Fri Nov 28 14:20:00 2008 +0100
    18.2 +++ b/as_except.cpp	Fri Dec 05 23:14:02 2008 +0100
    18.3 @@ -1,12 +1,12 @@
    18.4  //
    18.5  //  OSSP asgui - Accounting system graphical user interface
    18.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    18.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    18.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    18.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   18.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   18.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   18.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   18.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   18.14  //
   18.15  //  This file is part of OSSP asgui, an accounting system graphical user
   18.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   18.17 +//  interface which can be found at http://asgui.europalab.com/.
   18.18  //
   18.19  //  Permission to use, copy, modify, and distribute this software for
   18.20  //  any purpose with or without fee is hereby granted, provided that
   18.21 @@ -31,6 +31,9 @@
   18.22  
   18.23  #include "as_except.h"
   18.24  
   18.25 +//Added by qt3to4:
   18.26 +#include <QTextOStream>
   18.27 +
   18.28  
   18.29  // Report general exception
   18.30  void Genexcept::reportErr(void)

    19.1 --- a/as_except.h	Fri Nov 28 14:20:00 2008 +0100
    19.2 +++ b/as_except.h	Fri Dec 05 23:14:02 2008 +0100
    19.3 @@ -1,12 +1,12 @@
    19.4  //
    19.5  //  OSSP asgui - Accounting system graphical user interface
    19.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    19.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    19.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    19.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   19.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   19.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   19.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   19.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   19.14  //
   19.15  //  This file is part of OSSP asgui, an accounting system graphical user
   19.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   19.17 +//  interface which can be found at http://asgui.europalab.com/.
   19.18  //
   19.19  //  Permission to use, copy, modify, and distribute this software for
   19.20  //  any purpose with or without fee is hereby granted, provided that
   19.21 @@ -32,6 +32,8 @@
   19.22  #ifndef TITRAQEXCEPT_H
   19.23  #define TITRAQEXCEPT_H
   19.24  
   19.25 +#define QT3_SUPPORT
   19.26 +
   19.27  #include <qtextstream.h>
   19.28  
   19.29  

    20.1 --- a/as_generic.cpp	Fri Nov 28 14:20:00 2008 +0100
    20.2 +++ b/as_generic.cpp	Fri Dec 05 23:14:02 2008 +0100
    20.3 @@ -1,12 +1,12 @@
    20.4  //
    20.5  //  OSSP asgui - Accounting system graphical user interface
    20.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    20.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    20.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    20.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   20.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   20.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   20.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   20.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   20.14  //
   20.15  //  This file is part of OSSP asgui, an accounting system graphical user
   20.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   20.17 +//  interface which can be found at http://asgui.europalab.com/.
   20.18  //
   20.19  //  Permission to use, copy, modify, and distribute this software for
   20.20  //  any purpose with or without fee is hereby granted, provided that
   20.21 @@ -29,6 +29,8 @@
   20.22  //  as_generic.cpp: ISO C++ implementation
   20.23  //
   20.24  
   20.25 +#define QT3_SUPPORT
   20.26 +
   20.27  #include <qobject.h>
   20.28  
   20.29  #include "as_generic.h"

    21.1 --- a/as_generic.h	Fri Nov 28 14:20:00 2008 +0100
    21.2 +++ b/as_generic.h	Fri Dec 05 23:14:02 2008 +0100
    21.3 @@ -1,12 +1,12 @@
    21.4  //
    21.5  //  OSSP asgui - Accounting system graphical user interface
    21.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    21.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    21.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    21.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   21.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   21.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   21.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   21.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   21.14  //
   21.15  //  This file is part of OSSP asgui, an accounting system graphical user
   21.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   21.17 +//  interface which can be found at http://asgui.europalab.com/.
   21.18  //
   21.19  //  Permission to use, copy, modify, and distribute this software for
   21.20  //  any purpose with or without fee is hereby granted, provided that

    22.1 --- a/as_gfx/cwlogo.xpm	Fri Nov 28 14:20:00 2008 +0100
    22.2 +++ b/as_gfx/cwlogo.xpm	Fri Dec 05 23:14:02 2008 +0100
    22.3 @@ -1,12 +1,12 @@
    22.4  /*
    22.5  **  OSSP asgui - Accounting system graphical user interface
    22.6 -**  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    22.7 -**  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    22.8 -**  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    22.9 -**  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   22.10 +**  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   22.11 +**  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   22.12 +**  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   22.13 +**  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   22.14  **
   22.15  **  This file is part of OSSP asgui, an accounting system graphical user
   22.16 -**  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   22.17 +**  interface which can be found at http://asgui.europalab.com/.
   22.18  **
   22.19  **  Permission to use, copy, modify, and distribute this software for
   22.20  **  any purpose with or without fee is hereby granted, provided that

    23.1 --- a/as_gfx/osspicon.xpm	Fri Nov 28 14:20:00 2008 +0100
    23.2 +++ b/as_gfx/osspicon.xpm	Fri Dec 05 23:14:02 2008 +0100
    23.3 @@ -1,12 +1,12 @@
    23.4  /*
    23.5  **  OSSP asgui - Accounting system graphical user interface
    23.6 -**  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    23.7 -**  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    23.8 -**  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    23.9 -**  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   23.10 +**  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   23.11 +**  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   23.12 +**  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   23.13 +**  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   23.14  **
   23.15  **  This file is part of OSSP asgui, an accounting system graphical user
   23.16 -**  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   23.17 +**  interface which can be found at http://asgui.europalab.com/.
   23.18  **
   23.19  **  Permission to use, copy, modify, and distribute this software for
   23.20  **  any purpose with or without fee is hereby granted, provided that

    24.1 --- a/as_gfx/ossplogo.xpm	Fri Nov 28 14:20:00 2008 +0100
    24.2 +++ b/as_gfx/ossplogo.xpm	Fri Dec 05 23:14:02 2008 +0100
    24.3 @@ -1,12 +1,12 @@
    24.4  /*
    24.5  **  OSSP asgui - Accounting system graphical user interface
    24.6 -**  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    24.7 -**  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    24.8 -**  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    24.9 -**  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   24.10 +**  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   24.11 +**  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   24.12 +**  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   24.13 +**  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   24.14  **
   24.15  **  This file is part of OSSP asgui, an accounting system graphical user
   24.16 -**  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   24.17 +**  interface which can be found at http://asgui.europalab.com/.
   24.18  **
   24.19  **  Permission to use, copy, modify, and distribute this software for
   24.20  **  any purpose with or without fee is hereby granted, provided that

    25.1 --- a/as_gfx/refresh.xpm	Fri Nov 28 14:20:00 2008 +0100
    25.2 +++ b/as_gfx/refresh.xpm	Fri Dec 05 23:14:02 2008 +0100
    25.3 @@ -1,12 +1,12 @@
    25.4  /*
    25.5  **  OSSP asgui - Accounting system graphical user interface
    25.6 -**  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    25.7 -**  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    25.8 -**  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    25.9 -**  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   25.10 +**  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   25.11 +**  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   25.12 +**  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   25.13 +**  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   25.14  **
   25.15  **  This file is part of OSSP asgui, an accounting system graphical user
   25.16 -**  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   25.17 +**  interface which can be found at http://asgui.europalab.com/.
   25.18  **
   25.19  **  Permission to use, copy, modify, and distribute this software for
   25.20  **  any purpose with or without fee is hereby granted, provided that

    26.1 --- a/as_gfx/refreshd.xpm	Fri Nov 28 14:20:00 2008 +0100
    26.2 +++ b/as_gfx/refreshd.xpm	Fri Dec 05 23:14:02 2008 +0100
    26.3 @@ -1,12 +1,12 @@
    26.4  /*
    26.5  **  OSSP asgui - Accounting system graphical user interface
    26.6 -**  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    26.7 -**  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    26.8 -**  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    26.9 -**  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   26.10 +**  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   26.11 +**  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   26.12 +**  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   26.13 +**  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   26.14  **
   26.15  **  This file is part of OSSP asgui, an accounting system graphical user
   26.16 -**  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   26.17 +**  interface which can be found at http://asgui.europalab.com/.
   26.18  **
   26.19  **  Permission to use, copy, modify, and distribute this software for
   26.20  **  any purpose with or without fee is hereby granted, provided that

    27.1 --- a/as_gfx/revcolour.xpm	Fri Nov 28 14:20:00 2008 +0100
    27.2 +++ b/as_gfx/revcolour.xpm	Fri Dec 05 23:14:02 2008 +0100
    27.3 @@ -1,12 +1,12 @@
    27.4  /*
    27.5  **  OSSP asgui - Accounting system graphical user interface
    27.6 -**  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    27.7 -**  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    27.8 -**  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    27.9 -**  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   27.10 +**  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   27.11 +**  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   27.12 +**  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   27.13 +**  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   27.14  **
   27.15  **  This file is part of OSSP asgui, an accounting system graphical user
   27.16 -**  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   27.17 +**  interface which can be found at http://asgui.europalab.com/.
   27.18  **
   27.19  **  Permission to use, copy, modify, and distribute this software for
   27.20  **  any purpose with or without fee is hereby granted, provided that

    28.1 --- a/as_gfx/rowadd.xpm	Fri Nov 28 14:20:00 2008 +0100
    28.2 +++ b/as_gfx/rowadd.xpm	Fri Dec 05 23:14:02 2008 +0100
    28.3 @@ -1,12 +1,12 @@
    28.4  /*
    28.5  **  OSSP asgui - Accounting system graphical user interface
    28.6 -**  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    28.7 -**  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    28.8 -**  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    28.9 -**  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   28.10 +**  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   28.11 +**  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   28.12 +**  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   28.13 +**  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   28.14  **
   28.15  **  This file is part of OSSP asgui, an accounting system graphical user
   28.16 -**  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   28.17 +**  interface which can be found at http://asgui.europalab.com/.
   28.18  **
   28.19  **  Permission to use, copy, modify, and distribute this software for
   28.20  **  any purpose with or without fee is hereby granted, provided that

    29.1 --- a/as_gfx/rowaddd.xpm	Fri Nov 28 14:20:00 2008 +0100
    29.2 +++ b/as_gfx/rowaddd.xpm	Fri Dec 05 23:14:02 2008 +0100
    29.3 @@ -1,12 +1,12 @@
    29.4  /*
    29.5  **  OSSP asgui - Accounting system graphical user interface
    29.6 -**  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    29.7 -**  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    29.8 -**  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    29.9 -**  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   29.10 +**  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   29.11 +**  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   29.12 +**  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   29.13 +**  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   29.14  **
   29.15  **  This file is part of OSSP asgui, an accounting system graphical user
   29.16 -**  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   29.17 +**  interface which can be found at http://asgui.europalab.com/.
   29.18  **
   29.19  **  Permission to use, copy, modify, and distribute this software for
   29.20  **  any purpose with or without fee is hereby granted, provided that

    30.1 --- a/as_gfx/rowdel.xpm	Fri Nov 28 14:20:00 2008 +0100
    30.2 +++ b/as_gfx/rowdel.xpm	Fri Dec 05 23:14:02 2008 +0100
    30.3 @@ -1,12 +1,12 @@
    30.4  /*
    30.5  **  OSSP asgui - Accounting system graphical user interface
    30.6 -**  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    30.7 -**  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    30.8 -**  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    30.9 -**  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   30.10 +**  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   30.11 +**  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   30.12 +**  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   30.13 +**  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   30.14  **
   30.15  **  This file is part of OSSP asgui, an accounting system graphical user
   30.16 -**  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   30.17 +**  interface which can be found at http://asgui.europalab.com/.
   30.18  **
   30.19  **  Permission to use, copy, modify, and distribute this software for
   30.20  **  any purpose with or without fee is hereby granted, provided that

    31.1 --- a/as_gfx/rowdeld.xpm	Fri Nov 28 14:20:00 2008 +0100
    31.2 +++ b/as_gfx/rowdeld.xpm	Fri Dec 05 23:14:02 2008 +0100
    31.3 @@ -1,12 +1,12 @@
    31.4  /*
    31.5  **  OSSP asgui - Accounting system graphical user interface
    31.6 -**  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    31.7 -**  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    31.8 -**  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    31.9 -**  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   31.10 +**  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   31.11 +**  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   31.12 +**  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   31.13 +**  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   31.14  **
   31.15  **  This file is part of OSSP asgui, an accounting system graphical user
   31.16 -**  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   31.17 +**  interface which can be found at http://asgui.europalab.com/.
   31.18  **
   31.19  **  Permission to use, copy, modify, and distribute this software for
   31.20  **  any purpose with or without fee is hereby granted, provided that

    32.1 --- a/as_gfx/sync.xpm	Fri Nov 28 14:20:00 2008 +0100
    32.2 +++ b/as_gfx/sync.xpm	Fri Dec 05 23:14:02 2008 +0100
    32.3 @@ -1,12 +1,12 @@
    32.4  /*
    32.5  **  OSSP asgui - Accounting system graphical user interface
    32.6 -**  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    32.7 -**  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    32.8 -**  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    32.9 -**  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   32.10 +**  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   32.11 +**  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   32.12 +**  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   32.13 +**  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   32.14  **
   32.15  **  This file is part of OSSP asgui, an accounting system graphical user
   32.16 -**  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   32.17 +**  interface which can be found at http://asgui.europalab.com/.
   32.18  **
   32.19  **  Permission to use, copy, modify, and distribute this software for
   32.20  **  any purpose with or without fee is hereby granted, provided that

    33.1 --- a/as_gui.cpp	Fri Nov 28 14:20:00 2008 +0100
    33.2 +++ b/as_gui.cpp	Fri Dec 05 23:14:02 2008 +0100
    33.3 @@ -1,12 +1,12 @@
    33.4  //
    33.5  //  OSSP asgui - Accounting system graphical user interface
    33.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    33.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    33.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    33.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   33.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   33.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   33.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   33.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   33.14  //
   33.15  //  This file is part of OSSP asgui, an accounting system graphical user
   33.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   33.17 +//  interface which can be found at http://asgui.europalab.com/.
   33.18  //
   33.19  //  Permission to use, copy, modify, and distribute this software for
   33.20  //  any purpose with or without fee is hereby granted, provided that
   33.21 @@ -36,13 +36,16 @@
   33.22  #include "as_const.h"   // Application constants
   33.23  #include "as_pref.h"    // Class Preferences
   33.24  
   33.25 +//Added by qt3to4:
   33.26 +#include <Q3TextStream>
   33.27 +
   33.28  
   33.29  //
   33.30  // Construct a Titraqform which is a child of 'pParent', with the
   33.31  // name 'kszName' and widget flags set to 'Flags'
   33.32  //
   33.33 -Titraqform::Titraqform(QWidget *pParent, const char *kszName, WFlags Flags) :
   33.34 -    QMainWindow(pParent, kszName, Flags)
   33.35 +Titraqform::Titraqform(QWidget *pParent, const char *kszName, Qt::WFlags Flags) :
   33.36 +    Q3MainWindow(pParent, kszName, Flags)
   33.37  {
   33.38      // Early initializations
   33.39      m_pFiletools = NULL;
   33.40 @@ -81,8 +84,8 @@
   33.41  
   33.42      // Rehydrate main window layout and doc positions
   33.43      QString Laystring = m_pPrefs->getString(TITRAQ_PREFFRAMELAY, NULL); // FIXME: Handle first case better
   33.44 -    QTextStream Laystream(&Laystring, IO_ReadOnly);
   33.45 -    Laystream >> *this;
   33.46 +//    Q3TextStream Laystream(&Laystring, QIODevice::ReadOnly);
   33.47 +//    Laystream >> *this;
   33.48  
   33.49  //    // Lock down window size
   33.50  //    setSizePolicy(QSizePolicy((QSizePolicy::SizeType)0,

    34.1 --- a/as_gui.h	Fri Nov 28 14:20:00 2008 +0100
    34.2 +++ b/as_gui.h	Fri Dec 05 23:14:02 2008 +0100
    34.3 @@ -1,12 +1,12 @@
    34.4  //
    34.5  //  OSSP asgui - Accounting system graphical user interface
    34.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    34.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    34.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    34.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   34.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   34.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   34.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   34.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   34.14  //
   34.15  //  This file is part of OSSP asgui, an accounting system graphical user
   34.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   34.17 +//  interface which can be found at http://asgui.europalab.com/.
   34.18  //
   34.19  //  Permission to use, copy, modify, and distribute this software for
   34.20  //  any purpose with or without fee is hereby granted, provided that
   34.21 @@ -32,7 +32,19 @@
   34.22  #ifndef AS_GUI_MWIN_H
   34.23  #define AS_GUI_MWIN_H
   34.24  
   34.25 -#include <qmainwindow.h>
   34.26 +#define QT3_SUPPORT
   34.27 +#include <q3mainwindow.h>
   34.28 +
   34.29 +//Added by qt3to4:
   34.30 +#include <Q3TextStream>
   34.31 +#include <Q3HBoxLayout>
   34.32 +#include <QCloseEvent>
   34.33 +#include <Q3Frame>
   34.34 +#include <QLabel>
   34.35 +#include <Q3PopupMenu>
   34.36 +#include <Q3VBoxLayout>
   34.37 +#include <Q3Action>
   34.38 +#include <Q3ComboBox>
   34.39  
   34.40  #ifdef HAVE_CONFIG_H
   34.41  #include "ac_config.h"
   34.42 @@ -46,10 +58,10 @@
   34.43  #undef  _AS_VERSION_CPP_AS_HEADER_
   34.44  
   34.45  // Trolltech class prototypes
   34.46 -class QAction;
   34.47 -class QHeader;
   34.48 -class QTimeEdit;
   34.49 -class QComboBox;
   34.50 +class Q3Action;
   34.51 +class Q3Header;
   34.52 +class Q3TimeEdit;
   34.53 +class Q3ComboBox;
   34.54  class QLineEdit;
   34.55  class QLabel;
   34.56  class QDate;
   34.57 @@ -130,12 +142,12 @@
   34.58  } styles_t;
   34.59  
   34.60  // Main application form window
   34.61 -class Titraqform : public QMainWindow
   34.62 +class Titraqform : public Q3MainWindow
   34.63  {
   34.64      Q_OBJECT    // Generate MOC object model stubs
   34.65  
   34.66  public:
   34.67 -    Titraqform(QWidget *pParent = 0, const char *kszName = 0, WFlags Flags = 0);
   34.68 +    Titraqform(QWidget *pParent = 0, const char *kszName = 0, Qt::WFlags Flags = 0);
   34.69      ~Titraqform(void);
   34.70  
   34.71      // Accessor methods
   34.72 @@ -176,18 +188,18 @@
   34.73      Preferences *m_pPrefs;
   34.74  
   34.75      // Main application actions
   34.76 -    QAction     *m_pFilenewact,   *m_pFileopenact;
   34.77 -    QAction     *m_pFilesaveact,  *m_pFilesaveasact;
   34.78 -    QAction     *m_pFilecloseact, *m_pFilequitact;
   34.79 -    QAction     *m_pAddrowact,    *m_pDelrowact;
   34.80 -    QAction     *m_pRefreshact,   *m_pCutact;
   34.81 -    QAction     *m_pCopyact,      *m_pPasteact;
   34.82 -    QAction     *m_pSyncact,      *m_pPrefsact;
   34.83 -    QAction     *m_pReportact;
   34.84 +    Q3Action     *m_pFilenewact,   *m_pFileopenact;
   34.85 +    Q3Action     *m_pFilesaveact,  *m_pFilesaveasact;
   34.86 +    Q3Action     *m_pFilecloseact, *m_pFilequitact;
   34.87 +    Q3Action     *m_pAddrowact,    *m_pDelrowact;
   34.88 +    Q3Action     *m_pRefreshact,   *m_pCutact;
   34.89 +    Q3Action     *m_pCopyact,      *m_pPasteact;
   34.90 +    Q3Action     *m_pSyncact,      *m_pPrefsact;
   34.91 +    Q3Action     *m_pReportact;
   34.92  
   34.93      // Table, cells, and entries in package layout
   34.94      TiTable     *m_pMaintable;
   34.95 -    QHeader     *m_pTablehead;
   34.96 +    Q3Header     *m_pTablehead;
   34.97      QStringList *m_pTaskentries;
   34.98  
   34.99      // Edition widgets
  34.100 @@ -198,11 +210,11 @@
  34.101      QLineEdit   *m_pCrcedit;            // Control to edit CRC
  34.102      QLineEdit   *m_pRevedit;            // Control to edit revision
  34.103      Daydatedit  *m_pDateedit;           // Control to edit date
  34.104 -    QTimeEdit   *m_pStarttime;          // Control to edit start time
  34.105 -    QTimeEdit   *m_pEndtime;            // Control to edit finish time
  34.106 +    Q3TimeEdit   *m_pStarttime;          // Control to edit start time
  34.107 +    Q3TimeEdit   *m_pEndtime;            // Control to edit finish time
  34.108  //    QTimeEdit   *m_pAmount;             // Control to edit total time
  34.109      ASTimeEdit  *m_pAmount;             // Control to edit total time
  34.110 -    QComboBox   *m_pTasks;              // Control to choose a task
  34.111 +    Q3ComboBox  *m_pTasks;              // Control to choose a task
  34.112      QLineEdit   *m_pRemark;             // Control to edit remark
  34.113  
  34.114  protected slots:
  34.115 @@ -277,25 +289,25 @@
  34.116      void closeEvent(QCloseEvent *);     // Close current document in main window
  34.117  
  34.118      // Application main window widgets
  34.119 -    QFrame      *m_pCenframe;           // Central frame
  34.120 -    QVBoxLayout *m_pMainlayout;         // Package and control layouts
  34.121 -    QVBoxLayout *m_pPackagelayout;      // Main table control
  34.122 -    QHBoxLayout *m_pEditlayout;         // Lower edition widgets
  34.123 +    Q3Frame      *m_pCenframe;           // Central frame
  34.124 +    Q3VBoxLayout *m_pMainlayout;         // Package and control layouts
  34.125 +    Q3VBoxLayout *m_pPackagelayout;      // Main table control
  34.126 +    Q3HBoxLayout *m_pEditlayout;         // Lower edition widgets
  34.127  
  34.128  private:
  34.129      // Owned by QMainWindow
  34.130      QMenuBar    *m_pMenubar;
  34.131 -    QPopupMenu  *m_pViewpopup;          // Saved for manipulating views
  34.132 -    QPopupMenu  *m_pTbarspopup;         // Saved for manipulating toolbars
  34.133 -    QPopupMenu  *m_pColspopup;          // Saved for manipulating columns
  34.134 +    Q3PopupMenu  *m_pViewpopup;          // Saved for manipulating views
  34.135 +    Q3PopupMenu  *m_pTbarspopup;         // Saved for manipulating toolbars
  34.136 +    Q3PopupMenu  *m_pColspopup;          // Saved for manipulating columns
  34.137      QStatusBar  *m_pStatbar;
  34.138  
  34.139      // Belong to us
  34.140 -    QToolBar    *m_pFiletools;
  34.141 -    QToolBar    *m_pEdittools;
  34.142 -    QToolBar    *m_pViewtools;
  34.143 -    QToolBar    *m_pPrefstools;
  34.144 -    QToolBar    *m_pWhatstools;
  34.145 +    Q3ToolBar    *m_pFiletools;
  34.146 +    Q3ToolBar    *m_pEdittools;
  34.147 +    Q3ToolBar    *m_pViewtools;
  34.148 +    Q3ToolBar    *m_pPrefstools;
  34.149 +    Q3ToolBar    *m_pWhatstools;
  34.150      QString     *m_szFilename;
  34.151  
  34.152      // Constructor helpers
  34.153 @@ -313,11 +325,11 @@
  34.154  
  34.155      // Data processing
  34.156      void loadAccounts(QFile &);         // Load accounts from file
  34.157 -    void loadAccounts(QTextStream &);   // Load accounts from stream
  34.158 +    void loadAccounts(Q3TextStream &);   // Load accounts from stream
  34.159      void loadData(QFile &);             // Load personal data from file
  34.160 -    void loadData(QTextStream &);       // Load personal data from stream
  34.161 +    void loadData(Q3TextStream &);       // Load personal data from stream
  34.162      void saveData(QFile &);             // Save accounting data to file
  34.163 -    void saveData(QTextStream &);       // Save accounting data to stream
  34.164 +    void saveData(Q3TextStream &);       // Save accounting data to stream
  34.165      const bool validateData(QFile &) const;   // Validate personal data in file
  34.166      const bool validateData(QString &) const; // Validate personal data from string
  34.167  };

    35.1 --- a/as_gui_test.sh	Fri Nov 28 14:20:00 2008 +0100
    35.2 +++ b/as_gui_test.sh	Fri Dec 05 23:14:02 2008 +0100
    35.3 @@ -1,12 +1,12 @@
    35.4  ##
    35.5  ##  OSSP asgui - Accounting system graphical user interface
    35.6 -##  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    35.7 -##  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    35.8 -##  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    35.9 -##  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   35.10 +##  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   35.11 +##  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   35.12 +##  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   35.13 +##  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   35.14  ##
   35.15  ##  This file is part of OSSP asgui, an accounting system graphical user
   35.16 -##  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   35.17 +##  interface which can be found at http://asgui.europalab.com/.
   35.18  ##
   35.19  ##  Permission to use, copy, modify, and distribute this software for
   35.20  ##  any purpose with or without fee is hereby granted, provided that

    36.1 --- a/as_helpanel.cpp	Fri Nov 28 14:20:00 2008 +0100
    36.2 +++ b/as_helpanel.cpp	Fri Dec 05 23:14:02 2008 +0100
    36.3 @@ -1,12 +1,12 @@
    36.4  //
    36.5  //  OSSP asgui - Accounting system graphical user interface
    36.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    36.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    36.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    36.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   36.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   36.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   36.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   36.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   36.14  //
   36.15  //  This file is part of OSSP asgui, an accounting system graphical user
   36.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   36.17 +//  interface which can be found at http://asgui.europalab.com/.
   36.18  //
   36.19  //  Permission to use, copy, modify, and distribute this software for
   36.20  //  any purpose with or without fee is hereby granted, provided that
   36.21 @@ -29,12 +29,18 @@
   36.22  //  as_helpanel.cpp: ISO C++ implementation
   36.23  //
   36.24  
   36.25 +#define QT3_SUPPORT
   36.26 +
   36.27  #include <qvariant.h>
   36.28  #include <qpushbutton.h>
   36.29 -#include <qtextbrowser.h>
   36.30 +#include <q3textbrowser.h>
   36.31  #include <qlayout.h>
   36.32  #include <qtooltip.h>
   36.33 -#include <qwhatsthis.h>
   36.34 +#include <q3whatsthis.h>
   36.35 +
   36.36 +//Added by qt3to4:
   36.37 +#include <Q3HBoxLayout>
   36.38 +#include <Q3VBoxLayout>
   36.39  
   36.40  #include "as_helpanel.h"
   36.41  
   36.42 @@ -48,7 +54,7 @@
   36.43  // The dialog will by default be modal, unless you set 'bModal' to
   36.44  // false to construct a modeless dialog.
   36.45  //
   36.46 -Helpanel::Helpanel(const QString &kSource, QWidget *pParent, const char *kszName, bool bModal, WFlags Flags)
   36.47 +Helpanel::Helpanel(const QString &kSource, QWidget *pParent, const char *kszName, bool bModal, Qt::WFlags Flags)
   36.48      : QDialog(pParent, kszName, bModal, Flags)
   36.49  {
   36.50      // Boilerplate code to initialize the panel
   36.51 @@ -61,16 +67,16 @@
   36.52          (QSizePolicy::SizeType)5, 0, 0, this->sizePolicy().hasHeightForWidth()));
   36.53  
   36.54      // Build panel using already constructed widgets and layouts
   36.55 -    m_pFormlay = new QVBoxLayout(this, 11, 6, "Formlayout");
   36.56 +    m_pFormlay = new Q3VBoxLayout(this, 11, 6, "Formlayout");
   36.57  
   36.58      // Groupbox and its text display
   36.59 -    m_pBrowser = new QTextBrowser(this, "Helpbrowser");
   36.60 +    m_pBrowser = new Q3TextBrowser(this, "Helpbrowser");
   36.61      m_pBrowser->setSource(QString(TITRAQ_DOCDIR) + QChar('/') + kSource);
   36.62      m_pBrowser->setReadOnly(true);
   36.63      m_pBrowser->setFocus();
   36.64  
   36.65      // Add a spacer to sideline the otherwise massive dismiss button
   36.66 -    m_pButtlay = new QHBoxLayout(0, 0, 6, "Buttonlayout"); 
   36.67 +    m_pButtlay = new Q3HBoxLayout(0, 0, 6, "Buttonlayout"); 
   36.68      QSpacerItem *pSpacey = new QSpacerItem(40, 20, QSizePolicy::Minimum, QSizePolicy::Minimum);
   36.69      m_pButtlay->addItem(pSpacey);
   36.70  
   36.71 @@ -101,9 +107,9 @@
   36.72      // Top level push buttons associated with accept and save slots
   36.73      m_pDismissbutt->setText(trUtf8("Dismiss", "Comment for Dismissbutton"));
   36.74      QToolTip::add(m_pDismissbutt, trUtf8("Closes the help panel", "Comment for tooltip Dismissbutton"));
   36.75 -    QWhatsThis::add(m_pDismissbutt, trUtf8("The dismiss button dismisses the help panel", "Comment for whatsThis Dismissbutton"));
   36.76 +    Q3WhatsThis::add(m_pDismissbutt, trUtf8("The dismiss button dismisses the help panel", "Comment for whatsThis Dismissbutton"));
   36.77  
   36.78      // The main text browser window which presents the HTML help contents
   36.79 -    QWhatsThis::add(m_pBrowser, trUtf8("The text browser window displays the help contents", "Comment for whatsThis Browser"));
   36.80 +    Q3WhatsThis::add(m_pBrowser, trUtf8("The text browser window displays the help contents", "Comment for whatsThis Browser"));
   36.81  }
   36.82  } // namespace AS

    37.1 --- a/as_helpanel.h	Fri Nov 28 14:20:00 2008 +0100
    37.2 +++ b/as_helpanel.h	Fri Dec 05 23:14:02 2008 +0100
    37.3 @@ -1,12 +1,12 @@
    37.4  //
    37.5  //  OSSP asgui - Accounting system graphical user interface
    37.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    37.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    37.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    37.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   37.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   37.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   37.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   37.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   37.14  //
   37.15  //  This file is part of OSSP asgui, an accounting system graphical user
   37.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   37.17 +//  interface which can be found at http://asgui.europalab.com/.
   37.18  //
   37.19  //  Permission to use, copy, modify, and distribute this software for
   37.20  //  any purpose with or without fee is hereby granted, provided that
   37.21 @@ -29,17 +29,23 @@
   37.22  //  as_helpanel.h: ISO C++ interface
   37.23  //
   37.24  
   37.25 +#define QT3_SUPPORT
   37.26 +
   37.27  #ifndef HELPANEL_H
   37.28  #define HELPANEL_H
   37.29  
   37.30  #include <qvariant.h>
   37.31  #include <qdialog.h>
   37.32  
   37.33 +//Added by qt3to4:
   37.34 +#include <Q3HBoxLayout>
   37.35 +#include <Q3VBoxLayout>
   37.36  
   37.37 -class QVBoxLayout;
   37.38 -class QHBoxLayout;
   37.39 +
   37.40 +class Q3VBoxLayout;
   37.41 +class Q3HBoxLayout;
   37.42  class QPushButton;
   37.43 -class QTextBrowser;
   37.44 +class Q3TextBrowser;
   37.45  
   37.46  namespace AS {
   37.47  
   37.48 @@ -49,16 +55,16 @@
   37.49  
   37.50  public:
   37.51      Helpanel(const QString &, QWidget *pParent = 0, const char *kszName = 0,
   37.52 -        bool bModal = true, WFlags Flags = 0);
   37.53 +        bool bModal = true, Qt::WFlags Flags = 0);
   37.54  //    ~Helpanel(void); // No need to destroy widgets, because qt does it for us
   37.55  
   37.56  public:
   37.57 -    QTextBrowser *m_pBrowser;
   37.58 +    Q3TextBrowser *m_pBrowser;
   37.59      QPushButton  *m_pDismissbutt;
   37.60  
   37.61  protected:
   37.62 -    QVBoxLayout *m_pFormlay;
   37.63 -    QHBoxLayout *m_pButtlay;
   37.64 +    Q3VBoxLayout *m_pFormlay;
   37.65 +    Q3HBoxLayout *m_pButtlay;
   37.66  
   37.67  protected slots:
   37.68      virtual void textChange(void);

    38.1 --- a/as_main.cpp	Fri Nov 28 14:20:00 2008 +0100
    38.2 +++ b/as_main.cpp	Fri Dec 05 23:14:02 2008 +0100
    38.3 @@ -1,12 +1,12 @@
    38.4  //
    38.5  //  OSSP asgui - Accounting system graphical user interface
    38.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    38.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    38.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    38.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   38.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   38.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   38.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   38.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   38.14  //
   38.15  //  This file is part of OSSP asgui, an accounting system graphical user
   38.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   38.17 +//  interface which can be found at http://asgui.europalab.com/.
   38.18  //
   38.19  //  Permission to use, copy, modify, and distribute this software for
   38.20  //  any purpose with or without fee is hereby granted, provided that
   38.21 @@ -29,6 +29,8 @@
   38.22  //  as_main.cpp: ISO C++ implementation
   38.23  //
   38.24  
   38.25 +#define QT3_SUPPORT
   38.26 +
   38.27  #include <qapplication.h>
   38.28  
   38.29  #include "as_gui.h"

    39.1 --- a/as_numdial.cpp	Fri Nov 28 14:20:00 2008 +0100
    39.2 +++ b/as_numdial.cpp	Fri Dec 05 23:14:02 2008 +0100
    39.3 @@ -1,12 +1,12 @@
    39.4  //
    39.5  //  OSSP asgui - Accounting system graphical user interface
    39.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    39.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    39.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    39.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   39.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   39.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   39.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   39.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   39.14  //
   39.15  //  This file is part of OSSP asgui, an accounting system graphical user
   39.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   39.17 +//  interface which can be found at http://asgui.europalab.com/.
   39.18  //
   39.19  //  Permission to use, copy, modify, and distribute this software for
   39.20  //  any purpose with or without fee is hereby granted, provided that
   39.21 @@ -32,13 +32,17 @@
   39.22  #include "as_numdial.h"
   39.23  
   39.24  #include <qvariant.h>
   39.25 -#include <qframe.h>
   39.26 +#include <q3frame.h>
   39.27  #include <qlabel.h>
   39.28  #include <qpushbutton.h>
   39.29  #include <qspinbox.h>
   39.30  #include <qlayout.h>
   39.31  #include <qtooltip.h>
   39.32 -#include <qwhatsthis.h>
   39.33 +#include <q3whatsthis.h>
   39.34 +
   39.35 +//Added by qt3to4:
   39.36 +#include <Q3HBoxLayout>
   39.37 +#include <Q3VBoxLayout>
   39.38  
   39.39  #include "as_const.h"
   39.40  
   39.41 @@ -52,7 +56,7 @@
   39.42  // The dialog will by default be modal, unless you set 'bModal' to
   39.43  // false to construct a modeless dialog.
   39.44  //
   39.45 -Numdial::Numdial(QWidget *pParent, const char *kszName, bool bModal, WFlags Flags)
   39.46 +Numdial::Numdial(QWidget *pParent, const char *kszName, bool bModal, Qt::WFlags Flags)
   39.47      : QDialog(pParent, kszName, bModal, Flags)
   39.48  {
   39.49      // Boilerplate code to initialize the panel
   39.50 @@ -64,12 +68,12 @@
   39.51      this->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)0,
   39.52          (QSizePolicy::SizeType)0, 0, 0, this->sizePolicy().hasHeightForWidth()));
   39.53  
   39.54 -    m_pFrame = new QFrame(this, "Mainframe");
   39.55 -    m_pFrame->setFrameShape(QFrame::StyledPanel);
   39.56 -    m_pFrame->setFrameShadow(QFrame::Raised);
   39.57 -    m_pFramelay = new QVBoxLayout(m_pFrame, 11, 6, "Framelay"); 
   39.58 -    m_pInputlay = new QHBoxLayout(0, 0, 6, "Horizontallayout"); 
   39.59 -    m_pFormlayout = new QVBoxLayout(this, 11, 6, "Formlayout"); 
   39.60 +    m_pFrame = new Q3Frame(this, "Mainframe");
   39.61 +    m_pFrame->setFrameShape(Q3Frame::StyledPanel);
   39.62 +    m_pFrame->setFrameShadow(Q3Frame::Raised);
   39.63 +    m_pFramelay = new Q3VBoxLayout(m_pFrame, 11, 6, "Framelay"); 
   39.64 +    m_pInputlay = new Q3HBoxLayout(0, 0, 6, "Horizontallayout"); 
   39.65 +    m_pFormlayout = new Q3VBoxLayout(this, 11, 6, "Formlayout"); 
   39.66  
   39.67      m_pReportlabel = new QLabel(m_pFrame, "Reportlabel");
   39.68      m_pReportlabel->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)4, (QSizePolicy::SizeType)5, 0, 0, m_pReportlabel->sizePolicy().hasHeightForWidth()));
   39.69 @@ -88,7 +92,7 @@
   39.70      m_pFramelay->addLayout(m_pInputlay);
   39.71  
   39.72      // Push button suite
   39.73 -    m_pButtlay = new QHBoxLayout(0, 0, 6, "Buttlay");
   39.74 +    m_pButtlay = new Q3HBoxLayout(0, 0, 6, "Buttlay");
   39.75      m_pOkaybutt = new QPushButton(m_pFrame, "Okaybutton");
   39.76      m_pOkaybutt->setPaletteBackgroundColor(QColor(198, 196, 186));
   39.77      m_pOkaybutt->setCursor(QCursor(13));
   39.78 @@ -122,13 +126,13 @@
   39.79      // Top level push buttons associated with accept slot
   39.80      m_pCancelbutt->setText(trUtf8("Cancel", "Comment for Cancelbutton"));
   39.81      QToolTip::add(m_pCancelbutt, trUtf8("Closes the report panel", "Comment for tooltip Cancelbutton"));
   39.82 -    QWhatsThis::add(m_pCancelbutt, trUtf8("The cancel button closes the report panel without further action", "Comment for whatsThis Cancelbutton"));
   39.83 +    Q3WhatsThis::add(m_pCancelbutt, trUtf8("The cancel button closes the report panel without further action", "Comment for whatsThis Cancelbutton"));
   39.84      m_pOkaybutt->setText(trUtf8("Okay", "Comment for Okaybutton"));
   39.85      QToolTip::add(m_pOkaybutt, trUtf8("Aknowleges your input", "Comment for tooltip Okaybutton"));
   39.86 -    QWhatsThis::add(m_pOkaybutt, trUtf8("The okay button aknowleges your input and prepares for action", "Comment for whatsThis Okaybutton"));
   39.87 +    Q3WhatsThis::add(m_pOkaybutt, trUtf8("The okay button aknowleges your input and prepares for action", "Comment for whatsThis Okaybutton"));
   39.88  
   39.89      // Text help for spinbox number input
   39.90      QToolTip::add(m_pSpinbox, trUtf8("Input a number", "Comment for tooltip Spinbox"));
   39.91 -    QWhatsThis::add(m_pSpinbox, trUtf8("Click on the arrows or type to input a number", "Comment for whatsThis Spinbox"));
   39.92 +    Q3WhatsThis::add(m_pSpinbox, trUtf8("Click on the arrows or type to input a number", "Comment for whatsThis Spinbox"));
   39.93  }
   39.94  } // namespace AS

    40.1 --- a/as_numdial.h	Fri Nov 28 14:20:00 2008 +0100
    40.2 +++ b/as_numdial.h	Fri Dec 05 23:14:02 2008 +0100
    40.3 @@ -1,12 +1,12 @@
    40.4  //
    40.5  //  OSSP asgui - Accounting system graphical user interface
    40.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    40.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    40.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    40.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   40.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   40.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   40.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   40.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   40.14  //
   40.15  //  This file is part of OSSP asgui, an accounting system graphical user
   40.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   40.17 +//  interface which can be found at http://asgui.europalab.com/.
   40.18  //
   40.19  //  Permission to use, copy, modify, and distribute this software for
   40.20  //  any purpose with or without fee is hereby granted, provided that
   40.21 @@ -29,6 +29,8 @@
   40.22  //  as_numdial.h: ISO C++ interface
   40.23  //
   40.24  
   40.25 +#define QT3_SUPPORT
   40.26 +
   40.27  #ifndef NUMDIALOG_H
   40.28  #define NUMDIALOG_H
   40.29  
   40.30 @@ -36,11 +38,18 @@
   40.31  #include <qdialog.h>
   40.32  #include <qspinbox.h>
   40.33  
   40.34 +//Added by qt3to4:
   40.35 +#include <Q3VBoxLayout>
   40.36 +#include <Q3Frame>
   40.37 +#include <Q3GridLayout>
   40.38 +#include <Q3HBoxLayout>
   40.39 +#include <QLabel>
   40.40  
   40.41 -class QVBoxLayout;
   40.42 -class QHBoxLayout;
   40.43 -class QGridLayout;
   40.44 -class QFrame;
   40.45 +
   40.46 +class Q3VBoxLayout;
   40.47 +class Q3HBoxLayout;
   40.48 +class Q3GridLayout;
   40.49 +class Q3Frame;
   40.50  class QLabel;
   40.51  class QPushButton;
   40.52  
   40.53 @@ -51,10 +60,10 @@
   40.54      Q_OBJECT
   40.55  
   40.56  public:
   40.57 -    Numdial(QWidget *pParent = 0, const char *pkcName = 0, bool bModal = true, WFlags Flags = 0);
   40.58 +    Numdial(QWidget *pParent = 0, const char *pkcName = 0, bool bModal = true, Qt::WFlags Flags = 0);
   40.59  //    ~Numdial(void); // No need to destroy widgets, because qt does it for us
   40.60  
   40.61 -    QFrame *m_pFrame;
   40.62 +    Q3Frame *m_pFrame;
   40.63      QLabel *m_pReportlabel;
   40.64      QSpinBox *m_pSpinbox;
   40.65      QLabel *m_pWeeklabel;
   40.66 @@ -62,10 +71,10 @@
   40.67      QPushButton *m_pCancelbutt;
   40.68  
   40.69  protected:
   40.70 -    QVBoxLayout *m_pFormlayout;
   40.71 -    QVBoxLayout *m_pFramelay;
   40.72 -    QHBoxLayout *m_pInputlay;
   40.73 -    QHBoxLayout *m_pButtlay;
   40.74 +    Q3VBoxLayout *m_pFormlayout;
   40.75 +    Q3VBoxLayout *m_pFramelay;
   40.76 +    Q3HBoxLayout *m_pInputlay;
   40.77 +    Q3HBoxLayout *m_pButtlay;
   40.78  
   40.79  protected slots:
   40.80      virtual void textChange();

    41.1 --- a/as_panel.cpp	Fri Nov 28 14:20:00 2008 +0100
    41.2 +++ b/as_panel.cpp	Fri Dec 05 23:14:02 2008 +0100
    41.3 @@ -1,12 +1,12 @@
    41.4  //
    41.5  //  OSSP asgui - Accounting system graphical user interface
    41.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    41.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    41.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    41.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   41.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   41.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   41.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   41.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   41.14  //
   41.15  //  This file is part of OSSP asgui, an accounting system graphical user
   41.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   41.17 +//  interface which can be found at http://asgui.europalab.com/.
   41.18  //
   41.19  //  Permission to use, copy, modify, and distribute this software for
   41.20  //  any purpose with or without fee is hereby granted, provided that
   41.21 @@ -29,10 +29,18 @@
   41.22  //  as_panel.cpp: ISO C++ implementation
   41.23  //
   41.24  
   41.25 +#define QT3_SUPPORT
   41.26 +
   41.27  #include <vector>
   41.28  
   41.29  #include <qimage.h>
   41.30  
   41.31 +//Added by qt3to4:
   41.32 +#include <Q3HBoxLayout>
   41.33 +#include <Q3GridLayout>
   41.34 +#include <QLabel>
   41.35 +#include <Q3VBoxLayout>
   41.36 +
   41.37  #include "as_panel.h"
   41.38  #include "as_generic.h"
   41.39  #include "as_const.h"
   41.40 @@ -46,7 +54,7 @@
   41.41  // The dialog will by default be modal, unless you set 'bModal' to
   41.42  // false to construct a modeless dialog.
   41.43  //
   41.44 -Prefpanel::Prefpanel(QWidget *pParent, const char *kszName, bool bModal, WFlags Flags)
   41.45 +Prefpanel::Prefpanel(QWidget *pParent, const char *kszName, bool bModal, Qt::WFlags Flags)
   41.46      : QDialog(pParent, kszName, bModal, Flags)
   41.47  {
   41.48      if (!kszName)
   41.49 @@ -60,20 +68,20 @@
   41.50      m_pLight = new QColor();
   41.51      m_pDark = new QColor();
   41.52  
   41.53 -    m_pVlayout = new QVBoxLayout(this, 11, 6, "Formlayout");
   41.54 +    m_pVlayout = new Q3VBoxLayout(this, 11, 6, "Formlayout");
   41.55      m_pTabselect = new QTabWidget(this, "Tabselector");
   41.56  
   41.57      // Start of style chooser UI pieces
   41.58      m_pBoolpage = new QWidget(m_pTabselect, "Tabpage");
   41.59 -    m_pBoolayout = new QHBoxLayout(m_pBoolpage, 11, 6, "Genlayout"); 
   41.60 -    m_pBinlayout = new QVBoxLayout(0, 0, 6, "Binarylayout"); 
   41.61 -    m_pStylegroup = new QButtonGroup(m_pBoolpage, "Stylebuttongroup");
   41.62 +    m_pBoolayout = new Q3HBoxLayout(m_pBoolpage, 11, 6, "Genlayout"); 
   41.63 +    m_pBinlayout = new Q3VBoxLayout(0, 0, 6, "Binarylayout"); 
   41.64 +    m_pStylegroup = new Q3ButtonGroup(m_pBoolpage, "Stylebuttongroup");
   41.65      m_pStylegroup->setColumnLayout(0, Qt::Vertical);
   41.66      m_pStylegroup->layout()->setSpacing(6);
   41.67      m_pStylegroup->layout()->setMargin(11);
   41.68      m_pStylegroup->setExclusive(true);
   41.69  
   41.70 -    m_pStylelay = new QVBoxLayout(m_pStylegroup->layout());
   41.71 +    m_pStylelay = new Q3VBoxLayout(m_pStylegroup->layout());
   41.72      m_pStylelay->setAlignment(Qt::AlignTop);
   41.73  
   41.74      // Block to handle a vector of radio buttons
   41.75 @@ -91,56 +99,56 @@
   41.76              Stylevector[nIter]->sizePolicy().hasHeightForWidth());
   41.77          QToolTip::add(Stylevector[nIter], trUtf8("The " + *Stylename + " style",
   41.78              "Comment for toolTip " + *Stylename));
   41.79 -        QWhatsThis::add(Stylevector[nIter], trUtf8("Click this button to enjoy the style of the "
   41.80 +        Q3WhatsThis::add(Stylevector[nIter], trUtf8("Click this button to enjoy the style of the "
   41.81              + *Stylename + " user interface", "Comment whatsThis for " + *Stylename));
   41.82          m_pStylelay->addWidget(Stylevector[nIter]);
   41.83          nIter++;
   41.84      }
   41.85  
   41.86      // Start of binary option UI pieces (like make backups, yes or no)
   41.87 -    m_pSwitchgroup = new QButtonGroup(m_pBoolpage, "Switchbuttongroup");
   41.88 +    m_pSwitchgroup = new Q3ButtonGroup(m_pBoolpage, "Switchbuttongroup");
   41.89      m_pSwitchgroup->setColumnLayout(0, Qt::Vertical);
   41.90      m_pSwitchgroup->layout()->setSpacing(6);
   41.91      m_pSwitchgroup->layout()->setMargin(11);
   41.92      m_pSwitchgroup->setExclusive(false);
   41.93 -    m_pSwitchlay = new QVBoxLayout(m_pSwitchgroup->layout());
   41.94 +    m_pSwitchlay = new Q3VBoxLayout(m_pSwitchgroup->layout());
   41.95      m_pSwitchlay->setAlignment(Qt::AlignTop);
   41.96  
   41.97      // Optional file backups with hard coded extension .bak
   41.98      m_pBackupcheck = new QCheckBox(m_pSwitchgroup, "Backupbutton");
   41.99      m_pBackupcheck->setText(trUtf8("Make .bak file on save", "Comment for Backupcheck"));
  41.100      QToolTip::add(m_pBackupcheck, trUtf8("Make a .bak file when saving", "Comment for toolTip Backupcheck"));
  41.101 -    QWhatsThis::add(m_pBackupcheck, trUtf8("Check this box to enable automatic file backups when overwriting an existing file", "Comment whatsThis for Backupcheck"));
  41.102 +    Q3WhatsThis::add(m_pBackupcheck, trUtf8("Check this box to enable automatic file backups when overwriting an existing file", "Comment whatsThis for Backupcheck"));
  41.103      m_pSwitchlay->addWidget(m_pBackupcheck);
  41.104  
  41.105      // Optional easy filename appending with hard coded extension .as
  41.106      m_pExtendcheck = new QCheckBox(m_pSwitchgroup, "Extensionbutton");
  41.107      m_pExtendcheck->setText(trUtf8("Append .as extension", "Comment for Extensioncheck"));
  41.108      QToolTip::add(m_pExtendcheck, trUtf8("Use the .as file extension", "Comment for toolTip Extensioncheck"));
  41.109 -    QWhatsThis::add(m_pExtendcheck, trUtf8("Check this box to automatically append '.as' to new filenames when saving", "Comment whatsThis for Extensioncheck"));
  41.110 +    Q3WhatsThis::add(m_pExtendcheck, trUtf8("Check this box to automatically append '.as' to new filenames when saving", "Comment whatsThis for Extensioncheck"));
  41.111      m_pSwitchlay->addWidget(m_pExtendcheck);
  41.112  
  41.113      // Start of report option UI pieces (like detailed report listings)
  41.114 -    m_pReportgroup = new QButtonGroup(m_pBoolpage, "Reportbuttongroup");
  41.115 +    m_pReportgroup = new Q3ButtonGroup(m_pBoolpage, "Reportbuttongroup");
  41.116      m_pReportgroup->setColumnLayout(0, Qt::Vertical);
  41.117      m_pReportgroup->layout()->setSpacing(6);
  41.118      m_pReportgroup->layout()->setMargin(11);
  41.119      m_pReportgroup->setExclusive(false);
  41.120 -    m_pReportlay = new QVBoxLayout(m_pReportgroup->layout());
  41.121 +    m_pReportlay = new Q3VBoxLayout(m_pReportgroup->layout());
  41.122      m_pReportlay->setAlignment(Qt::AlignTop);
  41.123  
  41.124      // Optional detailed report listings write all events in range
  41.125      m_pDetailcheck = new QCheckBox(m_pReportgroup, "Detailistbutton");
  41.126      m_pDetailcheck->setText(trUtf8("Detailed listing", "Comment for Detailcheck"));
  41.127      QToolTip::add(m_pDetailcheck, trUtf8("Write detailed event listings", "Comment for toolTip Detailcheck"));
  41.128 -    QWhatsThis::add(m_pDetailcheck, trUtf8("Check this box to enable writing of detailed event listings to the local report", "Comment whatsThis for Detailcheck"));
  41.129 +    Q3WhatsThis::add(m_pDetailcheck, trUtf8("Check this box to enable writing of detailed event listings to the local report", "Comment whatsThis for Detailcheck"));
  41.130      m_pReportlay->addWidget(m_pDetailcheck);
  41.131  
  41.132      // Optional signature line in report footer
  41.133      m_pSigncheck = new QCheckBox(m_pReportgroup, "Signaturebutton");
  41.134      m_pSigncheck->setText(trUtf8("Signature line", "Comment for Signaturecheck"));
  41.135      QToolTip::add(m_pSigncheck, trUtf8("Append a signature line", "Comment for toolTip Signaturecheck"));
  41.136 -    QWhatsThis::add(m_pSigncheck, trUtf8("Check this box to write a signature line to the report footer", "Comment whatsThis for Signaturecheck"));
  41.137 +    Q3WhatsThis::add(m_pSigncheck, trUtf8("Check this box to write a signature line to the report footer", "Comment whatsThis for Signaturecheck"));
  41.138      m_pReportlay->addWidget(m_pSigncheck);
  41.139      m_pBoolayout->addWidget(m_pStylegroup);
  41.140      m_pBinlayout->addWidget(m_pReportgroup);
  41.141 @@ -150,16 +158,16 @@
  41.142  
  41.143      // Start of paths page UI pieces
  41.144      m_pGeneralpage = new QWidget(m_pTabselect, "Generalpage");
  41.145 -    m_pGenlayout = new QHBoxLayout(m_pGeneralpage, 11, 6, "Genlayout");
  41.146 -    m_pGenbox = new QGroupBox(m_pGeneralpage, "Groupboxlayout");
  41.147 +    m_pGenlayout = new Q3HBoxLayout(m_pGeneralpage, 11, 6, "Genlayout");
  41.148 +    m_pGenbox = new Q3GroupBox(m_pGeneralpage, "Groupboxlayout");
  41.149      m_pGenbox->setColumnLayout(0, Qt::Vertical);
  41.150      m_pGenbox->layout()->setSpacing(6);
  41.151      m_pGenbox->layout()->setMargin(11);
  41.152 -    m_pGenboxlay = new QHBoxLayout(m_pGenbox->layout());
  41.153 +    m_pGenboxlay = new Q3HBoxLayout(m_pGenbox->layout());
  41.154      m_pGenboxlay->setAlignment(Qt::AlignTop);
  41.155  
  41.156      // Start of path text entry preferences UI pieces
  41.157 -    m_pGeninner = new QGridLayout(0, 4, 2, 0, 16, "Innergrid");
  41.158 +    m_pGeninner = new Q3GridLayout(0, 4, 2, 0, 16, "Innergrid");
  41.159      m_pAcctlabel = new QLabel(m_pGenbox, "Accfilelabel");
  41.160      m_pGeninner->addWidget(m_pAcctlabel, 0, 0);
  41.161      m_pAcctline = new QLineEdit(m_pGenbox, "Accountline");
  41.162 @@ -183,17 +191,17 @@
  41.163  
  41.164      // Start of remote page UI pieces
  41.165      m_pRemotepage = new QWidget(m_pTabselect, "Remotepage");
  41.166 -    m_pRemlayout = new QHBoxLayout(m_pRemotepage, 11, 6, "Remlayout");
  41.167 -    m_pRembox = new QGroupBox(m_pRemotepage, "Remoteboxlayout");
  41.168 +    m_pRemlayout = new Q3HBoxLayout(m_pRemotepage, 11, 6, "Remlayout");
  41.169 +    m_pRembox = new Q3GroupBox(m_pRemotepage, "Remoteboxlayout");
  41.170  
  41.171      m_pRembox->setColumnLayout(0, Qt::Vertical);
  41.172      m_pRembox->layout()->setSpacing(6);
  41.173      m_pRembox->layout()->setMargin(11);
  41.174 -    m_pRemboxlay = new QHBoxLayout(m_pRembox->layout());
  41.175 +    m_pRemboxlay = new Q3HBoxLayout(m_pRembox->layout());
  41.176      m_pRemboxlay->setAlignment(Qt::AlignTop);
  41.177  
  41.178      // Start of RPC preferences UI pieces
  41.179 -    m_pReminner = new QGridLayout(0, 5, 2, 0, 12, "Innergrid");
  41.180 +    m_pReminner = new Q3GridLayout(0, 5, 2, 0, 12, "Innergrid");
  41.181      m_pCorbalabel = new QLabel(m_pRembox, "Corbalabel");
  41.182      m_pReminner->addWidget(m_pCorbalabel, 0, 0);
  41.183      m_pCorbaline = new QLineEdit(m_pRembox, "Corbaline");
  41.184 @@ -215,20 +223,20 @@
  41.185  
  41.186      // Start of color page UI pieces
  41.187      m_pColourpage = new QWidget(m_pTabselect, "Colourpage");
  41.188 -    m_pColourlayout = new QHBoxLayout(m_pColourpage, 11, 6, "Colourlayout");
  41.189 -    m_pShadebox = new QGroupBox(m_pColourpage, "Shadegroupbox");
  41.190 +    m_pColourlayout = new Q3HBoxLayout(m_pColourpage, 11, 6, "Colourlayout");
  41.191 +    m_pShadebox = new Q3GroupBox(m_pColourpage, "Shadegroupbox");
  41.192      m_pShadebox->setColumnLayout(0, Qt::Horizontal);
  41.193      m_pShadebox->layout()->setSpacing(6);
  41.194      m_pShadebox->layout()->setMargin(11);
  41.195 -    m_pShadeboxlay = new QVBoxLayout(m_pShadebox->layout());
  41.196 +    m_pShadeboxlay = new Q3VBoxLayout(m_pShadebox->layout());
  41.197      m_pShadeboxlay->setAlignment(Qt::AlignTop);
  41.198  
  41.199 -    m_pShadelayout = new QGridLayout(0, 2, 2, 6, 16, "Shadelayout");
  41.200 +    m_pShadelayout = new Q3GridLayout(0, 2, 2, 6, 16, "Shadelayout");
  41.201      m_pLightlab = new QLabel(m_pShadebox, "Lightlabel");
  41.202      m_pLightlab->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred, this->sizePolicy().hasHeightForWidth());
  41.203      m_pShadelayout->addWidget(m_pLightlab, 0, 0);
  41.204      m_pLightbutt = new QToolButton(m_pShadebox, "Lightbutton");
  41.205 -    m_pLightbutt->setFocusPolicy(QToolButton::TabFocus);
  41.206 +    m_pLightbutt->setFocusPolicy(Qt::TabFocus);
  41.207      m_pLightbutt->setCursor(QCursor(13));
  41.208      m_pShadelayout->addWidget(m_pLightbutt, 0, 1);
  41.209  
  41.210 @@ -236,23 +244,23 @@
  41.211      m_pDarklab->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred, this->sizePolicy().hasHeightForWidth());
  41.212      m_pShadelayout->addWidget(m_pDarklab, 1, 0);
  41.213      m_pDarkbutt = new QToolButton(m_pShadebox, "Darkbutton");
  41.214 -    m_pDarkbutt->setFocusPolicy(QToolButton::TabFocus);
  41.215 +    m_pDarkbutt->setFocusPolicy(Qt::TabFocus);
  41.216      m_pDarkbutt->setCursor(QCursor(13));
  41.217      m_pShadelayout->addWidget(m_pDarkbutt, 1, 1);
  41.218  
  41.219      m_pRevertlab = new QLabel(m_pShadebox, "Revertlabel");
  41.220      m_pShadelayout->addWidget(m_pRevertlab, 2, 0);
  41.221      m_pRevertbutt = new QToolButton(m_pShadebox, "Revertbutton");
  41.222 -    m_pRevertbutt->setFocusPolicy(QToolButton::TabFocus);
  41.223 +    m_pRevertbutt->setFocusPolicy(Qt::TabFocus);
  41.224  //    m_pRevertbutt->setIconSet(QIconSet(QPixmap(s_kpcRevcolour_xpm)));
  41.225      m_pRevertbutt->setCursor(QCursor(13));
  41.226      m_pShadelayout->addWidget(m_pRevertbutt, 2, 1);
  41.227  
  41.228 -    m_pThemebox = new QGroupBox(m_pColourpage, "Themegroupbox");
  41.229 +    m_pThemebox = new Q3GroupBox(m_pColourpage, "Themegroupbox");
  41.230      m_pThemebox->setColumnLayout(0, Qt::Vertical);
  41.231      m_pThemebox->layout()->setSpacing(6);
  41.232      m_pThemebox->layout()->setMargin(11);
  41.233 -    m_pThemeboxlay = new QVBoxLayout(m_pThemebox->layout());
  41.234 +    m_pThemeboxlay = new Q3VBoxLayout(m_pThemebox->layout());
  41.235  
  41.236      QLabel *pPlaceholder = new QLabel(m_pThemebox, "Placeholderlabel");
  41.237      pPlaceholder->setText(trUtf8("Reserved for future use", "Comment for Placeholderlabel"));
  41.238 @@ -271,7 +279,7 @@
  41.239      m_pVlayout->addWidget(m_pTabselect);
  41.240  
  41.241      // Start of bottom buttons for aknowlegement and commital of changes
  41.242 -    m_pButtlay = new QHBoxLayout(0, 0, 12, "Buttonlayout");
  41.243 +    m_pButtlay = new Q3HBoxLayout(0, 0, 12, "Buttonlayout");
  41.244      m_pOkaybutton = new QPushButton(this, "Okaybutton");
  41.245      m_pOkaybutton->setMinimumWidth(120);
  41.246      m_pOkaybutton->setPaletteBackgroundColor(QColor(202, 194, 182));
  41.247 @@ -371,15 +379,15 @@
  41.248  
  41.249      m_pOkaybutton->setText(trUtf8("Okay", "Comment for Okaybutton"));
  41.250      QToolTip::add(m_pOkaybutton, trUtf8("Applies and saves changes", "Comment for tooltip Okaybutton"));
  41.251 -    QWhatsThis::add(m_pOkaybutton, trUtf8("The okay button applies and saves changes", "Comment for whatsThis Okaybutton"));
  41.252 +    Q3WhatsThis::add(m_pOkaybutton, trUtf8("The okay button applies and saves changes", "Comment for whatsThis Okaybutton"));
  41.253  
  41.254      m_pApplybutton->setText(trUtf8("Apply", "Comment for Applybutton"));
  41.255      QToolTip::add(m_pApplybutton, trUtf8("Apply changes immediately", "Comment for toolTip Applybutton"));
  41.256 -    QWhatsThis::add(m_pApplybutton, trUtf8("The apply button applies changes immediately", "Comment for whatsThis Applybutton"));
  41.257 +    Q3WhatsThis::add(m_pApplybutton, trUtf8("The apply button applies changes immediately", "Comment for whatsThis Applybutton"));
  41.258  
  41.259      m_pCancelbutton->setText(trUtf8("Cancel", "Comment for Cancelbutton"));
  41.260      QToolTip::add(m_pCancelbutton, trUtf8("Cancel any changes", "Comment for toolTip Cancelbutton"));
  41.261 -    QWhatsThis::add(m_pCancelbutton, trUtf8("The cancel button cancels any changes", "Comment for whatsThis Cancelbutton"));
  41.262 +    Q3WhatsThis::add(m_pCancelbutton, trUtf8("The cancel button cancels any changes", "Comment for whatsThis Cancelbutton"));
  41.263  
  41.264      m_pGenbox->setTitle(trUtf8("File and directory paths", "Comment for Genbox"));
  41.265      m_pAcctlabel->setText(trUtf8("Accounts path", "Comment for Acctlabel"));
  41.266 @@ -399,11 +407,11 @@
  41.267  
  41.268      m_pCorbacheck->setText(trUtf8("Enable IIOP transmission", "Comment for Corbacheck"));
  41.269      QToolTip::add(m_pCorbacheck, trUtf8("Will enable transmission over IIOP", "Comment for toolTip Corbacheck"));
  41.270 -    QWhatsThis::add(m_pCorbacheck, trUtf8("Check this box to enable transmission to a CORBA host", "Comment whatsThis for Corbacheck"));
  41.271 +    Q3WhatsThis::add(m_pCorbacheck, trUtf8("Check this box to enable transmission to a CORBA host", "Comment whatsThis for Corbacheck"));
  41.272  
  41.273      m_pSoapcheck->setText(trUtf8("Enable SOAP transmission", "Comment for Soapcheck"));
  41.274      QToolTip::add(m_pSoapcheck, trUtf8("Will enable transmission over SOAP", "Comment for toolTip Soapcheck"));
  41.275 -    QWhatsThis::add(m_pSoapcheck, trUtf8("Check this box to enable transmission to a SOAP host", "Comment whatsThis for Soapcheck"));
  41.276 +    Q3WhatsThis::add(m_pSoapcheck, trUtf8("Check this box to enable transmission to a SOAP host", "Comment whatsThis for Soapcheck"));
  41.277  
  41.278      m_pShadebox->setTitle(trUtf8("Row shading", "Comment for Shadebox"));
  41.279      m_pThemebox->setTitle(trUtf8("Skin themes", "Comment for Themebox"));
  41.280 @@ -412,9 +420,9 @@
  41.281      m_pDarklab->setText(trUtf8("Dark", "Comment for Darklabel"));
  41.282      m_pRevertlab->setText(trUtf8("Revert", "Comment for Revertlabel"));
  41.283      QToolTip::add(m_pLightbutt, trUtf8("Light row shading colour", "Comment for tooltip Lightbutt"));
  41.284 -    QWhatsThis::add(m_pLightbutt, trUtf8("The Light button sets the light row shading colour.", "Comment for whatsThis Lightbutt"));
  41.285 +    Q3WhatsThis::add(m_pLightbutt, trUtf8("The Light button sets the light row shading colour.", "Comment for whatsThis Lightbutt"));
  41.286      QToolTip::add(m_pDarkbutt, trUtf8("Dark row shading colour", "Comment for tooltip Darkbutt"));
  41.287 -    QWhatsThis::add(m_pDarkbutt, trUtf8("The Dark button sets the light row shading colour.", "Comment for whatsThis Darkbutt"));
  41.288 +    Q3WhatsThis::add(m_pDarkbutt, trUtf8("The Dark button sets the light row shading colour.", "Comment for whatsThis Darkbutt"));
  41.289  
  41.290      m_pStylegroup->setTitle(trUtf8("Available styles", "Comment for Stylebuttons"));
  41.291      m_pReportgroup->setTitle(trUtf8("Report options", "Comment for Reportbox"));

    42.1 --- a/as_panel.h	Fri Nov 28 14:20:00 2008 +0100
    42.2 +++ b/as_panel.h	Fri Dec 05 23:14:02 2008 +0100
    42.3 @@ -1,12 +1,12 @@
    42.4  //
    42.5  //  OSSP asgui - Accounting system graphical user interface
    42.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    42.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    42.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    42.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   42.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   42.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   42.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   42.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   42.14  //
   42.15  //  This file is part of OSSP asgui, an accounting system graphical user
   42.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   42.17 +//  interface which can be found at http://asgui.europalab.com/.
   42.18  //
   42.19  //  Permission to use, copy, modify, and distribute this software for
   42.20  //  any purpose with or without fee is hereby granted, provided that
   42.21 @@ -29,12 +29,14 @@
   42.22  //  as_panel.h: ISO C++ interface
   42.23  //
   42.24  
   42.25 +#define QT3_SUPPORT
   42.26 +
   42.27  #ifndef PREFPANEL_H
   42.28  #define PREFPANEL_H
   42.29  
   42.30  #include <qvariant.h>
   42.31  #include <qdialog.h>
   42.32 -#include <qbuttongroup.h>
   42.33 +#include <q3buttongroup.h>
   42.34  #include <qlabel.h>
   42.35  #include <qlineedit.h>
   42.36  #include <qpushbutton.h>
   42.37 @@ -46,10 +48,15 @@
   42.38  #include <qwidget.h>
   42.39  #include <qlayout.h>
   42.40  #include <qtooltip.h>
   42.41 -#include <qwhatsthis.h>
   42.42 +#include <q3whatsthis.h>
   42.43  #include <qstylefactory.h>
   42.44  #include <qlayout.h>
   42.45  
   42.46 +//Added by qt3to4:
   42.47 +#include <Q3HBoxLayout>
   42.48 +#include <Q3GridLayout>
   42.49 +#include <Q3VBoxLayout>
   42.50 +
   42.51  #include "as_gui.h"     // For usage of style_t
   42.52  
   42.53  
   42.54 @@ -58,7 +65,7 @@
   42.55      Q_OBJECT
   42.56  
   42.57  public:
   42.58 -    Prefpanel(QWidget *pParent = 0, const char *kszName = 0, bool bModal = true, WFlags Flags = 0);
   42.59 +    Prefpanel(QWidget *pParent = 0, const char *kszName = 0, bool bModal = true, Qt::WFlags Flags = 0);
   42.60  //    ~Prefpanel(void); // No need to destroy widgets, because qt does it for us
   42.61  
   42.62  private:
   42.63 @@ -67,17 +74,17 @@
   42.64      QColorGroup *m_pOrigcolours, *m_pAltcolours;
   42.65  
   42.66  public:
   42.67 -    QGroupBox *m_pGenbox, *m_pRembox, *m_pShadebox, *m_pThemebox;
   42.68 -    QVBoxLayout *m_pStylelay, *m_pReportlay, *m_pSwitchlay;
   42.69 -    QVBoxLayout *m_pVlayout, *m_pBinlayout;
   42.70 -    QHBoxLayout *m_pBoolayout, *m_pGenlayout, *m_pRemlayout;
   42.71 -    QVBoxLayout *m_pShadeboxlay, *m_pThemeboxlay;
   42.72 -    QHBoxLayout *m_pGenboxlay, *m_pRemboxlay, *m_pColourlayout;
   42.73 -    QGridLayout *m_pGeninner, *m_pReminner, *m_pShadelayout;
   42.74 +    Q3GroupBox *m_pGenbox, *m_pRembox, *m_pShadebox, *m_pThemebox;
   42.75 +    Q3VBoxLayout *m_pStylelay, *m_pReportlay, *m_pSwitchlay;
   42.76 +    Q3VBoxLayout *m_pVlayout, *m_pBinlayout;
   42.77 +    Q3HBoxLayout *m_pBoolayout, *m_pGenlayout, *m_pRemlayout;
   42.78 +    Q3VBoxLayout *m_pShadeboxlay, *m_pThemeboxlay;
   42.79 +    Q3HBoxLayout *m_pGenboxlay, *m_pRemboxlay, *m_pColourlayout;
   42.80 +    Q3GridLayout *m_pGeninner, *m_pReminner, *m_pShadelayout;
   42.81  
   42.82      QWidget *m_pBoolpage, *m_pGeneralpage, *m_pRemotepage, *m_pColourpage;
   42.83  
   42.84 -    QHBoxLayout *m_pButtlay;
   42.85 +    Q3HBoxLayout *m_pButtlay;
   42.86      QPushButton *m_pOkaybutton;
   42.87      QPushButton *m_pApplybutton;
   42.88      QPushButton *m_pCancelbutton;
   42.89 @@ -94,7 +101,7 @@
   42.90      QLabel *m_pLightlab, *m_pDarklab, *m_pRevertlab;
   42.91      QToolButton *m_pLightbutt, *m_pDarkbutt, *m_pRevertbutt;
   42.92  
   42.93 -    QButtonGroup *m_pStylegroup, *m_pReportgroup, *m_pSwitchgroup;
   42.94 +    Q3ButtonGroup *m_pStylegroup, *m_pReportgroup, *m_pSwitchgroup;
   42.95      QCheckBox *m_pBackupcheck, *m_pExtendcheck;
   42.96      QCheckBox *m_pDetailcheck, *m_pSigncheck;
   42.97  

    43.1 --- a/as_pref.cpp	Fri Nov 28 14:20:00 2008 +0100
    43.2 +++ b/as_pref.cpp	Fri Dec 05 23:14:02 2008 +0100
    43.3 @@ -28,7 +28,9 @@
    43.4  
    43.5  // TODO: Fix up error reporting
    43.6  
    43.7 -#include <qdom.h>
    43.8 +#define QT3_SUPPORT
    43.9 +
   43.10 +#include <Qt/qdom.h>
   43.11  #include <qfile.h>
   43.12  #include <qtextstream.h>
   43.13  
   43.14 @@ -235,7 +237,7 @@
   43.15  {
   43.16      // open file
   43.17      QFile* datafile = new QFile(file_);
   43.18 -    if (!datafile->open(IO_ReadOnly)) {
   43.19 +    if (!datafile->open(QIODevice::ReadOnly)) {
   43.20          // error opening file
   43.21          qWarning("Error: cannot open preferences file " + file_);
   43.22          datafile->close();
   43.23 @@ -335,7 +337,7 @@
   43.24  
   43.25      // open file
   43.26      QFile* datafile = new QFile(file_);
   43.27 -    if (!datafile->open(IO_WriteOnly)) {
   43.28 +    if (!datafile->open(QIODevice::WriteOnly)) {
   43.29          // error opening file
   43.30          qWarning("Error: Cannot open preferences file " + file_);
   43.31          datafile->close();

    44.1 --- a/as_rand.cpp	Fri Nov 28 14:20:00 2008 +0100
    44.2 +++ b/as_rand.cpp	Fri Dec 05 23:14:02 2008 +0100
    44.3 @@ -1,12 +1,12 @@
    44.4  //
    44.5  //  OSSP asgui - Accounting system graphical user interface
    44.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    44.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    44.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    44.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   44.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   44.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   44.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   44.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   44.14  //
   44.15  //  This file is part of OSSP asgui, an accounting system graphical user
   44.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   44.17 +//  interface which can be found at http://asgui.europalab.com/.
   44.18  //
   44.19  //  Permission to use, copy, modify, and distribute this software for
   44.20  //  any purpose with or without fee is hereby granted, provided that

    45.1 --- a/as_rand.h	Fri Nov 28 14:20:00 2008 +0100
    45.2 +++ b/as_rand.h	Fri Dec 05 23:14:02 2008 +0100
    45.3 @@ -1,12 +1,12 @@
    45.4  //
    45.5  //  OSSP asgui - Accounting system graphical user interface
    45.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    45.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    45.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    45.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   45.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   45.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   45.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   45.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   45.14  //
   45.15  //  This file is part of OSSP asgui, an accounting system graphical user
   45.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   45.17 +//  interface which can be found at http://asgui.europalab.com/.
   45.18  //
   45.19  //  Permission to use, copy, modify, and distribute this software for
   45.20  //  any purpose with or without fee is hereby granted, provided that

    46.1 --- a/as_reportpanel.cpp	Fri Nov 28 14:20:00 2008 +0100
    46.2 +++ b/as_reportpanel.cpp	Fri Dec 05 23:14:02 2008 +0100
    46.3 @@ -1,12 +1,12 @@
    46.4  //
    46.5  //  OSSP asgui - Accounting system graphical user interface
    46.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    46.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    46.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    46.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   46.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   46.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   46.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   46.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   46.14  //
   46.15  //  This file is part of OSSP asgui, an accounting system graphical user
   46.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   46.17 +//  interface which can be found at http://asgui.europalab.com/.
   46.18  //
   46.19  //  Permission to use, copy, modify, and distribute this software for
   46.20  //  any purpose with or without fee is hereby granted, provided that
   46.21 @@ -29,23 +29,30 @@
   46.22  //  as_reportpanel.cpp: ISO C++ implementation
   46.23  //
   46.24  
   46.25 +#define QT3_SUPPORT
   46.26 +
   46.27  #include <qvariant.h>
   46.28  #include <qpushbutton.h>
   46.29 -#include <qtextedit.h>
   46.30 +#include <q3textedit.h>
   46.31  #include <qtoolbutton.h>
   46.32 -#include <qbuttongroup.h>
   46.33 -#include <qpopupmenu.h>
   46.34 +#include <q3buttongroup.h>
   46.35 +#include <q3popupmenu.h>
   46.36  #include <qlayout.h>
   46.37  #include <qtooltip.h>
   46.38 -#include <qwhatsthis.h>
   46.39 -#include <qtextstream.h>
   46.40 -#include <qfiledialog.h>
   46.41 +#include <q3whatsthis.h>
   46.42 +#include <q3textstream.h>
   46.43 +#include <q3filedialog.h>
   46.44  #include <qprinter.h>
   46.45 -#include <qpaintdevicemetrics.h>
   46.46 +#include <q3paintdevicemetrics.h>
   46.47  #include <qpainter.h>
   46.48  #include <qfile.h>
   46.49  #include <qdir.h>
   46.50  
   46.51 +//Added by qt3to4:
   46.52 +#include <Q3HBoxLayout>
   46.53 +#include <Q3Frame>
   46.54 +#include <Q3VBoxLayout>
   46.55 +
   46.56  #include "as_reportpanel.h"
   46.57  #include "as_numdial.h"
   46.58  #include "as_table.h"
   46.59 @@ -71,7 +78,7 @@
   46.60  //
   46.61  Reportpanel::Reportpanel(TiTable *pTable, Preferences *pPreferences,
   46.62                           QWidget *pParent, const char *kszName,
   46.63 -                         bool bModal, WFlags Flags)
   46.64 +                         bool bModal, Qt::WFlags Flags)
   46.65                           : QDialog(pParent, kszName, bModal, Flags)
   46.66  {
   46.67      // Boilerplate code to initialize the panel
   46.68 @@ -93,13 +100,13 @@
   46.69      m_nMonths = m_pReprefs->getNumber(TITRAQ_PREFREPORTMONTHS, TITRAQ_DEFREPORTMONTHS);
   46.70  
   46.71      // Build panel using already constructed widgets and layouts
   46.72 -    m_pFormlay = new QVBoxLayout(this, 11, 6, "Formlayout");
   46.73 -    m_pToolay = new QHBoxLayout(0, 0, 6, "Toolbuttonlay"); 
   46.74 -    m_pPushlay = new QHBoxLayout(0, 0, 6, "Pushbuttonlay"); 
   46.75 +    m_pFormlay = new Q3VBoxLayout(this, 11, 6, "Formlayout");
   46.76 +    m_pToolay = new Q3HBoxLayout(0, 0, 6, "Toolbuttonlay"); 
   46.77 +    m_pPushlay = new Q3HBoxLayout(0, 0, 6, "Pushbuttonlay"); 
   46.78  
   46.79      // Groupbox and its text display
   46.80 -    m_pBrowser = new QTextEdit(this, "Reportbrowser");
   46.81 -    m_pBrowser->setTextFormat(PlainText);
   46.82 +    m_pBrowser = new Q3TextEdit(this, "Reportbrowser");
   46.83 +    m_pBrowser->setTextFormat(Qt::PlainText);
   46.84      m_pBrowser->setReadOnly(true);
   46.85      m_pBrowser->setFont(QFont("Courier", 10));
   46.86      m_pFormlay->addWidget(m_pBrowser);
   46.87 @@ -109,26 +116,26 @@
   46.88      m_pFormlay->addLayout(m_pPushlay);
   46.89  
   46.90      // Tool button suite
   46.91 -    m_pWeekmonthgroup = new QButtonGroup(this, "Weekmonthgroup");
   46.92 +    m_pWeekmonthgroup = new Q3ButtonGroup(this, "Weekmonthgroup");
   46.93      m_pWeekmonthgroup->setColumnLayout(0, Qt::Horizontal);
   46.94      m_pWeekmonthgroup->layout()->setSpacing(11);
   46.95      m_pWeekmonthgroup->layout()->setMargin(0);
   46.96 -    m_pWeekmonthlay = new QHBoxLayout(m_pWeekmonthgroup->layout());
   46.97 -    m_pWeekmonthgroup->setFrameShape(QFrame::NoFrame);
   46.98 +    m_pWeekmonthlay = new Q3HBoxLayout(m_pWeekmonthgroup->layout());
   46.99 +    //m_pWeekmonthgroup->setFrameShape(QFrame::NoFrame);
  46.100      m_pWeekmonthgroup->setExclusive(true);
  46.101      m_pWeeklybutt = new QToolButton(m_pWeekmonthgroup, "Weeklybutton");
  46.102  //    m_pWeeklybutt->setPaletteBackgroundColor(QColor(198, 196, 186));
  46.103 -    m_pWeeklybutt->setFocusPolicy(QWidget::TabFocus);
  46.104 +    m_pWeeklybutt->setFocusPolicy(Qt::TabFocus);
  46.105      m_pWeeklybutt->setCursor(QCursor(13));
  46.106      m_pWeeklybutt->setToggleButton(true);
  46.107      m_pMonthlybutt = new QToolButton(m_pWeekmonthgroup, "Monthlybutton");
  46.108  //    m_pMonthlybutt->setPaletteBackgroundColor(QColor(198, 196, 186));
  46.109 -    m_pMonthlybutt->setFocusPolicy(QWidget::TabFocus);
  46.110 +    m_pMonthlybutt->setFocusPolicy(Qt::TabFocus);
  46.111      m_pMonthlybutt->setCursor(QCursor(13));
  46.112      m_pMonthlybutt->setToggleButton(true);
  46.113  
  46.114      // Popup for number of weeks
  46.115 -    m_pWeekpop = new QPopupMenu(this);
  46.116 +    m_pWeekpop = new Q3PopupMenu(this);
  46.117      if (m_pWeekpop == NULL) // Sanity check
  46.118          throw Genexcept("Weekly toolbutton popup creation failed.");
  46.119      m_pWeekpop->insertItem(trUtf8("One week"), this, SLOT(reportWeeks(int)));
  46.120 @@ -146,7 +153,7 @@
  46.121      }
  46.122  
  46.123      // Popup for number of months
  46.124 -    m_pMonthpop = new QPopupMenu(this);
  46.125 +    m_pMonthpop = new Q3PopupMenu(this);
  46.126      if (m_pMonthpop == NULL) // Sanity check
  46.127          throw Genexcept("Monthly toolbutton popup creation failed.");
  46.128      m_pMonthpop->insertItem(trUtf8("One month"), this, SLOT(reportMonths(int)));
  46.129 @@ -525,15 +532,16 @@
  46.130          Tempstring = m_pReptable->text(nIter, TITRAQ_IDXTASK);
  46.131          Tempdate = QDate::fromString(m_pReptable->text(nIter, TITRAQ_IDXDATE), Qt::ISODate);
  46.132          if (!Tempstring.isEmpty() && Firstday <= Tempdate && Tempdate < Lastday) {
  46.133 -            string Convstring = Tempstring;         // Convert to string (can't cast?)
  46.134 +            string Convstring = Tempstring.toStdString(); // Convert to string (can't cast?)
  46.135              QTime Intable = QTime::fromString(m_pReptable->text(nIter, TITRAQ_IDXAMOUNT), Qt::ISODate);
  46.136 -            int nTothours = QString(Hashtasks[Convstring]).section(':', 0, 0).toInt() + Intable.hour();
  46.137 -            int nTotminut = QString(Hashtasks[Convstring]).section(':', 1, 1).toInt() + Intable.minute();
  46.138 +            string Gethashed = Hashtasks[Convstring];
  46.139 +            int nTothours = QString::fromStdString(Gethashed).section(':', 0, 0).toInt() + Intable.hour();;
  46.140 +            int nTotminut = QString::fromStdString(Gethashed).section(':', 1, 1).toInt() + Intable.minute();
  46.141              nTothours += nTotminut / 60;
  46.142              nTotminut %= 60;
  46.143              QString Hours = QString::number(nTothours).rightJustify(3, ' ');
  46.144              QString Mins  = QString::number(nTotminut).rightJustify(2, '0');
  46.145 -            string Timestring = Hours + ':' + Mins; // Convert to string (can't cast?)
  46.146 +            string Timestring = Hours.toStdString() + ':' + Mins.toStdString(); // Convert to string (can't cast?)
  46.147              Hashtasks[Convstring] = Timestring;     // Finally store in hashtable
  46.148          }
  46.149      }
  46.150 @@ -544,7 +552,7 @@
  46.151  
  46.152      // Write the actual data totals to the outgoing string in reverse order
  46.153      for (Houriter = Hashhours.begin(); Houriter != Hashhours.end(); Houriter++)
  46.154 -        Totals = Houriter->first + ' ' + Houriter->second + '\n' + Totals;
  46.155 +        Totals = QString::fromStdString(Houriter->first + ' ' + Houriter->second + '\n' + Totals.toStdString());
  46.156  
  46.157      // Write some quick header text to the outgoing string in reverse order
  46.158      Totals = QString("------ ----------------------------------------\n") + Totals;
  46.159 @@ -631,16 +639,17 @@
  46.160          Tempstring = m_pReptable->text(nIter, TITRAQ_IDXTASK);
  46.161          Tempdate = QDate::fromString(m_pReptable->text(nIter, TITRAQ_IDXDATE), Qt::ISODate);
  46.162          if (!Tempstring.isEmpty() && Firstday <= Tempdate && Tempdate < Lastday) {
  46.163 -            string Convstring = Tempstring;         // Convert to string (can't cast?)
  46.164 +            string Convstring = Tempstring.toStdString();  // Convert to string (can't cast?)
  46.165              QTime Intable = QTime::fromString(m_pReptable->text(nIter, TITRAQ_IDXAMOUNT), Qt::ISODate);
  46.166 -            int nTothours = QString(Hashtasks[Convstring]).section(':', 0, 0).toInt() + Intable.hour();
  46.167 -            int nTotminut = QString(Hashtasks[Convstring]).section(':', 1, 1).toInt() + Intable.minute();
  46.168 +            string Gethashed = Hashtasks[Convstring];
  46.169 +            int nTothours = QString::fromStdString(Gethashed).section(':', 0, 0).toInt() + Intable.hour();;
  46.170 +            int nTotminut = QString::fromStdString(Gethashed).section(':', 1, 1).toInt() + Intable.minute();
  46.171              nTothours += nTotminut / 60;
  46.172              nTotminut %= 60;
  46.173              QString Hours = QString::number(nTothours).rightJustify(3, ' ');
  46.174              QString Mins  = QString::number(nTotminut).rightJustify(2, '0');
  46.175 -            string Timestring = Hours + ':' + Mins; // Convert to string (can't cast?)
  46.176 -            Hashtasks[Convstring] = Timestring;     // Finally store in hashtable
  46.177 +            QString Timestring = Hours + ':' + Mins; // Convert to string (can't cast?)
  46.178 +            Hashtasks[Convstring] = Timestring.toStdString();  // Finally store in hashtable
  46.179          }
  46.180      }
  46.181  
  46.182 @@ -650,7 +659,7 @@
  46.183  
  46.184      // Write the actual data totals to the outgoing string in reverse order
  46.185      for (Houriter = Hashhours.begin(); Houriter != Hashhours.end(); Houriter++)
  46.186 -        Totals = Houriter->first + ' ' + Houriter->second + '\n' + Totals;
  46.187 +        Totals = QString::fromStdString(Houriter->first + ' ' + Houriter->second + '\n' + Totals.toStdString());
  46.188  
  46.189      // Write some quick header text to the outgoing string in reverse order
  46.190      Totals = QString("------ ----------------------------------------\n") + Totals;
  46.191 @@ -670,7 +679,7 @@
  46.192      QString Openas = m_pReprefs->getString(TITRAQ_PREFHOME, TITRAQ_DEFHOME);
  46.193  
  46.194      // And then get the name of the selected file to save to
  46.195 -    Filestring = QFileDialog::getSaveFileName(Openas, trUtf8("Text files (*.txt);;All Files (*)"), this, trUtf8("ChooserDialog"), trUtf8("Choose a file to save"), NULL, false);
  46.196 +    Filestring = Q3FileDialog::getSaveFileName(Openas, trUtf8("Text files (*.txt);;All Files (*)"), this, trUtf8("ChooserDialog"), trUtf8("Choose a file to save"), NULL, false);
  46.197      if (!Filestring.isEmpty()) {
  46.198          if (QFile::exists(Filestring)) {
  46.199              nResult = QMessageBox::warning(this, QString(TITRAQ_APPTITLE)
  46.200 @@ -678,16 +687,16 @@
  46.201                        trUtf8("&Yes"), trUtf8("&No"), NULL, 1, 1);
  46.202              if (nResult = QMessageBox::Ok) {                // Overwrite a file
  46.203                  Report.setName(Filestring);                 // User wished name
  46.204 -                Report.open(IO_WriteOnly | IO_Truncate);    // Open report file
  46.205 -                QTextStream Outstream(&Report);             // Convert to stream
  46.206 +                Report.open(QIODevice::WriteOnly | QIODevice::Truncate);    // Open report file
  46.207 +                Q3TextStream Outstream(&Report);             // Convert to stream
  46.208                  Outstream << m_pBrowser->text();            // Write the data
  46.209                  Report.close();                             // Finish by closing
  46.210              }
  46.211          }
  46.212          else { // User gave a file name, and there was no preexisting file there
  46.213              Report.setName(Filestring);                 // User wished name
  46.214 -            Report.open(IO_WriteOnly | IO_Truncate);    // Open report file
  46.215 -            QTextStream Outstream(&Report);             // Convert to stream
  46.216 +            Report.open(QIODevice::WriteOnly | QIODevice::Truncate);    // Open report file
  46.217 +            Q3TextStream Outstream(&Report);             // Convert to stream
  46.218              Outstream << m_pBrowser->text();            // Write the data
  46.219              Report.close();                             // Finish by closing
  46.220          }
  46.221 @@ -707,7 +716,7 @@
  46.222          Paint.begin(m_pPrinter);        // Paint on printer
  46.223          Paint.setFont(m_pBrowser->font());
  46.224          QFontMetrics Fontmetrics = Paint.fontMetrics();
  46.225 -        QPaintDeviceMetrics Devmetrics(m_pPrinter); // Need width/height of printer surface
  46.226 +        Q3PaintDeviceMetrics Devmetrics(m_pPrinter); // Need width/height of printer surface
  46.227          const int knMargin = Devmetrics.logicalDpiX() / 2;  // Half-inch margin
  46.228          int nYpos   = knMargin;                             // Y position for each line
  46.229          int nPageno = 1;                                    // The starting page number
  46.230 @@ -743,20 +752,20 @@
  46.231      // Top level push buttons associated with accept and save slots
  46.232      m_pSavebutt->setText(trUtf8("Save As...", "Comment for Savebutton"));
  46.233      QToolTip::add(m_pSavebutt, trUtf8("Saves the report text", "Comment for tooltip Savebutton"));
  46.234 -    QWhatsThis::add(m_pSavebutt, trUtf8("The save button saves the report text to a file", "Comment for whatsThis Savebutton"));
  46.235 +    Q3WhatsThis::add(m_pSavebutt, trUtf8("The save button saves the report text to a file", "Comment for whatsThis Savebutton"));
  46.236      m_pPrintbutt->setText(trUtf8("Print...", "Comment for Printbutton"));
  46.237      QToolTip::add(m_pPrintbutt, trUtf8("Print the report text", "Comment for tooltip Printbutton"));
  46.238 -    QWhatsThis::add(m_pPrintbutt, trUtf8("The print button prints the report text to a file", "Comment for whatsThis Printbutton"));
  46.239 +    Q3WhatsThis::add(m_pPrintbutt, trUtf8("The print button prints the report text to a file", "Comment for whatsThis Printbutton"));
  46.240      m_pDismissbutt->setText(trUtf8("Dismiss", "Comment for Dismissbutton"));
  46.241      QToolTip::add(m_pDismissbutt, trUtf8("Closes the report panel", "Comment for tooltip Dismissbutton"));
  46.242 -    QWhatsThis::add(m_pDismissbutt, trUtf8("The dismiss button dismisses the report panel", "Comment for whatsThis Dismissbutton"));
  46.243 +    Q3WhatsThis::add(m_pDismissbutt, trUtf8("The dismiss button dismisses the report panel", "Comment for whatsThis Dismissbutton"));
  46.244  
  46.245      // Inner tool buttons for new local report generation
  46.246      m_pWeeklybutt->setText(trUtf8("Weekly", "Comment for Weeklybutt"));
  46.247      QToolTip::add(m_pWeeklybutt, trUtf8("Hold down for options", "Comment for tooltip Weeklybutt"));
  46.248 -    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"));
  46.249 +    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"));
  46.250      m_pMonthlybutt->setText(trUtf8("Monthly", "Comment for Monthlybutt"));
  46.251      QToolTip::add(m_pMonthlybutt, trUtf8("Hold down for options", "Comment for tooltip Monthlybutt"));
  46.252 -    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"));
  46.253 +    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"));
  46.254  }
  46.255  } // namespace AS

    47.1 --- a/as_reportpanel.h	Fri Nov 28 14:20:00 2008 +0100
    47.2 +++ b/as_reportpanel.h	Fri Dec 05 23:14:02 2008 +0100
    47.3 @@ -1,12 +1,12 @@
    47.4  //
    47.5  //  OSSP asgui - Accounting system graphical user interface
    47.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    47.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    47.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    47.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   47.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   47.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   47.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   47.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   47.14  //
   47.15  //  This file is part of OSSP asgui, an accounting system graphical user
   47.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   47.17 +//  interface which can be found at http://asgui.europalab.com/.
   47.18  //
   47.19  //  Permission to use, copy, modify, and distribute this software for
   47.20  //  any purpose with or without fee is hereby granted, provided that
   47.21 @@ -29,6 +29,8 @@
   47.22  //  as_reportpanel.h: ISO C++ interface
   47.23  //
   47.24  
   47.25 +#define QT3_SUPPORT
   47.26 +
   47.27  #ifndef REPORTPANEL_H
   47.28  #define REPORTPANEL_H
   47.29  
   47.30 @@ -36,17 +38,23 @@
   47.31  #include <qdialog.h>
   47.32  #include <qdatetime.h>
   47.33  
   47.34 +//Added by qt3to4:
   47.35 +#include <Q3GridLayout>
   47.36 +#include <Q3HBoxLayout>
   47.37 +#include <Q3VBoxLayout>
   47.38 +#include <Q3PopupMenu>
   47.39 +
   47.40  
   47.41  class TiTable;
   47.42  class Preferences;
   47.43 -class QVBoxLayout;
   47.44 -class QHBoxLayout;
   47.45 -class QGridLayout;
   47.46 +class Q3VBoxLayout;
   47.47 +class Q3HBoxLayout;
   47.48 +class Q3GridLayout;
   47.49  class QPushButton;
   47.50 -class QTextEdit;
   47.51 +class Q3TextEdit;
   47.52  class QToolButton;
   47.53 -class QButtonGroup;
   47.54 -class QPopupMenu;
   47.55 +class Q3ButtonGroup;
   47.56 +class Q3PopupMenu;
   47.57  class QPrinter;
   47.58  
   47.59  namespace AS {
   47.60 @@ -57,26 +65,26 @@
   47.61  
   47.62  public:
   47.63      Reportpanel(TiTable *, Preferences *, QWidget *pParent = 0,
   47.64 -                const char *kszName = 0, bool bModal = true, WFlags Flags = 0);
   47.65 +                const char *kszName = 0, bool bModal = true, Qt::WFlags Flags = 0);
   47.66  //    ~Reportpanel(void); // No need to destroy widgets, because qt does it for us
   47.67  
   47.68  public:
   47.69 -    QButtonGroup *m_pWeekmonthgroup;
   47.70 +    Q3ButtonGroup *m_pWeekmonthgroup;
   47.71      QToolButton  *m_pWeeklybutt;
   47.72      QToolButton  *m_pMonthlybutt;
   47.73 -    QTextEdit    *m_pBrowser;
   47.74 +    Q3TextEdit    *m_pBrowser;
   47.75      QPushButton  *m_pSavebutt;
   47.76      QPushButton  *m_pDismissbutt;
   47.77      QPushButton  *m_pPrintbutt;
   47.78  
   47.79  protected:
   47.80 -    QVBoxLayout *m_pFormlay;
   47.81 -    QVBoxLayout *m_pGrouplay;
   47.82 -    QHBoxLayout *m_pToolay;
   47.83 -    QHBoxLayout *m_pPushlay;
   47.84 -    QHBoxLayout *m_pWeekmonthlay;
   47.85 -    QPopupMenu  *m_pWeekpop;
   47.86 -    QPopupMenu  *m_pMonthpop;
   47.87 +    Q3VBoxLayout *m_pFormlay;
   47.88 +    Q3VBoxLayout *m_pGrouplay;
   47.89 +    Q3HBoxLayout *m_pToolay;
   47.90 +    Q3HBoxLayout *m_pPushlay;
   47.91 +    Q3HBoxLayout *m_pWeekmonthlay;
   47.92 +    Q3PopupMenu  *m_pWeekpop;
   47.93 +    Q3PopupMenu  *m_pMonthpop;
   47.94  
   47.95  private:
   47.96      int          m_nWeeks;

    48.1 --- a/as_sfile.cpp	Fri Nov 28 14:20:00 2008 +0100
    48.2 +++ b/as_sfile.cpp	Fri Dec 05 23:14:02 2008 +0100
    48.3 @@ -1,12 +1,12 @@
    48.4  //
    48.5  //  OSSP asgui - Accounting system graphical user interface
    48.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    48.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    48.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    48.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   48.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   48.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   48.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   48.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   48.14  //
   48.15  //  This file is part of OSSP asgui, an accounting system graphical user
   48.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   48.17 +//  interface which can be found at http://asgui.europalab.com/.
   48.18  //
   48.19  //  Permission to use, copy, modify, and distribute this software for
   48.20  //  any purpose with or without fee is hereby granted, provided that
   48.21 @@ -32,6 +32,9 @@
   48.22  #include "as_sfile.h"
   48.23  #include "as_except.h"
   48.24  
   48.25 +//Added by qt3to4:
   48.26 +#include <Q3TextStream>
   48.27 +
   48.28  
   48.29  //
   48.30  // Serialize a backup of an incoming file object
   48.31 @@ -41,17 +44,17 @@
   48.32      QFile Filein;           // Input readonly file
   48.33      QFile Filebak;          // Backup writeonly file
   48.34      QString Fname;          // Filename of input file
   48.35 -    QTextStream Streamin;   // Stream to read from (Filein)
   48.36 -    QTextStream Streambak;  // Stream to write to (Filebak)
   48.37 +    Q3TextStream Streamin;   // Stream to read from (Filein)
   48.38 +    Q3TextStream Streambak;  // Stream to write to (Filebak)
   48.39  
   48.40      try {
   48.41          if(!this->exists())                 // Conditionally short circuit if
   48.42              return;                         // file to backup does not exist
   48.43          Fname = this->name();               // Copy filename from original
   48.44          Filein.setName(Fname);              // Set filename of original
   48.45 -        Filein.open(IO_ReadOnly);           // Open original read-only
   48.46 +        Filein.open(QIODevice::ReadOnly);           // Open original read-only
   48.47          Filebak.setName(Fname + ".bak");    // Set filename of backup
   48.48 -        Filebak.open(IO_WriteOnly);         // Open backup write-only
   48.49 +        Filebak.open(QIODevice::WriteOnly);         // Open backup write-only
   48.50          Streamin.setDevice(&Filein);        // Set incoming stream
   48.51          Streambak.setDevice(&Filebak);      // Set outgoing stream
   48.52          Streambak << Streamin.read();       // Do actual writing

    49.1 --- a/as_sfile.h	Fri Nov 28 14:20:00 2008 +0100
    49.2 +++ b/as_sfile.h	Fri Dec 05 23:14:02 2008 +0100
    49.3 @@ -1,12 +1,12 @@
    49.4  //
    49.5  //  OSSP asgui - Accounting system graphical user interface
    49.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    49.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    49.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    49.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   49.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   49.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   49.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   49.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   49.14  //
   49.15  //  This file is part of OSSP asgui, an accounting system graphical user
   49.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   49.17 +//  interface which can be found at http://asgui.europalab.com/.
   49.18  //
   49.19  //  Permission to use, copy, modify, and distribute this software for
   49.20  //  any purpose with or without fee is hereby granted, provided that
   49.21 @@ -32,6 +32,8 @@
   49.22  #ifndef SIMPLEFILE_H
   49.23  #define SIMPLEFILE_H
   49.24  
   49.25 +#define QT3_SUPPORT
   49.26 +
   49.27  #include <qfile.h>
   49.28  #include <qtextstream.h>
   49.29  

    50.1 --- a/as_slot.cpp	Fri Nov 28 14:20:00 2008 +0100
    50.2 +++ b/as_slot.cpp	Fri Dec 05 23:14:02 2008 +0100
    50.3 @@ -1,12 +1,12 @@
    50.4  //
    50.5  //  OSSP asgui - Accounting system graphical user interface
    50.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    50.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    50.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    50.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   50.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   50.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   50.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   50.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   50.14  //
   50.15  //  This file is part of OSSP asgui, an accounting system graphical user
   50.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   50.17 +//  interface which can be found at http://asgui.europalab.com/.
   50.18  //
   50.19  //  Permission to use, copy, modify, and distribute this software for
   50.20  //  any purpose with or without fee is hereby granted, provided that
   50.21 @@ -29,27 +29,40 @@
   50.22  //  as_slot.cpp: ISO C++ implementation
   50.23  //
   50.24  
   50.25 +#define QT3_SUPPORT
   50.26 +
   50.27  // system headers
   50.28  #include <memory>
   50.29  #include <cstring>
   50.30  
   50.31  // Qt headers
   50.32 -#include <qfiledialog.h>
   50.33 +#include <q3filedialog.h>
   50.34  #include <qcombobox.h>
   50.35  #include <qclipboard.h>
   50.36  #include <qmenudata.h>
   50.37  #include <qdatastream.h>
   50.38  #include <qstatusbar.h>
   50.39  #include <qaction.h>
   50.40 -#include <qpopupmenu.h>
   50.41 +#include <q3popupmenu.h>
   50.42  
   50.43  // Qt style headers
   50.44  #include <qcdestyle.h>
   50.45 -#include <qsgistyle.h>
   50.46 +#include <qcleanlooksstyle.h>
   50.47 +#include <qcommonstyle.h>
   50.48  #include <qmotifstyle.h>
   50.49 -#include <qmotifplusstyle.h>
   50.50 -#include <qplatinumstyle.h>
   50.51 +#include <qplastiquestyle.h>
   50.52 +#include <qwindowscestyle.h>
   50.53 +#include <qwindowsmobilestyle.h>
   50.54  #include <qwindowsstyle.h>
   50.55 +#include <qwindowsvistastyle.h>
   50.56 +#include <qwindowsxpstyle.h>
   50.57 +
   50.58 +//Added by qt3to4:
   50.59 +#include <QPixmap>
   50.60 +#include <QCloseEvent>
   50.61 +#include <Q3TextStream>
   50.62 +#include <Q3MemArray>
   50.63 +#include <Q3Action>
   50.64  
   50.65  // User interface
   50.66  #include "as_const.h"           // Application constants
   50.67 @@ -122,8 +135,8 @@
   50.68  
   50.69      pClip = QApplication::clipboard();                  // Prime the clips
   50.70      Selection = pClip->text(QClipboard::Clipboard);     // Windows and Unix
   50.71 -    nRows = Selection.contains(QChar('\n'));            // How many rows
   50.72 -    if (Selection != NULL && nRows > 0) { // Ignore empty clipboards
   50.73 +    nRows = Selection.count(QChar('\n'));               // How many rows
   50.74 +    if (Selection.isNull() && nRows > 0) { // Ignore empty clipboards
   50.75          this->addEntry(nRows);                          // Reuse slot
   50.76          setRowdata(Selection);                          // Use accessor
   50.77  
   50.78 @@ -147,7 +160,7 @@
   50.79  //
   50.80  void Titraqform::addEntry(int nRows)
   50.81  {
   50.82 -    QTableSelection Select; // Highlighted text
   50.83 +    Q3TableSelection Select; // Highlighted text
   50.84      int nTotal = 0;         // Total row select
   50.85      int nCurrent = 0;       // Current row
   50.86      std::auto_ptr<AS::Uuid> pGuid(new AS::Uuid); // For GUID production
   50.87 @@ -180,7 +193,7 @@
   50.88              m_pMaintable->setPixmap(Select.topRow() + nIter, TITRAQ_IDXSTATUS, QPixmap(s_kpcStatwarn_xpm));
   50.89              m_pMaintable->setText(Select.topRow() + nIter, TITRAQ_IDXUSER, m_pPrefs->getString(TITRAQ_PREFUSER, TITRAQ_DEFUSER));
   50.90              pGuid->genId();
   50.91 -            m_pMaintable->setText(Select.topRow() + nIter, TITRAQ_IDXGUID, pGuid->getString());
   50.92 +            m_pMaintable->setText(Select.topRow() + nIter, TITRAQ_IDXGUID, QString::fromStdString(pGuid->getString()));
   50.93              m_pMaintable->setText(Select.topRow() + nIter, TITRAQ_IDXCRC, "0"); // 0 = invalid entry
   50.94              m_pMaintable->setText(Select.topRow() + nIter, TITRAQ_IDXREV, "0"); // Entry not revised
   50.95              m_pMaintable->setText(Select.topRow() + nIter, TITRAQ_IDXDATE, QDate::currentDate().toString(Qt::ISODate));
   50.96 @@ -210,7 +223,7 @@
   50.97              m_pMaintable->setPixmap(Select.bottomRow() + nIter, TITRAQ_IDXSTATUS, QPixmap(s_kpcStatwarn_xpm));
   50.98              m_pMaintable->setText(Select.bottomRow() + nIter, TITRAQ_IDXUSER, m_pPrefs->getString(TITRAQ_PREFUSER, TITRAQ_DEFUSER));
   50.99              pGuid->genId();
  50.100 -            m_pMaintable->setText(Select.bottomRow() + nIter, TITRAQ_IDXGUID, pGuid->getString());
  50.101 +            m_pMaintable->setText(Select.bottomRow() + nIter, TITRAQ_IDXGUID, QString::fromStdString(pGuid->getString()));
  50.102              m_pMaintable->setText(Select.bottomRow() + nIter, TITRAQ_IDXCRC, "0");
  50.103              m_pMaintable->setText(Select.bottomRow() + nIter, TITRAQ_IDXREV, "0");
  50.104              m_pMaintable->setText(Select.bottomRow() + nIter, TITRAQ_IDXDATE, QDate::currentDate().toString(Qt::ISODate));
  50.105 @@ -269,9 +282,9 @@
  50.106  //
  50.107  void Titraqform::delEntry(int nRows)
  50.108  {
  50.109 -    QTableSelection Select = m_pMaintable->selection(0);    // Highlighted text
  50.110 +    Q3TableSelection Select = m_pMaintable->selection(0);    // Highlighted text
  50.111      int nTotal = Select.bottomRow() - Select.topRow() + 1;  // Total row select
  50.112 -    QMemArray<int> Rowselect(nTotal);                       // Row array
  50.113 +    Q3MemArray<int> Rowselect(nTotal);                       // Row array
  50.114  
  50.115      // Calculate rows to delete from selection highlight
  50.116      for (int nIter = 0; nIter < nTotal; ++nIter)
  50.117 @@ -424,7 +437,7 @@
  50.118              Openas = QDir::homeDirPath() + Openas.remove(0, QString(TITRAQ_HOMEDIRTOK).length() - 1);
  50.119  
  50.120          // This dialog asks which file the user wants to open
  50.121 -        QString Filestring = QFileDialog::getOpenFileName(Openas,
  50.122 +        QString Filestring = Q3FileDialog::getOpenFileName(Openas,
  50.123              trUtf8("Accounting Data (*.as);;Text files (*.txt);;All Files (*)"),
  50.124              this, trUtf8("ChooserDialog"), trUtf8("Choose a file to open"), NULL, false);
  50.125  
  50.126 @@ -504,7 +517,7 @@
  50.127          Openas = QDir::homeDirPath() + Openas.remove(0, QString(TITRAQ_HOMEDIRTOK).length() - 1);
  50.128  
  50.129      // And then get the name of the selected file to save to
  50.130 -    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);
  50.131 +    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);
  50.132      if (!Filestring.isEmpty()) {
  50.133          if (QFile::exists(Filestring)) {
  50.134              nResult = QMessageBox::warning(this, QString(TITRAQ_APPTITLE)
  50.135 @@ -551,7 +564,7 @@
  50.136  
  50.137      nResult = 1;            // We loop on this dialog only if an indecisive user
  50.138      while (nResult > 0) {   // is hesitant to overwrite a file over and over again
  50.139 -        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);
  50.140 +        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);
  50.141          if (!Filestring.isEmpty()) {
  50.142              if (QFile::exists(Filestring)) {
  50.143                  nResult = QMessageBox::warning(this, QString(TITRAQ_APPTITLE)
  50.144 @@ -1361,7 +1374,7 @@
  50.145      }
  50.146  
  50.147      // Make sure switch take place right away and sizes are handled
  50.148 -    m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXSTATCOL));
  50.149 +    //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXSTATCOL));
  50.150      this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
  50.151  }
  50.152  
  50.153 @@ -1383,7 +1396,7 @@
  50.154      }
  50.155  
  50.156      // Make sure switch take place right away and sizes are handled
  50.157 -    m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXLCOL));
  50.158 +    //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXLCOL));
  50.159      this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
  50.160  }
  50.161  
  50.162 @@ -1406,7 +1419,7 @@
  50.163  
  50.164      // Make sure switch take place right away and sizes are handled
  50.165      this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
  50.166 -    m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXUCOL));
  50.167 +    //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXUCOL));
  50.168  }
  50.169  
  50.170  //
  50.171 @@ -1427,7 +1440,7 @@
  50.172      }
  50.173  
  50.174      // Make sure switch take place right away and sizes are handled
  50.175 -    m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXGCOL));
  50.176 +    //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXGCOL));
  50.177      this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
  50.178  }
  50.179  
  50.180 @@ -1449,7 +1462,7 @@
  50.181      }
  50.182  
  50.183      // Make sure switch take place right away and sizes are handled
  50.184 -    m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXCCOL));
  50.185 +    //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXCCOL));
  50.186      this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
  50.187  }
  50.188  
  50.189 @@ -1471,7 +1484,7 @@
  50.190      }
  50.191  
  50.192      // Make sure switch take place right away and sizes are handled
  50.193 -    m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXREVCOL));
  50.194 +    //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXREVCOL));
  50.195      this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
  50.196  }
  50.197  
  50.198 @@ -1493,7 +1506,7 @@
  50.199      }
  50.200  
  50.201      // Make sure switch take place right away and sizes are handled
  50.202 -    m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXDCOL));
  50.203 +    //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXDCOL));
  50.204      this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
  50.205  }
  50.206  
  50.207 @@ -1515,7 +1528,7 @@
  50.208      }
  50.209  
  50.210      // Make sure switch take place right away and sizes are handled
  50.211 -    m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXSTARTCOL));
  50.212 +    //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXSTARTCOL));
  50.213      this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
  50.214  }
  50.215  
  50.216 @@ -1537,7 +1550,7 @@
  50.217      }
  50.218  
  50.219      // Make sure switch take place right away and sizes are handled
  50.220 -    m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXFCOL));
  50.221 +    //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXFCOL));
  50.222      this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
  50.223  }
  50.224  
  50.225 @@ -1559,7 +1572,7 @@
  50.226      }
  50.227  
  50.228      // Make sure switch take place right away and sizes are handled
  50.229 -    m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXACOL));
  50.230 +    //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXACOL));
  50.231      this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
  50.232  }
  50.233  
  50.234 @@ -1581,7 +1594,7 @@
  50.235      }
  50.236  
  50.237      // Make sure switch take place right away and sizes are handled
  50.238 -    m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXTCOL));
  50.239 +    //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXTCOL));
  50.240      this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
  50.241  }
  50.242  
  50.243 @@ -1603,7 +1616,7 @@
  50.244      }
  50.245  
  50.246      // Make sure switch take place right away and sizes are handled
  50.247 -    m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXREMCOL));
  50.248 +    //m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXREMCOL));
  50.249      this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
  50.250  }
  50.251  
  50.252 @@ -1726,7 +1739,7 @@
  50.253  
  50.254          // Fill account log object(s) to marshall and transmit
  50.255          int nRow = m_pMaintable->currentRow();
  50.256 -        QTableSelection Select = m_pMaintable->selection(0);    // Capture selected rows
  50.257 +        Q3TableSelection Select = m_pMaintable->selection(0);    // Capture selected rows
  50.258          int nTotal = Select.bottomRow() - Select.topRow() + 1;  // Total rows selected
  50.259  
  50.260          // Remember, CORBA::stri_dup creates smart pointers
  50.261 @@ -1785,7 +1798,7 @@
  50.262          SOAPProxy Proxy(Endpoint.ascii());
  50.263  
  50.264          // Fill account log object(s) to marshall and transmit
  50.265 -        QTableSelection Select = m_pMaintable->selection(0);    // Capture selected rows
  50.266 +        Q3TableSelection Select = m_pMaintable->selection(0);    // Capture selected rows
  50.267          int nTotal = Select.bottomRow() - Select.topRow() + 1;  // Total rows selected
  50.268  
  50.269          // Iterate through the selection of row entries to transmit
  50.270 @@ -1879,8 +1892,8 @@
  50.271  
  50.272      // Remember main window layout and doc positions
  50.273      QString Laystring;
  50.274 -    QTextStream Laystream(&Laystring, IO_WriteOnly);
  50.275 -    Laystream << *this; // Persist the main window
  50.276 +    Q3TextStream Laystream(&Laystring, QIODevice::WriteOnly);
  50.277 +    //Laystream << *this; // Persist the main window
  50.278      m_pPrefs->setString(TITRAQ_PREFFRAMELAY, Laystring);
  50.279  }
  50.280  
  50.281 @@ -1993,22 +2006,22 @@
  50.282          m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLECDE);
  50.283          qApp->setStyle(new QCDEStyle);
  50.284      }
  50.285 -    else if (pPrefpanel->getStyle() == TITRAQ_STRSGI) {
  50.286 -        m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLESGI);
  50.287 -        qApp->setStyle(new QSGIStyle);
  50.288 -    }
  50.289 +    //else if (pPrefpanel->getStyle() == TITRAQ_STRSGI) {    // Not supported
  50.290 +    //    m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLESGI);
  50.291 +    //    qApp->setStyle(new QSGIStyle);
  50.292 +    //}
  50.293      else if (pPrefpanel->getStyle() == TITRAQ_STRMOTIF) {
  50.294          m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLEMOTIF);
  50.295          qApp->setStyle(new QMotifStyle);
  50.296      }
  50.297 -    else if (pPrefpanel->getStyle() == TITRAQ_STRMPLUS) {
  50.298 -        m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLEMPLUS);
  50.299 -        qApp->setStyle(new QMotifPlusStyle);
  50.300 -    }
  50.301 -    else if (pPrefpanel->getStyle() == TITRAQ_STRPLAT) {
  50.302 -        m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLEPLAT);
  50.303 -        qApp->setStyle(new QPlatinumStyle);
  50.304 -    }
  50.305 +    //else if (pPrefpanel->getStyle() == TITRAQ_STRMPLUS) {  // Not supported
  50.306 +    //    m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLEMPLUS);
  50.307 +    //    qApp->setStyle(new QMotifPlusStyle);
  50.308 +    //}
  50.309 +    //else if (pPrefpanel->getStyle() == TITRAQ_STRPLAT) {  // Not supported
  50.310 +    //    m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLEPLAT);
  50.311 +    //    qApp->setStyle(new QPlatinumStyle);
  50.312 +    //}
  50.313      else if (pPrefpanel->getStyle() == TITRAQ_STRMSOFT) {
  50.314          m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLEMSOFT);
  50.315          qApp->setStyle(new QWindowsStyle);

    51.1 --- a/as_stub.idl	Fri Nov 28 14:20:00 2008 +0100
    51.2 +++ b/as_stub.idl	Fri Dec 05 23:14:02 2008 +0100
    51.3 @@ -1,12 +1,12 @@
    51.4  //
    51.5  //  OSSP asgui - Accounting system graphical user interface
    51.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    51.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    51.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    51.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   51.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   51.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   51.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   51.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   51.14  //
   51.15  //  This file is part of OSSP asgui, an accounting system graphical user
   51.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   51.17 +//  interface which can be found at http://asgui.europalab.com/.
   51.18  //
   51.19  //  Permission to use, copy, modify, and distribute this software for
   51.20  //  any purpose with or without fee is hereby granted, provided that

    52.1 --- a/as_table.cpp	Fri Nov 28 14:20:00 2008 +0100
    52.2 +++ b/as_table.cpp	Fri Dec 05 23:14:02 2008 +0100
    52.3 @@ -1,12 +1,12 @@
    52.4  //
    52.5  //  OSSP asgui - Accounting system graphical user interface
    52.6 -//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
    52.7 -//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
    52.8 -//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
    52.9 -//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
   52.10 +//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
   52.11 +//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
   52.12 +//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
   52.13 +//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
   52.14  //
   52.15  //  This file is part of OSSP asgui, an accounting system graphical user
   52.16 -//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
   52.17 +//  interface which can be found at http://asgui.europalab.com/.
   52.18  //
   52.19  //  Permission to use, copy, modify, and distribute this software for
   52.20  //  any purpose with or without fee is hereby granted, provided that
   52.21 @@ -29,7 +29,14 @@
   52.22  //  as_table.cpp: ISO C++ implementation
   52.23  //
   52.24  
   52.25 -#include <qheader.h>
   52.26 +#define QT3_SUPPORT
   52.27 +
   52.28 +#include <q3header.h>
   52.29 +
   52.30 +//Added by qt3to4:
   52.31 +#include <QEvent>
   52.32 +#include <QMouseEvent>
   52.33 +#include <QKeyEvent>
   52.34  
   52.35  #include "as_const.h"
   52.36  #include "as_table.h"
   52.37 @@ -41,8 +48,8 @@
   52.38      if (pObject == horizontalHeader() && pEvent->type() == QEvent::MouseButtonDblClick)
   52.39          return true;
   52.40      if (pEvent->type() == QEvent::MouseButtonPress &&   // Ignore mid, right clicks
   52.41 -        ((QMouseEvent *)pEvent)->button() == QMouseEvent::RightButton ||
   52.42 -        ((QMouseEvent *)pEvent)->button() == QMouseEvent::MidButton)
   52.43 +        ((QMouseEvent *)pEvent)->button() == Qt::RightButton ||
   52.44 +        ((QMouseEvent *)pEvent)->button() == Qt::MidButton)
   52.45          return true;
   52.46      else if (pEvent->type() == QEvent::KeyPress) {
   52.47          if (((QKeyEvent *)pEvent)->key() == Qt::Key_Tab) { // Handle tab key
   52.48 @@ -119,10 +126,10 @@
   52.49              return true;                                            // Capture
   52.50  
   52.51          // Forward incompletely handled key events
   52.52 -        return QTable::eventFilter(pObject, pEvent);
   52.53 +        return Q3Table::eventFilter(pObject, pEvent);
   52.54      }
   52.55      else // Default behaviour is to pass the event onwards
   52.56 -        return QTable::eventFilter(pObject, pEvent);
   52.57 +        return Q3Table::eventFilter(pObject, pEvent);
   52.58  }
   52.59  
   52.60  // Overridden member hack to allow externally connected control
   52.61 @@ -135,7 +142,7 @@
   52.62          if (nText != this->text(nRow, nCol) && nCol != TITRAQ_IDXLINE)
   52.63              emit textEdited(nRow, nCol);
   52.64  
   52.65 -        QTable::setText(nRow, nCol, nText);
   52.66 +        Q3Table::setText(nRow, nCol, nText);
   52.67      }
   52.68  }
   52.69  
   52.70 @@ -150,7 +157,7 @@
   52.71          this->setSortdir(bAscend);
   52.72  
   52.73      this->setSortcol(nCol);
   52.74 -    QTable::sortColumn(nCol, this->getSortdir(), true);
   52.75 +    Q3Table::sortColumn(nCol, this->getSortdir(), true);
   52.76  
   52.77  //    // Announce sorting policy with multiple selections
   52.78  //    QTableSelection Testsel = this->selection(this->currentSelection());
   52.79 @@ -217,7 +224,7 @@
   52.80          }
   52.81      }
   52.82  
   52.83 -    QTable::paintCell(pPainter, nRow, nCol, Recto, bSelect, Cgroup);
   52.84 +    Q3Table::paintCell(pPainter, nRow, nCol, Recto, bSelect, Cgroup);
   52.85  };
   52.86  
   52.87  // Blah
   52.88 @@ -242,7 +249,7 @@
   52.89  // Overriden member to properly handle read only attribute after edition
   52.90  void TiTable::endEdit(int nRow, int nCol, bool bAccept, bool bReplace)
   52.91  {
   52.92 -    QTable::endEdit(nRow, nCol, bAccept, bReplace);
   52.93 +    Q3Table::endEdit(nRow, nCol, bAccept, bReplace);
   52.94  
   52.95      // Table read only attribute must be set to return to the normal
   52.96      // row highlight and selection behaviour of AS. The reason it was