1.1 --- a/as_helpanel.cpp Fri Nov 28 14:20:00 2008 +0100 1.2 +++ b/as_helpanel.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 @@ -29,12 +29,18 @@ 1.22 // as_helpanel.cpp: ISO C++ implementation 1.23 // 1.24 1.25 +#define QT3_SUPPORT 1.26 + 1.27 #include <qvariant.h> 1.28 #include <qpushbutton.h> 1.29 -#include <qtextbrowser.h> 1.30 +#include <q3textbrowser.h> 1.31 #include <qlayout.h> 1.32 #include <qtooltip.h> 1.33 -#include <qwhatsthis.h> 1.34 +#include <q3whatsthis.h> 1.35 + 1.36 +//Added by qt3to4: 1.37 +#include <Q3HBoxLayout> 1.38 +#include <Q3VBoxLayout> 1.39 1.40 #include "as_helpanel.h" 1.41 1.42 @@ -48,7 +54,7 @@ 1.43 // The dialog will by default be modal, unless you set 'bModal' to 1.44 // false to construct a modeless dialog. 1.45 // 1.46 -Helpanel::Helpanel(const QString &kSource, QWidget *pParent, const char *kszName, bool bModal, WFlags Flags) 1.47 +Helpanel::Helpanel(const QString &kSource, QWidget *pParent, const char *kszName, bool bModal, Qt::WFlags Flags) 1.48 : QDialog(pParent, kszName, bModal, Flags) 1.49 { 1.50 // Boilerplate code to initialize the panel 1.51 @@ -61,16 +67,16 @@ 1.52 (QSizePolicy::SizeType)5, 0, 0, this->sizePolicy().hasHeightForWidth())); 1.53 1.54 // Build panel using already constructed widgets and layouts 1.55 - m_pFormlay = new QVBoxLayout(this, 11, 6, "Formlayout"); 1.56 + m_pFormlay = new Q3VBoxLayout(this, 11, 6, "Formlayout"); 1.57 1.58 // Groupbox and its text display 1.59 - m_pBrowser = new QTextBrowser(this, "Helpbrowser"); 1.60 + m_pBrowser = new Q3TextBrowser(this, "Helpbrowser"); 1.61 m_pBrowser->setSource(QString(TITRAQ_DOCDIR) + QChar('/') + kSource); 1.62 m_pBrowser->setReadOnly(true); 1.63 m_pBrowser->setFocus(); 1.64 1.65 // Add a spacer to sideline the otherwise massive dismiss button 1.66 - m_pButtlay = new QHBoxLayout(0, 0, 6, "Buttonlayout"); 1.67 + m_pButtlay = new Q3HBoxLayout(0, 0, 6, "Buttonlayout"); 1.68 QSpacerItem *pSpacey = new QSpacerItem(40, 20, QSizePolicy::Minimum, QSizePolicy::Minimum); 1.69 m_pButtlay->addItem(pSpacey); 1.70 1.71 @@ -101,9 +107,9 @@ 1.72 // Top level push buttons associated with accept and save slots 1.73 m_pDismissbutt->setText(trUtf8("Dismiss", "Comment for Dismissbutton")); 1.74 QToolTip::add(m_pDismissbutt, trUtf8("Closes the help panel", "Comment for tooltip Dismissbutton")); 1.75 - QWhatsThis::add(m_pDismissbutt, trUtf8("The dismiss button dismisses the help panel", "Comment for whatsThis Dismissbutton")); 1.76 + Q3WhatsThis::add(m_pDismissbutt, trUtf8("The dismiss button dismisses the help panel", "Comment for whatsThis Dismissbutton")); 1.77 1.78 // The main text browser window which presents the HTML help contents 1.79 - QWhatsThis::add(m_pBrowser, trUtf8("The text browser window displays the help contents", "Comment for whatsThis Browser")); 1.80 + Q3WhatsThis::add(m_pBrowser, trUtf8("The text browser window displays the help contents", "Comment for whatsThis Browser")); 1.81 } 1.82 } // namespace AS