diff -r e8292658d5b3 -r c1941114ca88 as_gui.cpp --- a/as_gui.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_gui.cpp Fri Dec 05 23:14:02 2008 +0100 @@ -1,12 +1,12 @@ // // OSSP asgui - Accounting system graphical user interface -// Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/) -// Copyright (c) 2002-2004 Ralf S. Engelschall -// Copyright (c) 2002-2004 Michael Schloh von Bennewitz -// Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH +// Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/) +// Copyright (c) 2002-2008 Ralf S. Engelschall +// Copyright (c) 2002-2008 Michael Schloh von Bennewitz +// Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH // // This file is part of OSSP asgui, an accounting system graphical user -// interface which can be found at http://www.ossp.org/pkg/tool/asgui/. +// interface which can be found at http://asgui.europalab.com/. // // Permission to use, copy, modify, and distribute this software for // any purpose with or without fee is hereby granted, provided that @@ -36,13 +36,16 @@ #include "as_const.h" // Application constants #include "as_pref.h" // Class Preferences +//Added by qt3to4: +#include + // // Construct a Titraqform which is a child of 'pParent', with the // name 'kszName' and widget flags set to 'Flags' // -Titraqform::Titraqform(QWidget *pParent, const char *kszName, WFlags Flags) : - QMainWindow(pParent, kszName, Flags) +Titraqform::Titraqform(QWidget *pParent, const char *kszName, Qt::WFlags Flags) : + Q3MainWindow(pParent, kszName, Flags) { // Early initializations m_pFiletools = NULL; @@ -81,8 +84,8 @@ // Rehydrate main window layout and doc positions QString Laystring = m_pPrefs->getString(TITRAQ_PREFFRAMELAY, NULL); // FIXME: Handle first case better - QTextStream Laystream(&Laystring, IO_ReadOnly); - Laystream >> *this; +// Q3TextStream Laystream(&Laystring, QIODevice::ReadOnly); +// Laystream >> *this; // // Lock down window size // setSizePolicy(QSizePolicy((QSizePolicy::SizeType)0,