1.1 --- a/as_numdial.cpp Fri Nov 28 14:20:00 2008 +0100 1.2 +++ b/as_numdial.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 @@ -32,13 +32,17 @@ 1.22 #include "as_numdial.h" 1.23 1.24 #include <qvariant.h> 1.25 -#include <qframe.h> 1.26 +#include <q3frame.h> 1.27 #include <qlabel.h> 1.28 #include <qpushbutton.h> 1.29 #include <qspinbox.h> 1.30 #include <qlayout.h> 1.31 #include <qtooltip.h> 1.32 -#include <qwhatsthis.h> 1.33 +#include <q3whatsthis.h> 1.34 + 1.35 +//Added by qt3to4: 1.36 +#include <Q3HBoxLayout> 1.37 +#include <Q3VBoxLayout> 1.38 1.39 #include "as_const.h" 1.40 1.41 @@ -52,7 +56,7 @@ 1.42 // The dialog will by default be modal, unless you set 'bModal' to 1.43 // false to construct a modeless dialog. 1.44 // 1.45 -Numdial::Numdial(QWidget *pParent, const char *kszName, bool bModal, WFlags Flags) 1.46 +Numdial::Numdial(QWidget *pParent, const char *kszName, bool bModal, Qt::WFlags Flags) 1.47 : QDialog(pParent, kszName, bModal, Flags) 1.48 { 1.49 // Boilerplate code to initialize the panel 1.50 @@ -64,12 +68,12 @@ 1.51 this->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)0, 1.52 (QSizePolicy::SizeType)0, 0, 0, this->sizePolicy().hasHeightForWidth())); 1.53 1.54 - m_pFrame = new QFrame(this, "Mainframe"); 1.55 - m_pFrame->setFrameShape(QFrame::StyledPanel); 1.56 - m_pFrame->setFrameShadow(QFrame::Raised); 1.57 - m_pFramelay = new QVBoxLayout(m_pFrame, 11, 6, "Framelay"); 1.58 - m_pInputlay = new QHBoxLayout(0, 0, 6, "Horizontallayout"); 1.59 - m_pFormlayout = new QVBoxLayout(this, 11, 6, "Formlayout"); 1.60 + m_pFrame = new Q3Frame(this, "Mainframe"); 1.61 + m_pFrame->setFrameShape(Q3Frame::StyledPanel); 1.62 + m_pFrame->setFrameShadow(Q3Frame::Raised); 1.63 + m_pFramelay = new Q3VBoxLayout(m_pFrame, 11, 6, "Framelay"); 1.64 + m_pInputlay = new Q3HBoxLayout(0, 0, 6, "Horizontallayout"); 1.65 + m_pFormlayout = new Q3VBoxLayout(this, 11, 6, "Formlayout"); 1.66 1.67 m_pReportlabel = new QLabel(m_pFrame, "Reportlabel"); 1.68 m_pReportlabel->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)4, (QSizePolicy::SizeType)5, 0, 0, m_pReportlabel->sizePolicy().hasHeightForWidth())); 1.69 @@ -88,7 +92,7 @@ 1.70 m_pFramelay->addLayout(m_pInputlay); 1.71 1.72 // Push button suite 1.73 - m_pButtlay = new QHBoxLayout(0, 0, 6, "Buttlay"); 1.74 + m_pButtlay = new Q3HBoxLayout(0, 0, 6, "Buttlay"); 1.75 m_pOkaybutt = new QPushButton(m_pFrame, "Okaybutton"); 1.76 m_pOkaybutt->setPaletteBackgroundColor(QColor(198, 196, 186)); 1.77 m_pOkaybutt->setCursor(QCursor(13)); 1.78 @@ -122,13 +126,13 @@ 1.79 // Top level push buttons associated with accept slot 1.80 m_pCancelbutt->setText(trUtf8("Cancel", "Comment for Cancelbutton")); 1.81 QToolTip::add(m_pCancelbutt, trUtf8("Closes the report panel", "Comment for tooltip Cancelbutton")); 1.82 - QWhatsThis::add(m_pCancelbutt, trUtf8("The cancel button closes the report panel without further action", "Comment for whatsThis Cancelbutton")); 1.83 + Q3WhatsThis::add(m_pCancelbutt, trUtf8("The cancel button closes the report panel without further action", "Comment for whatsThis Cancelbutton")); 1.84 m_pOkaybutt->setText(trUtf8("Okay", "Comment for Okaybutton")); 1.85 QToolTip::add(m_pOkaybutt, trUtf8("Aknowleges your input", "Comment for tooltip Okaybutton")); 1.86 - QWhatsThis::add(m_pOkaybutt, trUtf8("The okay button aknowleges your input and prepares for action", "Comment for whatsThis Okaybutton")); 1.87 + Q3WhatsThis::add(m_pOkaybutt, trUtf8("The okay button aknowleges your input and prepares for action", "Comment for whatsThis Okaybutton")); 1.88 1.89 // Text help for spinbox number input 1.90 QToolTip::add(m_pSpinbox, trUtf8("Input a number", "Comment for tooltip Spinbox")); 1.91 - QWhatsThis::add(m_pSpinbox, trUtf8("Click on the arrows or type to input a number", "Comment for whatsThis Spinbox")); 1.92 + Q3WhatsThis::add(m_pSpinbox, trUtf8("Click on the arrows or type to input a number", "Comment for whatsThis Spinbox")); 1.93 } 1.94 } // namespace AS