summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--blinken/src/blinken.cpp2
-rw-r--r--kalzium/src/periodictableview.cpp2
-rw-r--r--kalzium/src/spectrumwidget.cpp6
-rw-r--r--kanagram/src/kanagram.cpp4
-rw-r--r--kbruch/src/kbruch.kcfg6
-rw-r--r--kbruch/src/mainqtwidget.cpp2
-rw-r--r--keduca/keduca/keducaprefs.cpp4
-rw-r--r--keduca/keduca/keducaview.cpp2
-rw-r--r--keduca/keducabuilder/kcontrolheader.cpp6
-rw-r--r--keduca/keducabuilder/keducabuilder.cpp2
-rw-r--r--kgeography/src/mapasker.cpp4
-rw-r--r--kgeography/src/mapwidget.cpp2
-rw-r--r--khangman/khangman/khangman.cpp2
-rw-r--r--khangman/khangman/khangmanview.cpp2
-rw-r--r--kig/filters/cabri-filter.cpp6
-rw-r--r--kig/filters/drgeo-filter.cpp4
-rw-r--r--kig/filters/latexexporter.cpp8
-rw-r--r--kig/filters/native-filter.cpp2
-rw-r--r--kig/kig/kig_view.cpp26
-rw-r--r--kig/misc/kigpainter.cpp20
-rw-r--r--kig/misc/kigpainter.h8
-rw-r--r--kig/misc/object_constructor.cpp2
-rw-r--r--kig/misc/special_constructors.cpp8
-rw-r--r--kig/modes/popup.cpp14
-rw-r--r--kig/objects/object_drawer.cpp24
-rw-r--r--kig/objects/object_drawer.h10
-rw-r--r--kiten/learn.cpp4
-rw-r--r--kiten/rad.cpp2
-rw-r--r--kmplot/kmplot/View.cpp26
-rw-r--r--kmplot/kmplot/ksliderwindow.cpp2
-rw-r--r--kstars/kstars/detaildialog.h2
-rw-r--r--kstars/kstars/indielement.cpp2
-rw-r--r--kstars/kstars/indielement.h2
-rw-r--r--kstars/kstars/indigroup.h2
-rw-r--r--kstars/kstars/indiproperty.h6
-rw-r--r--kstars/kstars/main.cpp6
-rw-r--r--kstars/kstars/skymapevents.cpp18
-rw-r--r--kstars/kstars/thumbnaileditor.cpp2
-rw-r--r--kstars/kstars/tools/lcgenerator.cpp4
-rw-r--r--kstars/kstars/tools/modcalcequinox.cpp8
-rw-r--r--kstars/kstars/tools/modcalcplanets.cpp2
-rw-r--r--kstars/kstars/tools/wutdialog.cpp2
-rw-r--r--ktouch/src/ktouchslideline.h6
-rw-r--r--ktouch/src/ktouchstatisticsdata.cpp8
-rw-r--r--kturtle/src/kturtle.cpp4
-rw-r--r--kvoctrain/kvoctrain/kvoctraintable.cpp4
-rw-r--r--kwordquiz/src/kwordquiz.kcfg12
-rw-r--r--kwordquiz/src/wqprintdialogpage.cpp2
-rw-r--r--libtdeedu/extdate/extdatetbl.cpp6
-rw-r--r--libtdeedu/extdate/extdatetime.cpp72
-rw-r--r--libtdeedu/extdate/extdatetime.h14
-rw-r--r--libtdeedu/extdate/extdatetimeedit.cpp4
52 files changed, 200 insertions, 200 deletions
diff --git a/blinken/src/blinken.cpp b/blinken/src/blinken.cpp
index 4322e9b6..1c681ce6 100644
--- a/blinken/src/blinken.cpp
+++ b/blinken/src/blinken.cpp
@@ -150,7 +150,7 @@ void blinken::paintEvent(TQPaintEvent *)
p.drawLine(169, 250, 469, 250);
// draw the two squares of the options
- p.setPen(TQPen(m_fontColor, 2, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin));
+ p.setPen(TQPen(m_fontColor, 2, TQt::SolidLine, TQt::SquareCap, TQt::MiterJoin));
m_soundRect = TQRect(181, 209, 25, 25);
m_fontRect = TQRect(432, 209, 25, 25);
diff --git a/kalzium/src/periodictableview.cpp b/kalzium/src/periodictableview.cpp
index d1e20339..94d32575 100644
--- a/kalzium/src/periodictableview.cpp
+++ b/kalzium/src/periodictableview.cpp
@@ -417,7 +417,7 @@ void PerodicTableView::paintCurrentSelection()
p.begin(table);
TQPen pen;
- pen.setStyle( Qt::DotLine );
+ pen.setStyle( TQt::DotLine );
pen.setWidth( 4 );
pen.setColor( TQt::blue );
p.setPen( pen );
diff --git a/kalzium/src/spectrumwidget.cpp b/kalzium/src/spectrumwidget.cpp
index 88355a1c..66bfce27 100644
--- a/kalzium/src/spectrumwidget.cpp
+++ b/kalzium/src/spectrumwidget.cpp
@@ -320,9 +320,9 @@ void SpectrumWidget::mouseMoveEvent( TQMouseEvent *e )
void SpectrumWidget::mousePressEvent( TQMouseEvent *e )
{
- if ( e->button() == Qt::LeftButton )
+ if ( e->button() == TQt::LeftButton )
m_LMBPointPress = e->pos();
- if ( e->button() == Qt::RightButton )
+ if ( e->button() == TQt::RightButton )
slotZoomOut();
//FIXME
//the tooltip is not really working. Better to not have it
@@ -391,7 +391,7 @@ void SpectrumWidget::drawTooltip( TQPainter *p )
void SpectrumWidget::mouseReleaseEvent( TQMouseEvent *e )
{
- if ( e->button() == Qt::LeftButton )
+ if ( e->button() == TQt::LeftButton )
{
int left = (int)Wavelength( ( double )m_LMBPointPress.x()/width() );
int right = (int)Wavelength( ( double )e->pos().x()/width() );
diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp
index 9b826f43..bf0f0c1f 100644
--- a/kanagram/src/kanagram.cpp
+++ b/kanagram/src/kanagram.cpp
@@ -432,7 +432,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e)
if(m_switcherRect.contains(e->pos()) || m_arrowRect.contains(e->pos()))
{
- if(!(e->button() == Qt::RightButton))
+ if(!(e->button() == TQt::RightButton))
m_game->nextVocab();
else
m_game->previousVocab();
@@ -723,7 +723,7 @@ void Kanagram::drawTextNew(TQPainter &p, const TQString &text, int textAlign, in
void Kanagram::checkWord()
{
TQPoint p = m_upRect.topLeft() + TQPoint( 1, 1 );
- TQMouseEvent *e = new TQMouseEvent( TQEvent::MouseButtonPress, p, Qt::LeftButton, Qt::NoButton );
+ TQMouseEvent *e = new TQMouseEvent( TQEvent::MouseButtonPress, p, TQt::LeftButton, TQt::NoButton );
mousePressEvent(e);
}
diff --git a/kbruch/src/kbruch.kcfg b/kbruch/src/kbruch.kcfg
index ae13463d..f767e2a1 100644
--- a/kbruch/src/kbruch.kcfg
+++ b/kbruch/src/kbruch.kcfg
@@ -53,17 +53,17 @@
<entry name="numberColor" type="Color">
<label>Color of the numbers in the task view</label>
<whatsthis>Color of the numbers in the task view</whatsthis>
- <default code="true">Qt::darkGreen</default>
+ <default code="true">TQt::darkGreen</default>
</entry>
<entry name="operationColor" type="Color">
<label>Color of the operation signs in the task view</label>
<whatsthis>Color of the operation signs in the task view</whatsthis>
- <default code="true">Qt::blue</default>
+ <default code="true">TQt::blue</default>
</entry>
<entry name="fractionBarColor" type="Color">
<label>Color of the fraction bars in the task view</label>
<whatsthis>Color of the fraction bars in the task view</whatsthis>
- <default code="true">Qt::red</default>
+ <default code="true">TQt::red</default>
</entry>
<entry type="Font" key="taskFont">
<label>Font used for the task view</label>
diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp
index d44cae80..1e4bb9d6 100644
--- a/kbruch/src/mainqtwidget.cpp
+++ b/kbruch/src/mainqtwidget.cpp
@@ -62,7 +62,7 @@ MainQtWidget::MainQtWidget()
// we split the main view into 2 parts, one for the tasks, one for the
// statistics
- TQSplitter* splitter = new TQSplitter(Qt::Horizontal, this,"TQSplitter");
+ TQSplitter* splitter = new TQSplitter(TQt::Horizontal, this,"TQSplitter");
setCentralWidget(splitter);
// the iconlist, where the user can choose the different exercises
diff --git a/keduca/keduca/keducaprefs.cpp b/keduca/keduca/keducaprefs.cpp
index c8f3ce0d..425ccf80 100644
--- a/keduca/keduca/keducaprefs.cpp
+++ b/keduca/keduca/keducaprefs.cpp
@@ -44,7 +44,7 @@ void KEducaPrefs::setPageGeneral()
TQButtonGroup *buttonGroup1 = new TQButtonGroup( mainFrame, "ButtonGroup1" );
buttonGroup1->setTitle( i18n( "General" ) );
- buttonGroup1->setColumnLayout(0, Qt::Vertical );
+ buttonGroup1->setColumnLayout(0, TQt::Vertical );
buttonGroup1->layout()->setSpacing( 0 );
buttonGroup1->layout()->setMargin( 0 );
TQVBoxLayout *buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->layout() );
@@ -62,7 +62,7 @@ void KEducaPrefs::setPageGeneral()
TQGroupBox *GroupBox1 = new TQGroupBox( mainFrame, "GroupBox7" );
GroupBox1->setTitle( i18n( "Order" ) );
- GroupBox1->setColumnLayout(0, Qt::Vertical );
+ GroupBox1->setColumnLayout(0, TQt::Vertical );
GroupBox1->layout()->setSpacing( 0 );
GroupBox1->layout()->setMargin( 0 );
TQVBoxLayout *GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() );
diff --git a/keduca/keduca/keducaview.cpp b/keduca/keduca/keducaview.cpp
index a5e5c22b..a5e2ac28 100644
--- a/keduca/keduca/keducaview.cpp
+++ b/keduca/keduca/keducaview.cpp
@@ -74,7 +74,7 @@ void KEducaView::init()
// Question Widget
_questionWidget = new TQVBox( this, "questionWidget" );
- _split = new TQSplitter( Qt::Vertical, _questionWidget );
+ _split = new TQSplitter( TQt::Vertical, _questionWidget );
_questionText = new KQuestion( _split, "kquestion" );
_buttonGroup = new KGroupEduca( _split, "ButtonGroup" );
_buttonGroup->setRadioButtonExclusive( true );
diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp
index 197a552f..2f8bd341 100644
--- a/keduca/keducabuilder/kcontrolheader.cpp
+++ b/keduca/keducabuilder/kcontrolheader.cpp
@@ -81,7 +81,7 @@ void KControlHeader::init()
TQGroupBox *GroupBox7 = new TQGroupBox( mainView, "GroupBox7" );
GroupBox7->setTitle( i18n( "Description" ) );
- GroupBox7->setColumnLayout(0, Qt::Vertical );
+ GroupBox7->setColumnLayout(0, TQt::Vertical );
GroupBox7->layout()->setSpacing( 0 );
GroupBox7->layout()->setMargin( 0 );
TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->layout() );
@@ -146,7 +146,7 @@ void KControlHeader::init()
TQGroupBox *GroupBox8 = new TQGroupBox( mainView, "GroupBox8" );
GroupBox8->setTitle( i18n( "Picture" ) );
- GroupBox8->setColumnLayout(0, Qt::Vertical );
+ GroupBox8->setColumnLayout(0, TQt::Vertical );
GroupBox8->layout()->setSpacing( 0 );
GroupBox8->layout()->setMargin( 0 );
TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->layout() );
@@ -164,7 +164,7 @@ void KControlHeader::init()
TQGroupBox *GroupBox6 = new TQGroupBox( mainView, "GroupBox6" );
GroupBox6->setTitle( i18n( "Author" ) );
- GroupBox6->setColumnLayout(0, Qt::Vertical );
+ GroupBox6->setColumnLayout(0, TQt::Vertical );
GroupBox6->layout()->setSpacing( 0 );
GroupBox6->layout()->setMargin( 0 );
TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->layout() );
diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp
index cfccc923..ca770008 100644
--- a/keduca/keducabuilder/keducabuilder.cpp
+++ b/keduca/keducabuilder/keducabuilder.cpp
@@ -88,7 +88,7 @@ void KEducaBuilder::init()
form2Layout->setMargin( 0 );
_split = new TQSplitter( mainView );
- _split->setOrientation( Qt::Vertical );
+ _split->setOrientation( TQt::Vertical );
_listAnswer = new TDEListBox( _split, "_listAnswer" );
_listAnswer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) );
diff --git a/kgeography/src/mapasker.cpp b/kgeography/src/mapasker.cpp
index 12ed0f53..c9ea4c78 100644
--- a/kgeography/src/mapasker.cpp
+++ b/kgeography/src/mapasker.cpp
@@ -27,9 +27,9 @@ mapAsker::mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint cou
p_mapWidget = new mapWidget(this);
lay -> addWidget(p_mapWidget, 0, 0);
- p_hsb = new TQScrollBar(Qt::Horizontal, this);
+ p_hsb = new TQScrollBar(TQt::Horizontal, this);
lay -> addWidget(p_hsb, 1, 0);
- p_vsb = new TQScrollBar(Qt::Vertical, this);
+ p_vsb = new TQScrollBar(TQt::Vertical, this);
lay -> addWidget(p_vsb, 0, 1);
lay -> setRowStretch(2, 1);
diff --git a/kgeography/src/mapwidget.cpp b/kgeography/src/mapwidget.cpp
index 81f55d82..d8fe9282 100644
--- a/kgeography/src/mapwidget.cpp
+++ b/kgeography/src/mapwidget.cpp
@@ -80,7 +80,7 @@ void mapWidget::updateVPosition(int value)
void mapWidget::mousePressEvent(TQMouseEvent *e)
{
- if (e -> button() == Qt::LeftButton)
+ if (e -> button() == TQt::LeftButton)
{
if (p_wantZoom)
{
diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp
index 99459074..66219362 100644
--- a/khangman/khangman/khangman.cpp
+++ b/khangman/khangman/khangman.cpp
@@ -228,7 +228,7 @@ void KHangMan::setLanguages()
for (uint i=0; i<m_languages.count(); i++) {
TQString tmp = m_languages[i];
if (!config->readEntry(tmp))
- config->writeEntry(tmp, TQString(TQDate::currentDate().toString(Qt::ISODate)));
+ config->writeEntry(tmp, TQString(TQDate::currentDate().toString(TQt::ISODate)));
}
// We look in $TDEDIR/share/locale/all_languages from
diff --git a/khangman/khangman/khangmanview.cpp b/khangman/khangman/khangmanview.cpp
index 0e2f7b2f..69831919 100644
--- a/khangman/khangman/khangmanview.cpp
+++ b/khangman/khangman/khangmanview.cpp
@@ -190,7 +190,7 @@ bool KHangManView::containsChar(const TQString &sChar)
void KHangManView::mousePressEvent(TQMouseEvent *mouse)
{
- if (mouse->button() == Qt::RightButton && m_hintExists && Prefs::hint()) {
+ if (mouse->button() == TQt::RightButton && m_hintExists && Prefs::hint()) {
KPassivePopup *myPopup = new KPassivePopup( m_letterInput);
myPopup->setView(i18n("Hint"), m_hint );
diff --git a/kig/filters/cabri-filter.cpp b/kig/filters/cabri-filter.cpp
index 0a94f140..f65a0138 100644
--- a/kig/filters/cabri-filter.cpp
+++ b/kig/filters/cabri-filter.cpp
@@ -343,12 +343,12 @@ KigDocument* KigFilterCabri::load( const TQString& file )
return 0;
// reading linestyle
- Qt::PenStyle ls = Qt::SolidLine;
+ TQt::PenStyle ls = TQt::SolidLine;
if ( ( obj.lineSegLength > 1 ) && ( obj.lineSegLength < 6 ) &&
( obj.lineSegSplit > 1 ) && ( obj.lineSegSplit <= 10 ) )
- ls = Qt::DotLine;
+ ls = TQt::DotLine;
else if ( ( obj.lineSegLength >= 6 ) && ( obj.lineSegSplit > 10 ) )
- ls = Qt::DashLine;
+ ls = TQt::DashLine;
int ps = 0;
args.clear();
diff --git a/kig/filters/drgeo-filter.cpp b/kig/filters/drgeo-filter.cpp
index 9742fcf5..1c904c3e 100644
--- a/kig/filters/drgeo-filter.cpp
+++ b/kig/filters/drgeo-filter.cpp
@@ -729,7 +729,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
// Normal -> the medium
// Thick -> the biggest one
int w = -1;
- Qt::PenStyle s = Qt::SolidLine;
+ TQt::PenStyle s = TQt::SolidLine;
if ( domelem.tagName() == "point" )
{
if ( domelem.attribute( "thickness" ) == "Normal" )
@@ -740,7 +740,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
else
{
if ( domelem.attribute( "thickness" ) == "Dashed" )
- s = Qt::DotLine;
+ s = TQt::DotLine;
if ( domelem.attribute( "thickness" ) == "Thick" )
w = 2;
}
diff --git a/kig/filters/latexexporter.cpp b/kig/filters/latexexporter.cpp
index 622a1a49..bbf6144a 100644
--- a/kig/filters/latexexporter.cpp
+++ b/kig/filters/latexexporter.cpp
@@ -126,7 +126,7 @@ private:
* Draws a line (segment) or a vector if vector is true.
*/
void emitLine( const Coordinate& a, const Coordinate& b, const int width,
- const Qt::PenStyle s, bool vector = false );
+ const TQt::PenStyle s, bool vector = false );
/**
* Sends a new line character ( \n ) to stream.
*/
@@ -144,7 +144,7 @@ private:
/**
* Converts a pen style into latex style string.
*/
- TQString writeStyle( Qt::PenStyle style );
+ TQString writeStyle( TQt::PenStyle style );
/**
* Plots a generic curve though its points calc'ed with getPoint.
*/
@@ -157,7 +157,7 @@ void LatexExportImpVisitor::emitCoord( const Coordinate& c )
}
void LatexExportImpVisitor::emitLine( const Coordinate& a, const Coordinate& b,
- const int width, const Qt::PenStyle s,
+ const int width, const TQt::PenStyle s,
bool vector )
{
mstream << "\\psline[linecolor=" << mcurcolorid << ",linewidth=" << width / 100.0
@@ -210,7 +210,7 @@ double LatexExportImpVisitor::dimRealToCoord( int dim )
return fabs( r.width() );
}
-TQString LatexExportImpVisitor::writeStyle( Qt::PenStyle style )
+TQString LatexExportImpVisitor::writeStyle( TQt::PenStyle style )
{
TQString ret( "linestyle=" );
if ( style == TQt::DashLine )
diff --git a/kig/filters/native-filter.cpp b/kig/filters/native-filter.cpp
index cf6521b2..e18f26bb 100644
--- a/kig/filters/native-filter.cpp
+++ b/kig/filters/native-filter.cpp
@@ -536,7 +536,7 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement&
if ( ! ok ) width = -1;
tmp = e.attribute( "style" );
- Qt::PenStyle style = ObjectDrawer::styleFromString( tmp );
+ TQt::PenStyle style = ObjectDrawer::styleFromString( tmp );
tmp = e.attribute( "point-style" );
int pointstyle = ObjectDrawer::pointStyleFromString( tmp );
diff --git a/kig/kig/kig_view.cpp b/kig/kig/kig_view.cpp
index f55f23f3..59df9d79 100644
--- a/kig/kig/kig_view.cpp
+++ b/kig/kig/kig_view.cpp
@@ -89,32 +89,32 @@ void KigWidget::paintEvent(TQPaintEvent*)
void KigWidget::mousePressEvent (TQMouseEvent* e)
{
- if( e->button() & Qt::LeftButton )
+ if( e->button() & TQt::LeftButton )
return mpart->mode()->leftClicked( e, this );
- if ( e->button() & Qt::MidButton )
+ if ( e->button() & TQt::MidButton )
return mpart->mode()->midClicked( e, this );
- if ( e->button() & Qt::RightButton )
+ if ( e->button() & TQt::RightButton )
return mpart->mode()->rightClicked( e, this );
}
void KigWidget::mouseMoveEvent (TQMouseEvent* e)
{
- if( e->state() & Qt::LeftButton )
+ if( e->state() & TQt::LeftButton )
return mpart->mode()->leftMouseMoved( e, this );
- if ( e->state() & Qt::MidButton )
+ if ( e->state() & TQt::MidButton )
return mpart->mode()->midMouseMoved( e, this );
- if ( e->state() & Qt::RightButton )
+ if ( e->state() & TQt::RightButton )
return mpart->mode()->rightMouseMoved( e, this );
return mpart->mode()->mouseMoved( e, this );
}
void KigWidget::mouseReleaseEvent (TQMouseEvent* e)
{
- if( e->state() & Qt::LeftButton )
+ if( e->state() & TQt::LeftButton )
return mpart->mode()->leftReleased( e, this );
- if ( e->state() & Qt::MidButton )
+ if ( e->state() & TQt::MidButton )
return mpart->mode()->midReleased( e, this );
- if ( e->state() & Qt::RightButton )
+ if ( e->state() & TQt::RightButton )
return mpart->mode()->rightReleased( e, this );
}
@@ -297,14 +297,14 @@ KigView::KigView( KigPart* part,
connect( part, TQT_SIGNAL( recenterScreen() ), this, TQT_SLOT( slotInternalRecenterScreen() ) );
mlayout = new TQGridLayout( this, 2, 2 );
- mrightscroll = new TQScrollBar(Qt::Vertical, this, "Right Scrollbar" );
+ mrightscroll = new TQScrollBar(TQt::Vertical, this, "Right Scrollbar" );
// TODO: make this configurable...
mrightscroll->setTracking( true );
connect( mrightscroll, TQT_SIGNAL( valueChanged( int ) ),
this, TQT_SLOT( slotRightScrollValueChanged( int ) ) );
connect( mrightscroll, TQT_SIGNAL( sliderReleased() ),
this, TQT_SLOT( updateScrollBars() ) );
- mbottomscroll = new TQScrollBar(Qt::Horizontal, this, "Bottom Scrollbar" );
+ mbottomscroll = new TQScrollBar(TQt::Horizontal, this, "Bottom Scrollbar" );
connect( mbottomscroll, TQT_SIGNAL( valueChanged( int ) ),
this, TQT_SLOT( slotBottomScrollValueChanged( int ) ) );
connect( mbottomscroll, TQT_SIGNAL( sliderReleased() ),
@@ -451,8 +451,8 @@ TQSize KigWidget::sizeHint() const
void KigWidget::wheelEvent( TQWheelEvent* e )
{
int delta = e->delta();
- Qt::Orientation orient = e->orientation();
- if ( orient == Qt::Vertical )
+ TQt::Orientation orient = e->orientation();
+ if ( orient == TQt::Vertical )
mview->scrollVertical( delta );
else
mview->scrollHorizontal( delta );
diff --git a/kig/misc/kigpainter.cpp b/kig/misc/kigpainter.cpp
index 4b3ede2e..cbaf57be 100644
--- a/kig/misc/kigpainter.cpp
+++ b/kig/misc/kigpainter.cpp
@@ -43,10 +43,10 @@ KigPainter::KigPainter( const ScreenInfo& si, TQPaintDevice* device,
const KigDocument& doc, bool no )
: mP ( device ),
color( TQt::blue ),
- style( Qt::SolidLine ),
+ style( TQt::SolidLine ),
pointstyle( 0 ),
width( -1 ),
- brushStyle( Qt::NoBrush ),
+ brushStyle( TQt::NoBrush ),
brushColor( TQt::blue ),
mdoc( doc ),
msi( si ),
@@ -101,7 +101,7 @@ void KigPainter::drawFatPoint( const Coordinate& p )
case 0:
{
double radius = twidth * pixelWidth();
- setBrushStyle( Qt::SolidPattern );
+ setBrushStyle( TQt::SolidPattern );
Coordinate rad( radius, radius );
rad /= 2;
Coordinate tl = p - rad;
@@ -115,7 +115,7 @@ void KigPainter::drawFatPoint( const Coordinate& p )
case 1:
{
double radius = twidth * pixelWidth();
- setBrushStyle( Qt::NoBrush );
+ setBrushStyle( TQt::NoBrush );
Coordinate rad( radius, radius );
rad /= 2;
Coordinate tl = p - rad;
@@ -218,7 +218,7 @@ void KigPainter::setColor( const TQColor& c )
mP.setPen( TQPen( color, width == -1 ? 1 : width, style ) );
}
-void KigPainter::setStyle( const Qt::PenStyle c )
+void KigPainter::setStyle( const TQt::PenStyle c )
{
style = c;
mP.setPen( TQPen( color, width == -1 ? 1 : width, style ) );
@@ -251,7 +251,7 @@ void KigPainter::setBrush( const TQBrush& b )
mP.setBrush( b );
}
-void KigPainter::setBrushStyle( const Qt::BrushStyle c )
+void KigPainter::setBrushStyle( const TQt::BrushStyle c )
{
brushStyle = c;
mP.setBrush( TQBrush( brushColor, brushStyle ) );
@@ -291,7 +291,7 @@ void KigPainter::drawPolygon( const std::vector<TQPoint>& pts,
TQPen oldpen = mP.pen();
TQBrush oldbrush = mP.brush();
setBrush( TQBrush( color, Dense4Pattern ) );
- setPen( Qt::NoPen );
+ setPen( TQt::NoPen );
// i know this isn't really fast, but i blame it all on TQt with its
// stupid container classes... what's wrong with the STL ?
TQPointArray t( pts.size() );
@@ -314,7 +314,7 @@ void KigPainter::drawArea( const std::vector<Coordinate>& pts, bool border )
if ( border )
setPen( TQPen( color, width == -1 ? 1 : width ) );
else
- setPen( Qt::NoPen );
+ setPen( TQt::NoPen );
TQPointArray t( pts.size() );
int c = 0;
for( std::vector<Coordinate>::const_iterator i = pts.begin(); i != pts.end(); ++i )
@@ -512,7 +512,7 @@ void KigPainter::drawTextStd( const TQPoint& p, const TQString& s )
int tf = AlignLeft | AlignTop | DontClip | WordBreak;
// we need the rect where we're going to paint text
setPen(TQPen(TQt::blue, 1, SolidLine));
- setBrush(Qt::NoBrush);
+ setBrush(TQt::NoBrush);
drawText( Rect(
msi.fromScreen(p), window().bottomRight()
).normalized(), s, tf );
@@ -643,7 +643,7 @@ void KigPainter::drawAngle( const Coordinate& cpoint, const double dstartangle,
// arrow.push_back( end + orthvect + vect );
// arrow.push_back( end + orthvect - vect );
- setBrushStyle( Qt::SolidPattern );
+ setBrushStyle( TQt::SolidPattern );
// drawPolygon( arrow );
mP.drawPolygon( arrow, false, 0, -1 );
diff --git a/kig/misc/kigpainter.h b/kig/misc/kigpainter.h
index ee3b14c1..60ce119f 100644
--- a/kig/misc/kigpainter.h
+++ b/kig/misc/kigpainter.h
@@ -59,10 +59,10 @@ protected:
mutable TQPainter mP;
TQColor color;
- Qt::PenStyle style;
+ TQt::PenStyle style;
int pointstyle;
int width;
- Qt::BrushStyle brushStyle;
+ TQt::BrushStyle brushStyle;
TQColor brushColor;
const KigDocument& mdoc;
@@ -94,7 +94,7 @@ public:
Rect fromScreen( const TQRect& r ) const;
// colors and stuff...
- void setStyle( const Qt::PenStyle c );
+ void setStyle( const TQt::PenStyle c );
void setColor( const TQColor& c );
/**
* setting this to -1 means to use the default width for the object
@@ -103,7 +103,7 @@ public:
void setWidth( const int c );
void setPointStyle( const int p );
void setPen( const TQPen& p );
- void setBrushStyle( const Qt::BrushStyle c );
+ void setBrushStyle( const TQt::BrushStyle c );
void setBrush( const TQBrush& b );
void setBrushColor( const TQColor& c );
diff --git a/kig/misc/object_constructor.cpp b/kig/misc/object_constructor.cpp
index ae2a37d0..625554a8 100644
--- a/kig/misc/object_constructor.cpp
+++ b/kig/misc/object_constructor.cpp
@@ -101,7 +101,7 @@ void StandardConstructorBase::handlePrelim(
{
assert ( margsparser.check( os ) != ArgsParser::Invalid );
std::vector<ObjectCalcer*> args = margsparser.parse( os );
- p.setBrushStyle( Qt::NoBrush );
+ p.setBrushStyle( TQt::NoBrush );
p.setBrushColor( TQt::red );
p.setPen( TQPen ( TQt::red, 1) );
p.setWidth( -1 ); // -1 means the default width for the object being
diff --git a/kig/misc/special_constructors.cpp b/kig/misc/special_constructors.cpp
index 9618bc90..1cc27ecb 100644
--- a/kig/misc/special_constructors.cpp
+++ b/kig/misc/special_constructors.cpp
@@ -349,7 +349,7 @@ void PolygonBNPTypeConstructor::handlePrelim(
}
std::vector<ObjectCalcer*> args = os;
- p.setBrushStyle( Qt::NoBrush );
+ p.setBrushStyle( TQt::NoBrush );
p.setBrushColor( TQt::red );
p.setPen( TQPen ( TQt::red, 1) );
p.setWidth( -1 ); // -1 means the default width for the object being
@@ -658,7 +658,7 @@ void PolygonBCVConstructor::handlePrelim(
args.push_back( ns );
}
- p.setBrushStyle( Qt::NoBrush );
+ p.setBrushStyle( TQt::NoBrush );
p.setBrushColor( TQt::red );
p.setPen( TQPen ( TQt::red, 1) );
p.setWidth( -1 ); // -1 means the default width for the object being
@@ -685,7 +685,7 @@ void PolygonBCVConstructor::handlePrelim(
text = TextImp( TQString( "(%1)" ).arg(i), where, false );
text.draw( p );
}
- p.setStyle( Qt::DotLine );
+ p.setStyle( TQt::DotLine );
p.setWidth( 1 );
double radius = ( v - c ).length();
CircleImp circle = CircleImp( c, radius );
@@ -1178,7 +1178,7 @@ void MeasureTransportConstructor::handlePrelim(
const KigDocument& d, const KigWidget&
) const
{
- p.setBrushStyle( Qt::NoBrush );
+ p.setBrushStyle( TQt::NoBrush );
p.setBrushColor( TQt::red );
p.setPen( TQPen ( TQt::red, 1) );
p.setWidth( -1 ); // -1 means the default width for the object being
diff --git a/kig/modes/popup.cpp b/kig/modes/popup.cpp
index 05dc5d24..c11df7ae 100644
--- a/kig/modes/popup.cpp
+++ b/kig/modes/popup.cpp
@@ -472,21 +472,21 @@ void BuiltinObjectActionsProvider::fillUpMenu( NormalModePopupObjects& popup, in
ScreenInfo si( Rect( -1, -1, 2, 2 ), p.rect() );
KigPainter ptr( si, TQT_TQPAINTDEVICE(&p), popup.part().document(), false );
PointImp pt( Coordinate( 0, 0 ) );
- ObjectDrawer d( color, -1, true, Qt::SolidLine, i );
+ ObjectDrawer d( color, -1, true, TQt::SolidLine, i );
d.draw( pt, ptr, false );
popup.addAction( menu, p, nextfree++ );
}
else
{
- Qt::PenStyle penstyles[] = {Qt::SolidLine, Qt::DashLine, Qt::DashDotLine, Qt::DashDotDotLine, Qt::DotLine};
- for ( int i = 0; i < (int) ( sizeof( penstyles ) / sizeof( Qt::PenStyle ) ); ++i )
+ TQt::PenStyle penstyles[] = {TQt::SolidLine, TQt::DashLine, TQt::DashDotLine, TQt::DashDotDotLine, TQt::DotLine};
+ for ( int i = 0; i < (int) ( sizeof( penstyles ) / sizeof( TQt::PenStyle ) ); ++i )
{
TQPixmap p( 50, 20 );
p.fill( popup.eraseColor() );
ScreenInfo si( Rect( -2.5, -1, 5, 2 ), p.rect() );
KigPainter ptr( si, TQT_TQPAINTDEVICE(&p), popup.part().document(), false );
LineImp line( Coordinate( -1, 0 ), Coordinate( 1, 0 ) );
- Qt::PenStyle ps = penstyles[i];
+ TQt::PenStyle ps = penstyles[i];
ObjectDrawer d( color, -1, true, ps, 1 );
d.draw( line, ptr, false );
popup.addAction( menu, p, nextfree++ );
@@ -712,9 +712,9 @@ bool BuiltinObjectActionsProvider::executeAction(
}
else
{
- Qt::PenStyle penstyles[] = {Qt::SolidLine, Qt::DashLine, Qt::DashDotLine, Qt::DashDotDotLine, Qt::DotLine};
- assert( id < (int)( sizeof( penstyles ) / sizeof( Qt::PenStyle ) ) );
- Qt::PenStyle p = penstyles[id];
+ TQt::PenStyle penstyles[] = {TQt::SolidLine, TQt::DashLine, TQt::DashDotLine, TQt::DashDotDotLine, TQt::DotLine};
+ assert( id < (int)( sizeof( penstyles ) / sizeof( TQt::PenStyle ) ) );
+ TQt::PenStyle p = penstyles[id];
KigCommand* kc = new KigCommand( doc, i18n( "Change Object Style" ) );
for ( std::vector<ObjectHolder*>::const_iterator i = os.begin(); i != os.end(); ++i )
if ( ! (*i)->imp()->inherits( PointImp::stype() ) )
diff --git a/kig/objects/object_drawer.cpp b/kig/objects/object_drawer.cpp
index d6e41144..f1541f66 100644
--- a/kig/objects/object_drawer.cpp
+++ b/kig/objects/object_drawer.cpp
@@ -31,7 +31,7 @@ void ObjectDrawer::draw( const ObjectImp& imp, KigPainter& p, bool sel ) const
bool nv = p.getNightVision( );
if ( mshown || nv )
{
- p.setBrushStyle( Qt::NoBrush );
+ p.setBrushStyle( TQt::NoBrush );
p.setBrushColor( sel ? TQt::red : ( mshown?mcolor:TQt::gray ) );
p.setPen( TQPen ( sel ? TQt::red : ( mshown?mcolor:TQt::gray ), 1) );
p.setWidth( mwidth );
@@ -90,7 +90,7 @@ ObjectDrawer* ObjectDrawer::getCopyWidth( int w ) const
return ret;
}
-ObjectDrawer* ObjectDrawer::getCopyStyle( Qt::PenStyle s ) const
+ObjectDrawer* ObjectDrawer::getCopyStyle( TQt::PenStyle s ) const
{
ObjectDrawer* ret = new ObjectDrawer;
ret->mcolor = mcolor;
@@ -117,7 +117,7 @@ int ObjectDrawer::width() const
return mwidth;
}
-Qt::PenStyle ObjectDrawer::style() const
+TQt::PenStyle ObjectDrawer::style() const
{
return mstyle;
}
@@ -127,13 +127,13 @@ int ObjectDrawer::pointStyle() const
return mpointstyle;
}
-ObjectDrawer::ObjectDrawer( const TQColor& color, int width, bool shown, Qt::PenStyle style, int pointStyle )
+ObjectDrawer::ObjectDrawer( const TQColor& color, int width, bool shown, TQt::PenStyle style, int pointStyle )
: mcolor( color ), mshown( shown ), mwidth( width ), mstyle( style ), mpointstyle( pointStyle )
{
}
ObjectDrawer::ObjectDrawer()
- : mcolor( TQt::blue ), mshown( true ), mwidth( -1 ), mstyle( Qt::SolidLine ), mpointstyle( 0 )
+ : mcolor( TQt::blue ), mshown( true ), mwidth( -1 ), mstyle( TQt::SolidLine ), mpointstyle( 0 )
{
}
@@ -173,19 +173,19 @@ TQString ObjectDrawer::pointStyleToString() const
return TQString();
}
-Qt::PenStyle ObjectDrawer::styleFromString( const TQString& style )
+TQt::PenStyle ObjectDrawer::styleFromString( const TQString& style )
{
if ( style == "SolidLine" )
- return Qt::SolidLine;
+ return TQt::SolidLine;
else if ( style == "DashLine" )
- return Qt::DashLine;
+ return TQt::DashLine;
else if ( style == "DotLine" )
- return Qt::DotLine;
+ return TQt::DotLine;
else if ( style == "DashDotLine" )
- return Qt::DashDotLine;
+ return TQt::DashDotLine;
else if ( style == "DashDotDotLine" )
- return Qt::DashDotDotLine;
- else return Qt::SolidLine;
+ return TQt::DashDotDotLine;
+ else return TQt::SolidLine;
}
TQString ObjectDrawer::styleToString() const
diff --git a/kig/objects/object_drawer.h b/kig/objects/object_drawer.h
index cbd1374a..b5336a06 100644
--- a/kig/objects/object_drawer.h
+++ b/kig/objects/object_drawer.h
@@ -48,7 +48,7 @@ class ObjectDrawer
TQColor mcolor;
bool mshown;
int mwidth;
- Qt::PenStyle mstyle;
+ TQt::PenStyle mstyle;
int mpointstyle;
public:
/**
@@ -57,7 +57,7 @@ public:
* and pointstyle ( 0 )
*/
ObjectDrawer();
- ObjectDrawer( const TQColor& color, int width = -1, bool shown = true, Qt::PenStyle = Qt::SolidLine, int pointStyle = 0 );
+ ObjectDrawer( const TQColor& color, int width = -1, bool shown = true, TQt::PenStyle = TQt::SolidLine, int pointStyle = 0 );
/**
* Draw the object \p imp on kigpainter \p p . If \p selected is true, it is
* drawn in red, otherwise in its normal color.
@@ -91,7 +91,7 @@ public:
/**
* return PenStyle for all objects except points
*/
- Qt::PenStyle style() const;
+ TQt::PenStyle style() const;
/**
* return pointStyle for points
*/
@@ -123,7 +123,7 @@ public:
* returns a new ObjectDrawer that is identical to this one.. except
* that the PenStyle state is set to \p s ..
*/
- ObjectDrawer* getCopyStyle( Qt::PenStyle s ) const;
+ ObjectDrawer* getCopyStyle( TQt::PenStyle s ) const;
/**
* returns a new ObjectDrawer that is identical to this one.. except
* that the pointStyle state is set to \p p ..
@@ -140,7 +140,7 @@ public:
* given \p style string is unknown. In that case it returns a default
* value.
*/
- static Qt::PenStyle styleFromString( const TQString& style );
+ static TQt::PenStyle styleFromString( const TQString& style );
};
#endif
diff --git a/kiten/learn.cpp b/kiten/learn.cpp
index a1b685d4..da378102 100644
--- a/kiten/learn.cpp
+++ b/kiten/learn.cpp
@@ -74,7 +74,7 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name)
veryTop->addWidget(Tabs);
listTop = new TQSplitter(Tabs);
- listTop->setOrientation(Qt::Vertical);
+ listTop->setOrientation(TQt::Vertical);
quizTop = new TQWidget(Tabs);
Tabs->addTab(listTop, i18n("&List"));
Tabs->addTab(quizTop, i18n("&Quiz"));
@@ -146,7 +146,7 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name)
hlayout->addStretch();
quizLayout->addStretch();
- answers = new TQButtonGroup(1,Qt::Horizontal, quizTop);
+ answers = new TQButtonGroup(1,TQt::Horizontal, quizTop);
for (int i = 0; i < numberOfAnswers; ++i)
answers->insert(new KPushButton(answers), i);
quizLayout->addWidget(answers);
diff --git a/kiten/rad.cpp b/kiten/rad.cpp
index 44d2908c..a39ea152 100644
--- a/kiten/rad.cpp
+++ b/kiten/rad.cpp
@@ -226,7 +226,7 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p
TQHBoxLayout *hlayout = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
TQVBoxLayout *vlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint());
- hotlistGroup = new TQButtonGroup(1,Qt::Horizontal, i18n("Hotlist"), this);
+ hotlistGroup = new TQButtonGroup(1,TQt::Horizontal, i18n("Hotlist"), this);
//hotlistGroup->setRadioButtonExclusive(true);
vlayout->addWidget(hotlistGroup);
diff --git a/kmplot/kmplot/View.cpp b/kmplot/kmplot/View.cpp
index 6c60fd50..61045a62 100644
--- a/kmplot/kmplot/View.cpp
+++ b/kmplot/kmplot/View.cpp
@@ -231,7 +231,7 @@ void View::plotfkt(Ufkt *ufkt, TQPainter *pDC)
double x, y, dmin, dmax;
TQPoint p1, p2;
TQPen pen;
- pen.setCapStyle(Qt::RoundCap);
+ pen.setCapStyle(TQt::RoundCap);
iy=0;
y=0.0;
@@ -605,7 +605,7 @@ void View::mouseMoveEvent(TQMouseEvent *e)
{
if ( isDrawing)
return;
- if (zoom_mode==4 && e->stateAfter() != Qt::NoButton)
+ if (zoom_mode==4 && e->stateAfter() != TQt::NoButton)
{
TQPainter p;
p.begin(this);
@@ -616,7 +616,7 @@ void View::mouseMoveEvent(TQMouseEvent *e)
TQPen pen(TQt::white, 1, TQt::DotLine);
painter.setRasterOp (TQt::XorROP);
painter.setPen(pen);
- painter.setBackgroundMode (Qt::OpaqueMode);
+ painter.setBackgroundMode (TQt::OpaqueMode);
painter.setBackgroundColor (TQt::blue);
painter.drawRect(rectangle_point.x(), rectangle_point.y(), e->pos().x()-rectangle_point.x(), e->pos().y()-rectangle_point.y());
@@ -639,7 +639,7 @@ void View::mouseMoveEvent(TQMouseEvent *e)
csflg=0;
}
- if(area.contains(e->pos()) || (e->button()==Qt::LeftButton && e->state()==Qt::LeftButton && csxpos>xmin && csxpos<xmax))
+ if(area.contains(e->pos()) || (e->button()==TQt::LeftButton && e->state()==TQt::LeftButton && csxpos>xmin && csxpos<xmax))
{
TQPoint ptd, ptl;
TQPainter DC;
@@ -862,7 +862,7 @@ void View::mousePressEvent(TQMouseEvent *e)
}
double const g=tlgy*double(xmax-xmin)/(2*double(ymax-ymin));
- if( !m_readonly && e->button()==Qt::RightButton) //clicking with the right mouse button
+ if( !m_readonly && e->button()==TQt::RightButton) //clicking with the right mouse button
{
char function_type;
for( TQValueVector<Ufkt>::iterator it = m_parser->ufkt.begin(); it != m_parser->ufkt.end(); ++it)
@@ -969,7 +969,7 @@ void View::mousePressEvent(TQMouseEvent *e)
}
return;
}
- if(e->button()!=Qt::LeftButton) return ;
+ if(e->button()!=TQt::LeftButton) return ;
if(csmode>=0) //disable trace mode if trace mode is enable
{
csmode=-1;
@@ -1471,9 +1471,9 @@ void View::keyPressEvent( TQKeyEvent * e)
TQMouseEvent *event;
if (e->key() == TQt::Key_Left )
- event = new TQMouseEvent(TQEvent::MouseMove,TQPoint(fcx-1,fcy-1),Qt::LeftButton,Qt::LeftButton);
+ event = new TQMouseEvent(TQEvent::MouseMove,TQPoint(fcx-1,fcy-1),TQt::LeftButton,TQt::LeftButton);
else if (e->key() == TQt::Key_Right )
- event = new TQMouseEvent(TQEvent::MouseMove,TQPoint(fcx+1,fcy+1),Qt::LeftButton,Qt::LeftButton);
+ event = new TQMouseEvent(TQEvent::MouseMove,TQPoint(fcx+1,fcy+1),TQt::LeftButton,TQt::LeftButton);
else if (e->key() == TQt::Key_Up || e->key() == TQt::Key_Down) //switch graph in trace mode
{
TQValueVector<Ufkt>::iterator it = &m_parser->ufkt[m_parser->ixValue(csmode)];
@@ -1573,18 +1573,18 @@ void View::keyPressEvent( TQKeyEvent * e)
break;
}
}
- event = new TQMouseEvent(TQEvent::MouseMove,TQPoint(fcx,fcy),Qt::LeftButton,Qt::LeftButton);
+ event = new TQMouseEvent(TQEvent::MouseMove,TQPoint(fcx,fcy),TQt::LeftButton,TQt::LeftButton);
}
else if ( e->key() == TQt::Key_Space )
{
- event = new TQMouseEvent(TQEvent::MouseButtonPress,TQCursor::pos(),Qt::RightButton,Qt::RightButton);
+ event = new TQMouseEvent(TQEvent::MouseButtonPress,TQCursor::pos(),TQt::RightButton,TQt::RightButton);
mousePressEvent(event);
delete event;
return;
}
else
{
- event = new TQMouseEvent(TQEvent::MouseButtonPress,TQPoint(fcx,fcy),Qt::LeftButton,Qt::LeftButton);
+ event = new TQMouseEvent(TQEvent::MouseButtonPress,TQPoint(fcx,fcy),TQt::LeftButton,TQt::LeftButton);
mousePressEvent(event);
delete event;
return;
@@ -1876,7 +1876,7 @@ void View::mnuHide_clicked()
if ( !ufkt->f_mode && !ufkt->f1_mode && !ufkt->f2_mode) //all graphs for the function are hidden
{
csmode=-1;
- TQMouseEvent *event = new TQMouseEvent(TQMouseEvent::KeyPress,TQCursor::pos(),Qt::LeftButton,Qt::LeftButton);
+ TQMouseEvent *event = new TQMouseEvent(TQMouseEvent::KeyPress,TQCursor::pos(),TQt::LeftButton,TQt::LeftButton);
mousePressEvent(event); //leave trace mode
delete event;
return;
@@ -1904,7 +1904,7 @@ void View::mnuRemove_clicked()
if (csmode!=-1) // if trace mode is enabled
{
csmode=-1;
- TQMouseEvent *event = new TQMouseEvent(TQMouseEvent::KeyPress,TQCursor::pos(),Qt::LeftButton,Qt::LeftButton);
+ TQMouseEvent *event = new TQMouseEvent(TQMouseEvent::KeyPress,TQCursor::pos(),TQt::LeftButton,TQt::LeftButton);
mousePressEvent(event); //leave trace mode
delete event;
}
diff --git a/kmplot/kmplot/ksliderwindow.cpp b/kmplot/kmplot/ksliderwindow.cpp
index b2921bbd..0fadae1c 100644
--- a/kmplot/kmplot/ksliderwindow.cpp
+++ b/kmplot/kmplot/ksliderwindow.cpp
@@ -82,7 +82,7 @@ bool KSliderWindow::eventFilter( TQObject *obj, TQEvent *ev )
if (ev->type() == TQEvent::MouseButtonPress)
{
TQMouseEvent *e = (TQMouseEvent *)ev;
- if (e->button() != Qt::RightButton)
+ if (e->button() != TQt::RightButton)
return SliderWindow::eventFilter( obj, ev );
m_popupmenu->exec(TQCursor::pos());
return true;
diff --git a/kstars/kstars/detaildialog.h b/kstars/kstars/detaildialog.h
index 6a22ca1a..1d025c7c 100644
--- a/kstars/kstars/detaildialog.h
+++ b/kstars/kstars/detaildialog.h
@@ -83,7 +83,7 @@ signals:
void clicked();
protected:
- void mousePressEvent( TQMouseEvent *e ) { if ( e->button() == Qt::LeftButton ) emit clicked(); }
+ void mousePressEvent( TQMouseEvent *e ) { if ( e->button() == TQt::LeftButton ) emit clicked(); }
};
/**@class DetailDialog is a window showing detailed information for a selected object.
diff --git a/kstars/kstars/indielement.cpp b/kstars/kstars/indielement.cpp
index e016fa28..83ca370b 100644
--- a/kstars/kstars/indielement.cpp
+++ b/kstars/kstars/indielement.cpp
@@ -287,7 +287,7 @@ void INDI_E::setupElementScale(int length)
int steps = (int) ((max - min) / step);
spin_w = new KDoubleSpinBox(min, max, step, value, 2, pp->pg->propertyContainer );
-slider_w = new TQSlider(0, steps, 1, (int) ((value - min) / step), Qt::Horizontal, pp->pg->propertyContainer );
+slider_w = new TQSlider(0, steps, 1, (int) ((value - min) / step), TQt::Horizontal, pp->pg->propertyContainer );
connect(spin_w, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(spinChanged(double )));
connect(slider_w, TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(sliderChanged(int )));
diff --git a/kstars/kstars/indielement.h b/kstars/kstars/indielement.h
index 4ac3239f..0bf7c321 100644
--- a/kstars/kstars/indielement.h
+++ b/kstars/kstars/indielement.h
@@ -98,7 +98,7 @@ class INDI_E : public TQObject
PState state; /* control on/off t/f etc */
INDI_P *pp; /* parent property */
- TQHBoxLayout *EHBox; /*Qt::Horizontal layout */
+ TQHBoxLayout *EHBox; /* Horizontal layout */
/* GUI widgets, only malloced when needed */
KSqueezedTextLabel *label_w; // label
diff --git a/kstars/kstars/indigroup.h b/kstars/kstars/indigroup.h
index b68a976d..097e6a10 100644
--- a/kstars/kstars/indigroup.h
+++ b/kstars/kstars/indigroup.h
@@ -35,7 +35,7 @@ class INDI_G
INDI_D *dp; /* Parent device */
TQFrame *propertyContainer; /* Properties container */
TQVBoxLayout *propertyLayout; /* Properties layout */
- TQSpacerItem *VerticalSpacer; /*Qt::Vertical spacer */
+ TQSpacerItem *VerticalSpacer; /* Vertical spacer */
TQPtrList<INDI_P> pl; /* malloced list of pointers to properties */
diff --git a/kstars/kstars/indiproperty.h b/kstars/kstars/indiproperty.h
index 96df51cf..e0fb3f15 100644
--- a/kstars/kstars/indiproperty.h
+++ b/kstars/kstars/indiproperty.h
@@ -57,9 +57,9 @@ class INDI_P : public TQObject
TQLabel *label_w; /* Label widget */
TQPushButton *set_w; /* set button */
- TQSpacerItem *HorSpacer; /*Qt::Horizontal spacer */
- TQHBoxLayout *PHBox; /*Qt::Horizontal container */
- TQVBoxLayout *PVBox; /*Qt::Vertical container */
+ TQSpacerItem *HorSpacer; /* Horizontal spacer */
+ TQHBoxLayout *PHBox; /* Horizontal container */
+ TQVBoxLayout *PVBox; /* Vertical container */
TQButtonGroup *groupB; /* group button for radio and check boxes (Elements) */
KComboBox *om_w; /* Combo box for menu */
diff --git a/kstars/kstars/main.cpp b/kstars/kstars/main.cpp
index 8a516860..c9024d33 100644
--- a/kstars/kstars/main.cpp
+++ b/kstars/kstars/main.cpp
@@ -111,13 +111,13 @@ int main(int argc, char *argv[])
if ( ! datestring.isEmpty() ) {
if ( datestring.contains( "-" ) ) { //assume ISODate format
if ( datestring.contains( ":" ) ) { //also includes time
- kdt = KStarsDateTime::fromString( datestring, Qt::ISODate );
+ kdt = KStarsDateTime::fromString( datestring, TQt::ISODate );
} else { //string probably contains date only
- kdt.setDate( ExtDate::fromString( datestring, Qt::ISODate ) );
+ kdt.setDate( ExtDate::fromString( datestring, TQt::ISODate ) );
kdt.setTime( TQTime( 0, 0, 0 ) );
}
} else { //assume Text format for date string
- kdt = dat->geo()->LTtoUT( KStarsDateTime::fromString( datestring, Qt::TextDate ) );
+ kdt = dat->geo()->LTtoUT( KStarsDateTime::fromString( datestring, TQt::TextDate ) );
}
if ( ! kdt.isValid() ) {
diff --git a/kstars/kstars/skymapevents.cpp b/kstars/kstars/skymapevents.cpp
index 8bc88002..9205ab0e 100644
--- a/kstars/kstars/skymapevents.cpp
+++ b/kstars/kstars/skymapevents.cpp
@@ -629,12 +629,12 @@ void SkyMap::mouseReleaseEvent( TQMouseEvent * ) {
void SkyMap::mousePressEvent( TQMouseEvent *e ) {
//did we Grab an infoBox?
- if ( e->button() == Qt::LeftButton && infoBoxes()->grabBox( e ) ) {
+ if ( e->button() == TQt::LeftButton && infoBoxes()->grabBox( e ) ) {
update(); //refresh without redrawing skymap
return;
}
- if ( (e->state() & ControlButton) && (e->button() == Qt::LeftButton) ) {
+ if ( (e->state() & ControlButton) && (e->button() == TQt::LeftButton) ) {
ZoomRect.moveCenter( e->pos() );
setZoomMouseCursor();
update(); //refresh without redrawing skymap
@@ -649,13 +649,13 @@ void SkyMap::mousePressEvent( TQMouseEvent *e ) {
double dy = ( 0.5*height() - e->y() )/Options::zoomFactor();
if (unusablePoint (dx, dy)) return; // break if point is unusable
- if ( !midMouseButtonDown && e->button() == Qt::MidButton ) {
+ if ( !midMouseButtonDown && e->button() == TQt::MidButton ) {
y0 = 0.5*height() - e->y(); //record y pixel coordinate for middle-button zooming
midMouseButtonDown = true;
}
if ( !mouseButtonDown ) {
- if ( e->button()==Qt::LeftButton ) {
+ if ( e->button()==TQt::LeftButton ) {
mouseButtonDown = true;
scrollCount = 0;
}
@@ -671,11 +671,11 @@ void SkyMap::mousePressEvent( TQMouseEvent *e ) {
if ( clickedObject() ) {
setClickedPoint( clickedObject() );
- if ( e->button() == Qt::RightButton ) {
+ if ( e->button() == TQt::RightButton ) {
clickedObject()->showPopupMenu( pmenu, TQCursor::pos() );
}
- if ( ksw && e->button() == Qt::LeftButton ) {
+ if ( ksw && e->button() == TQt::LeftButton ) {
ksw->statusBar()->changeItem( clickedObject()->translatedLongName(), 0 );
}
} else {
@@ -684,10 +684,10 @@ void SkyMap::mousePressEvent( TQMouseEvent *e ) {
setClickedObject( NULL );
switch (e->button()) {
- case Qt::LeftButton:
+ case TQt::LeftButton:
if ( ksw ) ksw->statusBar()->changeItem( i18n( "Empty sky" ), 0 );
break;
- case Qt::RightButton:
+ case TQt::RightButton:
{
SkyObject *nullObj = new SkyObject( SkyObject::TYPE_UNKNOWN, clickedPoint()->ra()->Hours(), clickedPoint()->dec()->Degrees() );
pmenu->createEmptyMenu( nullObj );
@@ -706,7 +706,7 @@ void SkyMap::mousePressEvent( TQMouseEvent *e ) {
void SkyMap::mouseDoubleClickEvent( TQMouseEvent *e ) {
//Was the event inside an infoBox? If so, shade the box.
- if ( e->button() == Qt::LeftButton ) {
+ if ( e->button() == TQt::LeftButton ) {
if ( infoBoxes()->shadeBox( e ) ) {
update();
return;
diff --git a/kstars/kstars/thumbnaileditor.cpp b/kstars/kstars/thumbnaileditor.cpp
index cfef5bf4..00564495 100644
--- a/kstars/kstars/thumbnaileditor.cpp
+++ b/kstars/kstars/thumbnaileditor.cpp
@@ -130,7 +130,7 @@ void ThumbImage::paintEvent( TQPaintEvent* ) {
}
void ThumbImage::mousePressEvent( TQMouseEvent *e ) {
- if ( e->button() == Qt::LeftButton && CropRect->contains( e->pos() ) ) {
+ if ( e->button() == TQt::LeftButton && CropRect->contains( e->pos() ) ) {
bMouseButtonDown = true;
//The Anchor tells how far from the CropRect corner we clicked
diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp
index ff86b542..bafc18ee 100644
--- a/kstars/kstars/tools/lcgenerator.cpp
+++ b/kstars/kstars/tools/lcgenerator.cpp
@@ -68,7 +68,7 @@ void LCGenerator::createGUI()
SDLayout = new TQHBoxLayout( 0, 0, 6, "SDLayout");
StarInfoBox = new TQGroupBox( page, "StarInfoBox" );
- StarInfoBox->setColumnLayout(0, Qt::Vertical );
+ StarInfoBox->setColumnLayout(0, TQt::Vertical );
StarInfoBox->layout()->setSpacing( 6 );
StarInfoBox->layout()->setMargin( 11 );
StarInfoBoxLayout = new TQVBoxLayout( StarInfoBox->layout() );
@@ -124,7 +124,7 @@ void LCGenerator::createGUI()
SDLayout->addWidget( StarInfoBox );
DataSelectBox = new TQGroupBox( page, "DataSelectBox" );
- DataSelectBox->setColumnLayout(0, Qt::Vertical );
+ DataSelectBox->setColumnLayout(0, TQt::Vertical );
DataSelectBox->layout()->setSpacing( 6 );
DataSelectBox->layout()->setMargin( 11 );
DataSelectBoxLayout = new TQVBoxLayout( DataSelectBox->layout() );
diff --git a/kstars/kstars/tools/modcalcequinox.cpp b/kstars/kstars/tools/modcalcequinox.cpp
index 50fbd979..cc78629d 100644
--- a/kstars/kstars/tools/modcalcequinox.cpp
+++ b/kstars/kstars/tools/modcalcequinox.cpp
@@ -212,10 +212,10 @@ void modCalcEquinox::processLines( TQTextStream &istream ) {
KStarsDateTime dta( jdau );
KStarsDateTime dtw( jdwin );
- ostream << dts.toString(Qt::ISODate) << space << (float)(jdsu - jdsp) << space
- << dtu.toString(Qt::ISODate) << space << (float)(jdau - jdsu) << space
- << dta.toString(Qt::ISODate) << space << (float)(jdwin - jdau) << space
- << dtw.toString(Qt::ISODate) << space << (float)(jdsp1 - jdwin) << endl;
+ ostream << dts.toString(TQt::ISODate) << space << (float)(jdsu - jdsp) << space
+ << dtu.toString(TQt::ISODate) << space << (float)(jdau - jdsu) << space
+ << dta.toString(TQt::ISODate) << space << (float)(jdwin - jdau) << space
+ << dtw.toString(TQt::ISODate) << space << (float)(jdsp1 - jdwin) << endl;
}
diff --git a/kstars/kstars/tools/modcalcplanets.cpp b/kstars/kstars/tools/modcalcplanets.cpp
index e1c8b070..fc51282a 100644
--- a/kstars/kstars/tools/modcalcplanets.cpp
+++ b/kstars/kstars/tools/modcalcplanets.cpp
@@ -459,7 +459,7 @@ void modCalcPlanets::processLines( TQTextStream &istream ) {
// Read date and write in ostream if corresponds
if(dateCheckBatch->isChecked() ) {
- dtB = ExtDate::fromString( fields[i], Qt::ISODate );
+ dtB = ExtDate::fromString( fields[i], TQt::ISODate );
if ( !dtB.isValid() ) {
kdWarning() << i18n( "Line %1 contains an invalid date: " ).arg(nline) <<
fields[i] << endl ;
diff --git a/kstars/kstars/tools/wutdialog.cpp b/kstars/kstars/tools/wutdialog.cpp
index 632f6254..f2ed8c7c 100644
--- a/kstars/kstars/tools/wutdialog.cpp
+++ b/kstars/kstars/tools/wutdialog.cpp
@@ -82,7 +82,7 @@ WUTDialog::WUTDialog(KStars *ks) :
if ( ! geo->translatedProvince().isEmpty() ) sGeo += ", " + geo->translatedProvince();
sGeo += ", " + geo->translatedCountry();
WUT->LocationLabel->setText( i18n( "at %1" ).arg( sGeo ) );
- WUT->DateLabel->setText( i18n( "The night of %1" ).arg( Evening.date().toString( Qt::LocalDate ) ) );
+ WUT->DateLabel->setText( i18n( "The night of %1" ).arg( Evening.date().toString( TQt::LocalDate ) ) );
initCategories();
diff --git a/ktouch/src/ktouchslideline.h b/ktouch/src/ktouchslideline.h
index f438366a..97c1e51e 100644
--- a/ktouch/src/ktouchslideline.h
+++ b/ktouch/src/ktouchslideline.h
@@ -121,8 +121,8 @@ class KTouchSlideLine : public TQWidget {
TQColor m_cursorBackground; ///< Defines the background colour of the cursor (when turned off).
// variables depending on size of widget, will be updated in resizeEvent()
- int m_marginVerWidget; ///<Qt::Vertical margin between widget boundary and sliding line in pixels.
- int m_slideLineDist; ///<Qt::Vertical distance between sliding lines in pixels.
+ int m_marginVerWidget; ///< Vertical margin between widget boundary and sliding line in pixels.
+ int m_slideLineDist; ///< Vertical distance between sliding lines in pixels.
int m_slideLineHeight; ///< Height of a sliding line in pixels.
int m_marginCursor; ///< The margin for cursor movement (minimum distance from left and right ends of slide line boundaries).
@@ -133,7 +133,7 @@ class KTouchSlideLine : public TQWidget {
int m_yCursorStudent; ///< Cursor top y coordinate (from top of visible area) in the student line.
// newly defined variables, will be updated on the setNewText() and partially in setStudentText()
- int m_marginHorWidget; ///<Qt::Horizontal margin between widget boundary and sliding line in pixels.
+ int m_marginHorWidget; ///< Horizontal margin between widget boundary and sliding line in pixels.
int m_slideLineWidth; ///< The length of the sliding line in pixels.
int m_cursorRangeLen; ///< Length (in pixel) that the cursor can move between left and right margin.
diff --git a/ktouch/src/ktouchstatisticsdata.cpp b/ktouch/src/ktouchstatisticsdata.cpp
index 6bf98716..cf7c723b 100644
--- a/ktouch/src/ktouchstatisticsdata.cpp
+++ b/ktouch/src/ktouchstatisticsdata.cpp
@@ -94,7 +94,7 @@ bool KTouchLevelStats::read(TQDomNode in) {
if (!n.isNull()) {
TQString timestring = n.firstChild().nodeValue();
if (timestring != TQString())
- m_timeRecorded = TQDateTime::fromString(timestring, Qt::ISODate);
+ m_timeRecorded = TQDateTime::fromString(timestring, TQt::ISODate);
}
// read characters
n = in.namedItem("CharStats");
@@ -121,7 +121,7 @@ void KTouchLevelStats::write(TQDomDocument& doc, TQDomElement& root) const {
level.setAttribute("Words", m_words);
// add time
TQDomElement e = doc.createElement("Time");
- TQDomText tn = doc.createTextNode(m_timeRecorded.toString(Qt::ISODate));
+ TQDomText tn = doc.createTextNode(m_timeRecorded.toString(TQt::ISODate));
e.appendChild(tn);
level.appendChild(e);
// add char stats
@@ -236,7 +236,7 @@ bool KTouchSessionStats::read(TQDomNode in) {
if (!n.isNull()) {
TQString timestring = n.firstChild().nodeValue();
if (timestring != TQString())
- m_timeRecorded = TQDateTime::fromString(timestring, Qt::ISODate);
+ m_timeRecorded = TQDateTime::fromString(timestring, TQt::ISODate);
}
// read level numbers
n = in.namedItem("LevelNums");
@@ -272,7 +272,7 @@ void KTouchSessionStats::write(TQDomDocument& doc, TQDomElement& root) const {
session.setAttribute("Words", m_words);
// add time
TQDomElement e = doc.createElement("Time");
- TQDomText tn = doc.createTextNode(m_timeRecorded.toString(Qt::ISODate));
+ TQDomText tn = doc.createTextNode(m_timeRecorded.toString(TQt::ISODate));
e.appendChild(tn);
session.appendChild(e);
// add levels
diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp
index 74b33300..9e68381f 100644
--- a/kturtle/src/kturtle.cpp
+++ b/kturtle/src/kturtle.cpp
@@ -876,7 +876,7 @@ void MainWindow::slotSettings()
general = new TQWidget();
TQGridLayout *generalLayout = new TQGridLayout( general, 1, 1, 11, 6, "generalLayout");
WidthHeightBox = new TQGroupBox( i18n("Initial Canvas Size"), general );
- WidthHeightBox->setColumnLayout(0, Qt::Vertical );
+ WidthHeightBox->setColumnLayout(0, TQt::Vertical );
WidthHeightBox->layout()->setSpacing( 6 );
WidthHeightBox->layout()->setMargin( 11 );
TQVBoxLayout *WidthHeightBoxLayout = new TQVBoxLayout( WidthHeightBox->layout() );
@@ -917,7 +917,7 @@ void MainWindow::slotSettings()
TQWidget *language = new TQWidget();
TQGridLayout *languageLayout = new TQGridLayout( language, 1, 1, 11, 6, "Form1Layout");
TQGroupBox *groupBox1 = new TQGroupBox( language, "groupBox1" );
- groupBox1->setColumnLayout(0, Qt::Vertical );
+ groupBox1->setColumnLayout(0, TQt::Vertical );
groupBox1->layout()->setSpacing( 6 );
groupBox1->layout()->setMargin( 11 );
TQGridLayout *groupBox1Layout = new TQGridLayout( groupBox1->layout() );
diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp
index e9447654..e524e033 100644
--- a/kvoctrain/kvoctrain/kvoctraintable.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintable.cpp
@@ -263,7 +263,7 @@ void KVocTrainTable::menuTriggerTimeout()
if (mt != KV_COL_MARK)
emit rightButtonClicked(mt, mpos.x(), mpos.y());
- TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0, 0), Qt::LeftButton, Qt::LeftButton);
+ TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0, 0), TQt::LeftButton, TQt::LeftButton);
TQApplication::sendEvent(header, &me);
}
@@ -538,7 +538,7 @@ void KVocTrainTable::contentsMousePressEvent(TQMouseEvent * e)
for (int i = topCell; i <= lastRowVisible; i++)
updateCell(i, KV_COL_ORG);
}
- if(e->button() == Qt::LeftButton)
+ if(e->button() == TQt::LeftButton)
setCurrentCell(cr, cc);
}
diff --git a/kwordquiz/src/kwordquiz.kcfg b/kwordquiz/src/kwordquiz.kcfg
index 3eacdf76..5a300c63 100644
--- a/kwordquiz/src/kwordquiz.kcfg
+++ b/kwordquiz/src/kwordquiz.kcfg
@@ -74,15 +74,15 @@
</entry>
<entry name="FrontTextColor" type="Color">
<label>Color used for text on front of flashcard</label>
- <default code="true">Qt::black</default>
+ <default code="true">TQt::black</default>
</entry>
<entry name="FrontCardColor" type="Color">
<label>Color used for front of flashcard</label>
- <default code="true">Qt::white</default>
+ <default code="true">TQt::white</default>
</entry>
<entry name="FrontFrameColor" type="Color">
<label>Color used for frame on front of flashcard</label>
- <default code="true">Qt::red</default>
+ <default code="true">TQt::red</default>
</entry>
<entry name="BackFont" type="Font">
<label>Font used for back of flashcard</label>
@@ -90,15 +90,15 @@
</entry>
<entry name="BackTextColor" type="Color">
<label>Color used for text on back of flashcard</label>
- <default code="true">Qt::black</default>
+ <default code="true">TQt::black</default>
</entry>
<entry name="BackCardColor" type="Color">
<label>Color used for back of flashcard</label>
- <default code="true">Qt::white</default>
+ <default code="true">TQt::white</default>
</entry>
<entry name="BackFrameColor" type="Color">
<label>Color used for frame on back of flashcard</label>
- <default code="true">Qt::blue</default>
+ <default code="true">TQt::blue</default>
</entry>
</group>
<group name="TDENewStuff">
diff --git a/kwordquiz/src/wqprintdialogpage.cpp b/kwordquiz/src/wqprintdialogpage.cpp
index 148d298b..9ff03284 100644
--- a/kwordquiz/src/wqprintdialogpage.cpp
+++ b/kwordquiz/src/wqprintdialogpage.cpp
@@ -33,7 +33,7 @@ WQPrintDialogPage::WQPrintDialogPage(TQWidget *parent, const char *name )
TQGridLayout * l = new TQGridLayout( this, 1, 1, 11, 6);
g = new TQButtonGroup(i18n("Select Type of Printout"), this );
- g->setColumnLayout(0, Qt::Vertical );
+ g->setColumnLayout(0, TQt::Vertical );
g->layout()->setSpacing( 6 );
g->layout()->setMargin( 11 );
TQGridLayout * v = new TQGridLayout( g->layout() );
diff --git a/libtdeedu/extdate/extdatetbl.cpp b/libtdeedu/extdate/extdatetbl.cpp
index dc12d180..087c674e 100644
--- a/libtdeedu/extdate/extdatetbl.cpp
+++ b/libtdeedu/extdate/extdatetbl.cpp
@@ -448,7 +448,7 @@ ExtDateTable::contentsMousePressEvent(TQMouseEvent *e)
emit tableClicked();
- if ( e->button() == Qt::RightButton && d->popupMenuEnabled )
+ if ( e->button() == TQt::RightButton && d->popupMenuEnabled )
{
TDEPopupMenu *menu = new TDEPopupMenu();
@@ -720,7 +720,7 @@ ExtDateInternalMonthPicker::paintCell(TQPainter* painter, int row, int col)
void
ExtDateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e)
{
- if(!isEnabled() || e->button() != Qt::LeftButton)
+ if(!isEnabled() || e->button() != TQt::LeftButton)
{
KNotifyClient::beep();
return;
@@ -747,7 +747,7 @@ ExtDateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e)
void
ExtDateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e)
{
- if (e->state() & Qt::LeftButton)
+ if (e->state() & TQt::LeftButton)
{
int row, col;
TQPoint mouseCoord;
diff --git a/libtdeedu/extdate/extdatetime.cpp b/libtdeedu/extdate/extdatetime.cpp
index 5d92ebd6..60d6ea56 100644
--- a/libtdeedu/extdate/extdatetime.cpp
+++ b/libtdeedu/extdate/extdatetime.cpp
@@ -241,7 +241,7 @@ TQString ExtDate::longDayName( int weekday ) {return m_longDayNames[weekday-1];}
#ifndef TQT_NO_TEXTSTRING
#if !defined(TQT_NO_SPRINTF)
-TQString ExtDate::toString( Qt::DateFormat f) const
+TQString ExtDate::toString( TQt::DateFormat f) const
{
TQString a_format;
@@ -249,15 +249,15 @@ TQString ExtDate::toString( Qt::DateFormat f) const
switch (f)
{
- case Qt::TextDate : // Sat May 20 1995
+ case TQt::TextDate : // Sat May 20 1995
a_format = "%a %b %e %Y";
break;
- case Qt::ISODate : // YYYY-MM-DD
+ case TQt::ISODate : // YYYY-MM-DD
a_format = "%Y-%m-%d";
break;
- case Qt::LocalDate : // local settings
+ case TQt::LocalDate : // local settings
a_format = TDEGlobal::locale()->dateFormat();
break;
@@ -377,7 +377,7 @@ int ExtDate::daysTo( const ExtDate & a_date) const
return a_date.jd() - jd();
}
-ExtDate ExtDate::currentDate(Qt::TimeSpec ts)
+ExtDate ExtDate::currentDate(TQt::TimeSpec ts)
{
time_t a_current_time;
struct tm a_current_time_tm;
@@ -404,19 +404,19 @@ ExtDate ExtDate::currentDate(Qt::TimeSpec ts)
//Try both DateFormat values
ExtDate ExtDate::fromString( const TQString& s )
{
- ExtDate dResult = ExtDate::fromString( s, Qt::TextDate );
+ ExtDate dResult = ExtDate::fromString( s, TQt::TextDate );
if ( dResult.isValid() ) return dResult;
- dResult = ExtDate::fromString( s, Qt::ISODate );
+ dResult = ExtDate::fromString( s, TQt::ISODate );
if ( dResult.isValid() ) return dResult;
else return ExtDate(); //invalid
}
-ExtDate ExtDate::fromString( const TQString& s, Qt::DateFormat f )
+ExtDate ExtDate::fromString( const TQString& s, TQt::DateFormat f )
{
ExtDate dt = ExtDate(); //initialize invalid date
if ( s.isEmpty() ) { return dt; }
- if ( f == Qt::LocalDate ) { //can't use LocalFormat
+ if ( f == TQt::LocalDate ) { //can't use LocalFormat
#if defined(TQT_CHECK_RANGE)
tqWarning( "TQDate::fromString: Parameter out of range" );
#endif
@@ -424,7 +424,7 @@ ExtDate ExtDate::fromString( const TQString& s, Qt::DateFormat f )
}
switch( f ) {
- case Qt::ISODate :
+ case TQt::ISODate :
{
int year( s.mid( 0, 4 ).toInt() );
int month( s.mid( 5, 2 ).toInt() );
@@ -437,7 +437,7 @@ ExtDate ExtDate::fromString( const TQString& s, Qt::DateFormat f )
default :
#ifndef TQT_NO_TEXTDATE
- case Qt::TextDate :
+ case TQt::TextDate :
{
//Three possible date formats:
//dd mth yyyy; mth dd yyyy; wkd mth dd yyyy
@@ -706,7 +706,7 @@ uint ExtDateTime::toTime_t() const
void ExtDateTime::setTime_t( uint secsSince1Jan1970UTC )
{
- setTime_t( secsSince1Jan1970UTC, Qt::LocalTime );
+ setTime_t( secsSince1Jan1970UTC, TQt::LocalTime );
}
/*!
@@ -721,7 +721,7 @@ void ExtDateTime::setTime_t( uint secsSince1Jan1970UTC )
\sa toTime_t()
*/
-void ExtDateTime::setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec ts )
+void ExtDateTime::setTime_t( uint secsSince1Jan1970UTC, TQt::TimeSpec ts )
{
time_t tmp = (time_t) secsSince1Jan1970UTC;
tm *brokenDown = 0;
@@ -771,16 +771,16 @@ void ExtDateTime::setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec ts )
Returns the datetime as a string. The \a f parameter determines
the format of the string.
- If \a f is \c Qt::TextDate, the string format is "Wed May 20
+ If \a f is \c TQt::TextDate, the string format is "Wed May 20
03:40:13 1998" (using ExtDate::shortDayName(), ExtDate::shortMonthName(),
and TQTime::toString() to generate the string, so the day and month
names will have localized names).
- If \a f is \c Qt::ISODate, the string format corresponds to the
+ If \a f is \c TQt::ISODate, the string format corresponds to the
ISO 8601 extended specification for representations of dates and
times, which is YYYY-MM-DDTHH:MM:SS.
- If \a f is \c Qt::LocalDate, the string format depends on the
+ If \a f is \c TQt::LocalDate, the string format depends on the
locale settings of the system.
If the format \a f is invalid or the datetime is invalid, toString()
@@ -789,20 +789,20 @@ void ExtDateTime::setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec ts )
\sa ExtDate::toString() TQTime::toString()
*/
-TQString ExtDateTime::toString( Qt::DateFormat f ) const
+TQString ExtDateTime::toString( TQt::DateFormat f ) const
{
if ( !isValid() )
return TQString();
- if ( f == Qt::ISODate ) {
- return d.toString( Qt::ISODate ) + "T" + t.toString( Qt::ISODate );
+ if ( f == TQt::ISODate ) {
+ return d.toString( TQt::ISODate ) + "T" + t.toString( TQt::ISODate );
}
#ifndef TQT_NO_TEXTDATE
- else if ( f == Qt::TextDate ) {
+ else if ( f == TQt::TextDate ) {
return toString( "%a %b %e %Y %H:%M:%S" );
}
#endif
- else if ( f == Qt::LocalDate ) {
+ else if ( f == TQt::LocalDate ) {
return toString( TDEGlobal::locale()->dateFormat()
+ " " + TDEGlobal::locale()->timeFormat() );
}
@@ -1028,17 +1028,17 @@ bool ExtDateTime::operator>=( const ExtDateTime &dt ) const
ExtDateTime ExtDateTime::currentDateTime()
{
- return currentDateTime( Qt::LocalTime );
+ return currentDateTime( TQt::LocalTime );
}
/*!
Returns the current datetime, as reported by the system clock, for the
TimeSpec \a ts. The default TimeSpec is LocalTime.
- \sa ExtDate::currentDate(), TQTime::currentTime(), Qt::TimeSpec
+ \sa ExtDate::currentDate(), TQTime::currentTime(), TQt::TimeSpec
*/
-ExtDateTime ExtDateTime::currentDateTime( Qt::TimeSpec ts )
+ExtDateTime ExtDateTime::currentDateTime( TQt::TimeSpec ts )
{
ExtDateTime dt;
dt.setDate( ExtDate::currentDate(ts) );
@@ -1054,28 +1054,28 @@ ExtDateTime ExtDateTime::currentDateTime( Qt::TimeSpec ts )
Returns the ExtDateTime represented by the string \a s, using the
format \a f, or an invalid datetime if this is not possible.
- Note for \c Qt::TextDate: It is recommended that you use the
+ Note for \c TQt::TextDate: It is recommended that you use the
English short month names (e.g. "Jan"). Although localized month
names can also be used, they depend on the user's locale settings.
- \warning Note that \c Qt::LocalDate cannot be used here.
+ \warning Note that \c TQt::LocalDate cannot be used here.
*/
ExtDateTime ExtDateTime::fromString( const TQString& s )
{
- ExtDateTime dtResult = ExtDateTime::fromString( s, Qt::TextDate );
+ ExtDateTime dtResult = ExtDateTime::fromString( s, TQt::TextDate );
if ( dtResult.isValid() ) return dtResult;
- dtResult = ExtDateTime::fromString( s, Qt::ISODate );
+ dtResult = ExtDateTime::fromString( s, TQt::ISODate );
if ( dtResult.isValid() ) return dtResult;
else return ExtDateTime(); //invalid
}
-ExtDateTime ExtDateTime::fromString( const TQString& s, Qt::DateFormat f )
+ExtDateTime ExtDateTime::fromString( const TQString& s, TQt::DateFormat f )
{
ExtDateTime dt;
- if ( ( s.isEmpty() ) || ( f == Qt::LocalDate ) ) {
+ if ( ( s.isEmpty() ) || ( f == TQt::LocalDate ) ) {
#if defined(TQT_CHECK_RANGE)
tqWarning( "ExtDateTime::fromString: Parameter out of range" );
#endif
@@ -1083,17 +1083,17 @@ ExtDateTime ExtDateTime::fromString( const TQString& s, Qt::DateFormat f )
return dt;
}
- if ( f == Qt::ISODate ) {
+ if ( f == TQt::ISODate ) {
if ( s.length() <= 10 || ! s.contains( ':' ) ) { //no time specified
TQTime t = TQTime(0,0,0);
- return ExtDateTime( ExtDate::fromString( s.mid(0,10), Qt::ISODate ) );
+ return ExtDateTime( ExtDate::fromString( s.mid(0,10), TQt::ISODate ) );
} else {
- return ExtDateTime( ExtDate::fromString( s.mid(0,10), Qt::ISODate ),
- TQTime::fromString( s.mid(11), Qt::ISODate ) );
+ return ExtDateTime( ExtDate::fromString( s.mid(0,10), TQt::ISODate ),
+ TQTime::fromString( s.mid(11), TQt::ISODate ) );
}
}
#if !defined(TQT_NO_REGEXP) && !defined(TQT_NO_TEXTDATE)
- else if ( f == Qt::TextDate ) {
+ else if ( f == TQt::TextDate ) {
//parse the time, if it exists.
TQTime time;
@@ -1110,7 +1110,7 @@ ExtDateTime ExtDateTime::fromString( const TQString& s, Qt::DateFormat f )
}
//sd is now just the date string.
- ExtDate date = ExtDate::fromString( s, Qt::TextDate );
+ ExtDate date = ExtDate::fromString( s, TQt::TextDate );
return ExtDateTime( date, time );
}
diff --git a/libtdeedu/extdate/extdatetime.h b/libtdeedu/extdate/extdatetime.h
index 61ddf126..7e0a64b0 100644
--- a/libtdeedu/extdate/extdatetime.h
+++ b/libtdeedu/extdate/extdatetime.h
@@ -65,7 +65,7 @@ public:
#endif //TQT_NO_TEXTDATE
#ifndef TQT_NO_TEXTSTRING
#if !defined(TQT_NO_SPRINTF)
- TQString toString( Qt::DateFormat f = Qt::TextDate ) const;
+ TQString toString( TQt::DateFormat f = TQt::TextDate ) const;
#endif
TQString toString( const TQString& format ) const;
#endif
@@ -84,10 +84,10 @@ public:
bool operator>( const ExtDate &d ) const { return m_jd > d.jd(); }
bool operator>=( const ExtDate &d ) const { return m_jd >= d.jd(); }
- static ExtDate currentDate( Qt::TimeSpec ts = Qt::LocalTime );
+ static ExtDate currentDate( TQt::TimeSpec ts = TQt::LocalTime );
#ifndef TQT_NO_DATESTRING
static ExtDate fromString( const TQString &s );
- static ExtDate fromString( const TQString &s, Qt::DateFormat f );
+ static ExtDate fromString( const TQString &s, TQt::DateFormat f );
#endif
static bool isValid( int y, int m, int d );
static bool leapYear( int year );
@@ -137,10 +137,10 @@ public:
void setDate( const ExtDate &date ) { d = date; }
void setTime( const TQTime &time ) { t = time; }
void setTime_t( uint secsSince1Jan1970UTC );
- void setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec );
+ void setTime_t( uint secsSince1Jan1970UTC, TQt::TimeSpec );
#ifndef TQT_NO_DATESTRING
#ifndef TQT_NO_SPRINTF
- TQString toString( Qt::DateFormat f = Qt::TextDate ) const;
+ TQString toString( TQt::DateFormat f = TQt::TextDate ) const;
#endif
TQString toString( const TQString& format ) const;
#endif
@@ -159,10 +159,10 @@ public:
bool operator>=( const ExtDateTime &dt ) const;
static ExtDateTime currentDateTime();
- static ExtDateTime currentDateTime( Qt::TimeSpec );
+ static ExtDateTime currentDateTime( TQt::TimeSpec );
#ifndef TQT_NO_DATESTRING
static ExtDateTime fromString( const TQString &s );
- static ExtDateTime fromString( const TQString &s, Qt::DateFormat f );
+ static ExtDateTime fromString( const TQString &s, TQt::DateFormat f );
#endif
private:
ExtDate d;
diff --git a/libtdeedu/extdate/extdatetimeedit.cpp b/libtdeedu/extdate/extdatetimeedit.cpp
index e351f440..8449c044 100644
--- a/libtdeedu/extdate/extdatetimeedit.cpp
+++ b/libtdeedu/extdate/extdatetimeedit.cpp
@@ -112,7 +112,7 @@ static void readLocaleSettings()
*lDateSep = "-";
*lTimeSep = ":";
#endif
- TQString d = ExtDate( 1999, 11, 22 ).toString( Qt::LocalDate );
+ TQString d = ExtDate( 1999, 11, 22 ).toString( TQt::LocalDate );
dpos = d.find( "22" );
mpos = d.find( "11" );
ypos = d.find( "99" );
@@ -142,7 +142,7 @@ static void readLocaleSettings()
}
#ifndef TQ_WS_WIN
- TQString t = TQTime( 11, 22, 33 ).toString( Qt::LocalDate );
+ TQString t = TQTime( 11, 22, 33 ).toString( TQt::LocalDate );
dpos = t.find( "11" );
mpos = t.find( "22" );
ypos = t.find( "33" );