diff -r e8292658d5b3 -r c1941114ca88 as_helpanel.cpp --- a/as_helpanel.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_helpanel.cpp Fri Dec 05 23:14:02 2008 +0100 @@ -1,12 +1,12 @@ // // OSSP asgui - Accounting system graphical user interface -// Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/) -// Copyright (c) 2002-2004 Ralf S. Engelschall -// Copyright (c) 2002-2004 Michael Schloh von Bennewitz -// Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH +// Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/) +// Copyright (c) 2002-2008 Ralf S. Engelschall +// Copyright (c) 2002-2008 Michael Schloh von Bennewitz +// Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH // // This file is part of OSSP asgui, an accounting system graphical user -// interface which can be found at http://www.ossp.org/pkg/tool/asgui/. +// interface which can be found at http://asgui.europalab.com/. // // Permission to use, copy, modify, and distribute this software for // any purpose with or without fee is hereby granted, provided that @@ -29,12 +29,18 @@ // as_helpanel.cpp: ISO C++ implementation // +#define QT3_SUPPORT + #include #include -#include +#include #include #include -#include +#include + +//Added by qt3to4: +#include +#include #include "as_helpanel.h" @@ -48,7 +54,7 @@ // The dialog will by default be modal, unless you set 'bModal' to // false to construct a modeless dialog. // -Helpanel::Helpanel(const QString &kSource, QWidget *pParent, const char *kszName, bool bModal, WFlags Flags) +Helpanel::Helpanel(const QString &kSource, QWidget *pParent, const char *kszName, bool bModal, Qt::WFlags Flags) : QDialog(pParent, kszName, bModal, Flags) { // Boilerplate code to initialize the panel @@ -61,16 +67,16 @@ (QSizePolicy::SizeType)5, 0, 0, this->sizePolicy().hasHeightForWidth())); // Build panel using already constructed widgets and layouts - m_pFormlay = new QVBoxLayout(this, 11, 6, "Formlayout"); + m_pFormlay = new Q3VBoxLayout(this, 11, 6, "Formlayout"); // Groupbox and its text display - m_pBrowser = new QTextBrowser(this, "Helpbrowser"); + m_pBrowser = new Q3TextBrowser(this, "Helpbrowser"); m_pBrowser->setSource(QString(TITRAQ_DOCDIR) + QChar('/') + kSource); m_pBrowser->setReadOnly(true); m_pBrowser->setFocus(); // Add a spacer to sideline the otherwise massive dismiss button - m_pButtlay = new QHBoxLayout(0, 0, 6, "Buttonlayout"); + m_pButtlay = new Q3HBoxLayout(0, 0, 6, "Buttonlayout"); QSpacerItem *pSpacey = new QSpacerItem(40, 20, QSizePolicy::Minimum, QSizePolicy::Minimum); m_pButtlay->addItem(pSpacey); @@ -101,9 +107,9 @@ // Top level push buttons associated with accept and save slots m_pDismissbutt->setText(trUtf8("Dismiss", "Comment for Dismissbutton")); QToolTip::add(m_pDismissbutt, trUtf8("Closes the help panel", "Comment for tooltip Dismissbutton")); - QWhatsThis::add(m_pDismissbutt, trUtf8("The dismiss button dismisses the help panel", "Comment for whatsThis Dismissbutton")); + Q3WhatsThis::add(m_pDismissbutt, trUtf8("The dismiss button dismisses the help panel", "Comment for whatsThis Dismissbutton")); // The main text browser window which presents the HTML help contents - QWhatsThis::add(m_pBrowser, trUtf8("The text browser window displays the help contents", "Comment for whatsThis Browser")); + Q3WhatsThis::add(m_pBrowser, trUtf8("The text browser window displays the help contents", "Comment for whatsThis Browser")); } } // namespace AS