1.1 --- a/as_gui.cpp Fri Nov 28 14:20:00 2008 +0100 1.2 +++ b/as_gui.cpp Fri Dec 05 23:14:02 2008 +0100 1.3 @@ -1,12 +1,12 @@ 1.4 // 1.5 // OSSP asgui - Accounting system graphical user interface 1.6 -// Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/) 1.7 -// Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com> 1.8 -// Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com> 1.9 -// Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH 1.10 +// Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/) 1.11 +// Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com> 1.12 +// Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com> 1.13 +// Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH 1.14 // 1.15 // This file is part of OSSP asgui, an accounting system graphical user 1.16 -// interface which can be found at http://www.ossp.org/pkg/tool/asgui/. 1.17 +// interface which can be found at http://asgui.europalab.com/. 1.18 // 1.19 // Permission to use, copy, modify, and distribute this software for 1.20 // any purpose with or without fee is hereby granted, provided that 1.21 @@ -36,13 +36,16 @@ 1.22 #include "as_const.h" // Application constants 1.23 #include "as_pref.h" // Class Preferences 1.24 1.25 +//Added by qt3to4: 1.26 +#include <Q3TextStream> 1.27 + 1.28 1.29 // 1.30 // Construct a Titraqform which is a child of 'pParent', with the 1.31 // name 'kszName' and widget flags set to 'Flags' 1.32 // 1.33 -Titraqform::Titraqform(QWidget *pParent, const char *kszName, WFlags Flags) : 1.34 - QMainWindow(pParent, kszName, Flags) 1.35 +Titraqform::Titraqform(QWidget *pParent, const char *kszName, Qt::WFlags Flags) : 1.36 + Q3MainWindow(pParent, kszName, Flags) 1.37 { 1.38 // Early initializations 1.39 m_pFiletools = NULL; 1.40 @@ -81,8 +84,8 @@ 1.41 1.42 // Rehydrate main window layout and doc positions 1.43 QString Laystring = m_pPrefs->getString(TITRAQ_PREFFRAMELAY, NULL); // FIXME: Handle first case better 1.44 - QTextStream Laystream(&Laystring, IO_ReadOnly); 1.45 - Laystream >> *this; 1.46 +// Q3TextStream Laystream(&Laystring, QIODevice::ReadOnly); 1.47 +// Laystream >> *this; 1.48 1.49 // // Lock down window size 1.50 // setSizePolicy(QSizePolicy((QSizePolicy::SizeType)0,