diff -r e8292658d5b3 -r c1941114ca88 as_numdial.cpp --- a/as_numdial.cpp Fri Nov 28 14:20:00 2008 +0100 +++ b/as_numdial.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 @@ -32,13 +32,17 @@ #include "as_numdial.h" #include -#include +#include #include #include #include #include #include -#include +#include + +//Added by qt3to4: +#include +#include #include "as_const.h" @@ -52,7 +56,7 @@ // The dialog will by default be modal, unless you set 'bModal' to // false to construct a modeless dialog. // -Numdial::Numdial(QWidget *pParent, const char *kszName, bool bModal, WFlags Flags) +Numdial::Numdial(QWidget *pParent, const char *kszName, bool bModal, Qt::WFlags Flags) : QDialog(pParent, kszName, bModal, Flags) { // Boilerplate code to initialize the panel @@ -64,12 +68,12 @@ this->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, this->sizePolicy().hasHeightForWidth())); - m_pFrame = new QFrame(this, "Mainframe"); - m_pFrame->setFrameShape(QFrame::StyledPanel); - m_pFrame->setFrameShadow(QFrame::Raised); - m_pFramelay = new QVBoxLayout(m_pFrame, 11, 6, "Framelay"); - m_pInputlay = new QHBoxLayout(0, 0, 6, "Horizontallayout"); - m_pFormlayout = new QVBoxLayout(this, 11, 6, "Formlayout"); + m_pFrame = new Q3Frame(this, "Mainframe"); + m_pFrame->setFrameShape(Q3Frame::StyledPanel); + m_pFrame->setFrameShadow(Q3Frame::Raised); + m_pFramelay = new Q3VBoxLayout(m_pFrame, 11, 6, "Framelay"); + m_pInputlay = new Q3HBoxLayout(0, 0, 6, "Horizontallayout"); + m_pFormlayout = new Q3VBoxLayout(this, 11, 6, "Formlayout"); m_pReportlabel = new QLabel(m_pFrame, "Reportlabel"); m_pReportlabel->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)4, (QSizePolicy::SizeType)5, 0, 0, m_pReportlabel->sizePolicy().hasHeightForWidth())); @@ -88,7 +92,7 @@ m_pFramelay->addLayout(m_pInputlay); // Push button suite - m_pButtlay = new QHBoxLayout(0, 0, 6, "Buttlay"); + m_pButtlay = new Q3HBoxLayout(0, 0, 6, "Buttlay"); m_pOkaybutt = new QPushButton(m_pFrame, "Okaybutton"); m_pOkaybutt->setPaletteBackgroundColor(QColor(198, 196, 186)); m_pOkaybutt->setCursor(QCursor(13)); @@ -122,13 +126,13 @@ // Top level push buttons associated with accept slot m_pCancelbutt->setText(trUtf8("Cancel", "Comment for Cancelbutton")); QToolTip::add(m_pCancelbutt, trUtf8("Closes the report panel", "Comment for tooltip Cancelbutton")); - QWhatsThis::add(m_pCancelbutt, trUtf8("The cancel button closes the report panel without further action", "Comment for whatsThis Cancelbutton")); + Q3WhatsThis::add(m_pCancelbutt, trUtf8("The cancel button closes the report panel without further action", "Comment for whatsThis Cancelbutton")); m_pOkaybutt->setText(trUtf8("Okay", "Comment for Okaybutton")); QToolTip::add(m_pOkaybutt, trUtf8("Aknowleges your input", "Comment for tooltip Okaybutton")); - QWhatsThis::add(m_pOkaybutt, trUtf8("The okay button aknowleges your input and prepares for action", "Comment for whatsThis Okaybutton")); + Q3WhatsThis::add(m_pOkaybutt, trUtf8("The okay button aknowleges your input and prepares for action", "Comment for whatsThis Okaybutton")); // Text help for spinbox number input QToolTip::add(m_pSpinbox, trUtf8("Input a number", "Comment for tooltip Spinbox")); - QWhatsThis::add(m_pSpinbox, trUtf8("Click on the arrows or type to input a number", "Comment for whatsThis Spinbox")); + Q3WhatsThis::add(m_pSpinbox, trUtf8("Click on the arrows or type to input a number", "Comment for whatsThis Spinbox")); } } // namespace AS