summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kamera/kcontrol/kameraconfigdialog.cpp4
-rw-r--r--kcoloredit/colorselector.cpp2
-rw-r--r--kcoloredit/gradientselection.cpp2
-rw-r--r--kcoloredit/kzcolorselector.cpp2
-rw-r--r--kcoloredit/kzcolorselector.h2
-rw-r--r--kcoloredit/paletteview.cpp2
-rw-r--r--kdvi/dviWidget.cpp2
-rw-r--r--kdvi/kdvi_multipage.cpp2
-rw-r--r--kfax/faxinput.cpp2
-rw-r--r--kfax/kfax.cpp4
-rw-r--r--kfax/options.cpp2
-rw-r--r--kfaxview/libkfaximage/kfaximage.cpp2
-rw-r--r--kgamma/kcmkgamma/gammactrl.cpp2
-rw-r--r--kghostview/dscparse/dscparse.cpp36
-rw-r--r--kghostview/dscparse/dscparse.h4
-rw-r--r--kghostview/fullscreenfilter.cpp2
-rw-r--r--kghostview/kgvpageview.cpp10
-rw-r--r--kghostview/scrollbox.cpp6
-rw-r--r--kolourpaint/kptool.cpp18
-rw-r--r--kolourpaint/kpview.cpp2
-rw-r--r--kolourpaint/kpviewscrollablecontainer.cpp6
-rw-r--r--kolourpaint/patches/checkerboard-faster-render.diff2
-rw-r--r--kolourpaint/patches/doc_resize_no_flicker.diff12
-rw-r--r--kolourpaint/pixmapfx/kpeffectreducecolors.cpp8
-rw-r--r--kolourpaint/tools/kptoolpolygon.cpp22
-rw-r--r--kolourpaint/tools/kptoolpolygon.h4
-rw-r--r--kolourpaint/tools/kptoolrectangle.cpp8
-rw-r--r--kolourpaint/widgets/kpcolortoolbar.cpp36
-rw-r--r--kolourpaint/widgets/kpcolortoolbar.h20
-rw-r--r--kolourpaint/widgets/kptooltoolbar.cpp16
-rw-r--r--kolourpaint/widgets/kptooltoolbar.h6
-rw-r--r--kolourpaint/widgets/kptoolwidgetbase.cpp2
-rw-r--r--kolourpaint/widgets/kptoolwidgetfillstyle.cpp12
-rw-r--r--kooka/imgprintdialog.cpp2
-rw-r--r--kooka/kocrbase.cpp4
-rw-r--r--kooka/kocrkadmos.cpp6
-rw-r--r--kooka/kookapref.cpp2
-rw-r--r--kooka/ksaneocr.cpp2
-rw-r--r--kpdf/conf/kpdf.kcfg4
-rw-r--r--kpdf/ui/minibar.cpp4
-rw-r--r--kpdf/ui/pageview.cpp20
-rw-r--r--kpdf/ui/presentationwidget.cpp8
-rw-r--r--kpdf/ui/thumbnaillist.cpp4
-rw-r--r--kpovmodeler/pmdockwidget.cpp22
-rw-r--r--kpovmodeler/pmdockwidget.h2
-rw-r--r--kpovmodeler/pmdockwidget_private.cpp22
-rw-r--r--kpovmodeler/pmdockwidget_private.h6
-rw-r--r--kpovmodeler/pmglview.cpp10
-rw-r--r--kpovmodeler/pmtreeview.cpp4
-rw-r--r--kpovmodeler/pmvectorlistedit.cpp2
-rw-r--r--kpovmodeler/pmview.cpp4
-rw-r--r--kpovmodeler/pmviewlayoutmanager.cpp2
-rw-r--r--kruler/klineal.cpp6
-rw-r--r--ksnapshot/ksnapshot.cpp2
-rw-r--r--ksnapshot/regiongrabber.cpp2
-rw-r--r--ksnapshot/windowgrabber.cpp4
-rw-r--r--ksvg/impl/SVGGlyphElementImpl.cpp2
-rw-r--r--ksvg/plugin/ksvg_widget.cpp10
-rw-r--r--ksvg/test/external/SVGTestWidget.cpp6
-rw-r--r--kuickshow/src/aboutwidget.cpp2
-rw-r--r--kuickshow/src/defaultswidget.cpp4
-rw-r--r--kuickshow/src/imagewindow.cpp6
-rw-r--r--kuickshow/src/imlibwidget.cpp2
-rw-r--r--kuickshow/src/kuickshow.cpp2
-rw-r--r--kuickshow/src/printing.cpp2
-rw-r--r--kview/kview.cpp2
-rw-r--r--kview/kviewcanvas/kimagecanvas.cpp8
-rw-r--r--kview/kviewcanvas/kimageholder.cpp10
-rw-r--r--kviewshell/documentWidget.cpp10
-rw-r--r--kviewshell/kviewshell.kcfg2
-rw-r--r--kviewshell/marklist.cpp6
-rw-r--r--kviewshell/pageView.cpp4
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuAnno.h4
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuText.cpp2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuText.h4
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GRect.h4
-rw-r--r--kviewshell/plugins/djvu/libdjvu/JB2Image.h4
-rw-r--r--kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp4
-rw-r--r--libkscan/devselector.cpp2
-rw-r--r--libkscan/img_canvas.cpp4
-rw-r--r--libkscan/imgscaledialog.cpp2
-rw-r--r--libkscan/kscanslider.cpp2
-rw-r--r--libkscan/previewer.cpp8
-rw-r--r--libkscan/scandialog.cpp4
-rw-r--r--libkscan/scanparams.cpp2
-rw-r--r--tdefile-plugins/RETURNED_ITEMS2
-rw-r--r--tdefile-plugins/raw/parse.c2
-rw-r--r--tdeiconedit/kresize.cpp2
-rw-r--r--tdeiconedit/palettetoolbar.cpp8
-rw-r--r--tdeiconedit/palettetoolbar.h2
-rw-r--r--tdeiconedit/tdeiconconfig.cpp6
-rw-r--r--tdeiconedit/tdeicongrid.cpp8
92 files changed, 280 insertions, 280 deletions
diff --git a/kamera/kcontrol/kameraconfigdialog.cpp b/kamera/kcontrol/kameraconfigdialog.cpp
index 9806ff65..6571d7a3 100644
--- a/kamera/kcontrol/kameraconfigdialog.cpp
+++ b/kamera/kcontrol/kameraconfigdialog.cpp
@@ -104,7 +104,7 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
{
gp_widget_get_value(widget, &widget_value_string);
- TQGrid *grid = new TQGrid(2,Qt::Horizontal, parent);
+ TQGrid *grid = new TQGrid(2,TQt::Horizontal, parent);
grid->setSpacing(spacingHint());
new TQLabel(TQString::fromLocal8Bit( widget_label )+":", grid);
TQLineEdit *lineEdit = new TQLineEdit(widget_value_string, grid);
@@ -129,7 +129,7 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
( int )widget_high,
( int )widget_increment,
( int )widget_value_float,
- Qt::Horizontal,
+ TQt::Horizontal,
groupBox );
m_wmap.insert(widget, slider);
diff --git a/kcoloredit/colorselector.cpp b/kcoloredit/colorselector.cpp
index 6dfbf08a..30b1fc3a 100644
--- a/kcoloredit/colorselector.cpp
+++ b/kcoloredit/colorselector.cpp
@@ -73,7 +73,7 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par
TQVBoxLayout* colorChangeSliderLayout = new TQVBoxLayout(colorChangeSliderWidget, 1);
colorChangeSliderLayout->setMargin(0);
TQSlider* colorChangeSlider = new TQSlider(0, MAX_COLOR_CHANGE_VALUE,
- MAX_COLOR_CHANGE_VALUE/4, colorChangeValue, Qt::Horizontal, colorChangeSliderWidget);
+ MAX_COLOR_CHANGE_VALUE/4, colorChangeValue, TQt::Horizontal, colorChangeSliderWidget);
colorChangeSlider->setTickInterval(colorChangeSlider->pageStep());
colorChangeSlider->setTickmarks(TQSlider::Above);
connect(colorChangeSlider, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotColorChangeValueChanged(int) ));
diff --git a/kcoloredit/gradientselection.cpp b/kcoloredit/gradientselection.cpp
index df0769d0..04fc2200 100644
--- a/kcoloredit/gradientselection.cpp
+++ b/kcoloredit/gradientselection.cpp
@@ -54,7 +54,7 @@ GradientSelection::GradientSelection(TQWidget *parent, const char *name ) : TQWi
xyColorSelectorLayout->addLayout(buttonsLayout);
xyColorSelectorLayout->addSpacing(2);
topLayout->addLayout(xyColorSelectorLayout, 1, 0);
- zColorSelector = new KZColorSelector(Qt::Vertical, this);
+ zColorSelector = new KZColorSelector(TQt::Vertical, this);
connect(zColorSelector, TQT_SIGNAL( valueChanged(int) ),
TQT_SLOT( slotZColorSelectorPosChanged(int) ));
zColorSelector->setFixedWidth(36);
diff --git a/kcoloredit/kzcolorselector.cpp b/kcoloredit/kzcolorselector.cpp
index f753649e..6d4aa1cb 100644
--- a/kcoloredit/kzcolorselector.cpp
+++ b/kcoloredit/kzcolorselector.cpp
@@ -23,7 +23,7 @@
#include "main.h"
#include "kzcolorselector.h"
-KZColorSelector::KZColorSelector(Qt::Orientation o, TQWidget *parent, const char *name) :
+KZColorSelector::KZColorSelector(TQt::Orientation o, TQWidget *parent, const char *name) :
TDESelector(o, parent, name) {
baseColorH = -1;
baseColorS = 0;
diff --git a/kcoloredit/kzcolorselector.h b/kcoloredit/kzcolorselector.h
index 4bb98d1a..23f1f1d4 100644
--- a/kcoloredit/kzcolorselector.h
+++ b/kcoloredit/kzcolorselector.h
@@ -38,7 +38,7 @@ public:
TYPE_V = 2 };
/** Constructs the widget */
- KZColorSelector(Qt::Orientation o, TQWidget *parent=0, const char *name=0);
+ KZColorSelector(TQt::Orientation o, TQWidget *parent=0, const char *name=0);
~KZColorSelector();
/** Sets the selector type */
void setType(const int type);
diff --git a/kcoloredit/paletteview.cpp b/kcoloredit/paletteview.cpp
index 52e8b4be..637d88f4 100644
--- a/kcoloredit/paletteview.cpp
+++ b/kcoloredit/paletteview.cpp
@@ -32,7 +32,7 @@ PaletteView::PaletteView(const int defaultCellWidth, const int defaultCellHeight
topLayout->setColStretch(0, 10);
topLayout->setColStretch(1, 0);
scrollBar = new TQScrollBar(this);
- hScrollBar = new TQScrollBar(0, 1, 1, 1, 0, Qt::Horizontal, this);
+ hScrollBar = new TQScrollBar(0, 1, 1, 1, 0, TQt::Horizontal, this);
scrolledArea = new PaletteViewScrolledArea(defaultCellWidth,
defaultCellHeight, cellSpacing, scrollBar, hScrollBar, view, this);
connect(scrollBar, TQT_SIGNAL( valueChanged(int) ),
diff --git a/kdvi/dviWidget.cpp b/kdvi/dviWidget.cpp
index 8b8545b6..614a2704 100644
--- a/kdvi/dviWidget.cpp
+++ b/kdvi/dviWidget.cpp
@@ -45,7 +45,7 @@ void DVIWidget::mousePressEvent(TQMouseEvent* e)
// Check if the mouse is pressed on a source-hyperlink
// source hyperlinks can be invoked with the Middle Mousebutton or alternatively
// with Control+Left Mousebutton
- if ((e->button() == Qt::MidButton || (e->button() == Qt::LeftButton && (e->state() & ControlButton)))
+ if ((e->button() == TQt::MidButton || (e->button() == TQt::LeftButton && (e->state() & ControlButton)))
&& (pageData->sourceHyperLinkList.size() > 0))
{
int minIndex = 0;
diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp
index 2da7abc2..39be9b31 100644
--- a/kdvi/kdvi_multipage.cpp
+++ b/kdvi/kdvi_multipage.cpp
@@ -365,7 +365,7 @@ void KDVIMultiPage::print()
default:
break;
}
- // Qt::Orientation
+ // Orientation
if ( printer->orientation() == KPrinter::Landscape )
dvips_options += "-t landscape ";
diff --git a/kfax/faxinput.cpp b/kfax/faxinput.cpp
index b0f7495f..b70dc40f 100644
--- a/kfax/faxinput.cpp
+++ b/kfax/faxinput.cpp
@@ -215,7 +215,7 @@ notetiff(const char *name)
get2(buf, endian) : get4(buf, endian);
}
break;
- case 274: /* Qt::Orientation */
+ case 274: /* Orientation */
switch(value) {
default: /* row0 at top, col0 at left */
orient = 0;
diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp
index 716bcbb6..c33ec78d 100644
--- a/kfax/kfax.cpp
+++ b/kfax/kfax.cpp
@@ -211,13 +211,13 @@ TopLevel::TopLevel (TQWidget *, const char *name)
// Create a Vertical scroll bar
- vsb = new TQScrollBar( Qt::Vertical,faxqtwin,"scrollBar" );
+ vsb = new TQScrollBar( TQt::Vertical,faxqtwin,"scrollBar" );
vsb->hide();
connect( vsb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrollVert(int)) );
// Create a Horizontal scroll bar
- hsb = new TQScrollBar( Qt::Horizontal,faxqtwin,"scrollBar" );
+ hsb = new TQScrollBar( TQt::Horizontal,faxqtwin,"scrollBar" );
connect( hsb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrollHorz(int)) );
hsb->hide();
diff --git a/kfax/options.cpp b/kfax/options.cpp
index 756eac62..a1f7e019 100644
--- a/kfax/options.cpp
+++ b/kfax/options.cpp
@@ -57,7 +57,7 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name)
TQVBoxLayout *mainLayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
bg = new TQGroupBox(mainWidget,"bg");
- bg->setColumnLayout( 0, Qt::Horizontal );
+ bg->setColumnLayout( 0, TQt::Horizontal );
mainLayout->addWidget( bg );
TQVBoxLayout *vbl = new TQVBoxLayout(bg->layout());
diff --git a/kfaxview/libkfaximage/kfaximage.cpp b/kfaxview/libkfaximage/kfaximage.cpp
index 4c209072..6da8486c 100644
--- a/kfaxview/libkfaximage/kfaximage.cpp
+++ b/kfaxview/libkfaximage/kfaximage.cpp
@@ -293,7 +293,7 @@ KFaxImage::notetiff()
get2(buf, endian) : get4(buf, endian);
}
break;
- case 274: /* Qt::Orientation */
+ case 274: /* Orientation */
switch(value) {
default: /* row0 at top, col0 at left */
orient = 0;
diff --git a/kgamma/kcmkgamma/gammactrl.cpp b/kgamma/kcmkgamma/gammactrl.cpp
index 4cb49405..3596c8c2 100644
--- a/kgamma/kcmkgamma/gammactrl.cpp
+++ b/kgamma/kcmkgamma/gammactrl.cpp
@@ -47,7 +47,7 @@ GammaCtrl::GammaCtrl(TQWidget *parent, XVidExtWrap *xvid, int channel, \
setSpacing(KDialog::spacingHint());
- slider = new TQSlider(Qt::Horizontal, this);
+ slider = new TQSlider(TQt::Horizontal, this);
slider->setFixedHeight(24);
slider->setTickmarks(TQSlider::Below);
slider->setRange(0, maxslider);
diff --git a/kghostview/dscparse/dscparse.cpp b/kghostview/dscparse/dscparse.cpp
index ba473cc8..e31b9edd 100644
--- a/kghostview/dscparse/dscparse.cpp
+++ b/kghostview/dscparse/dscparse.cpp
@@ -2026,7 +2026,7 @@ dsc_scan_comments(CDSC *dsc)
continued ? 3 : 10))
return CDSC_ERROR;
}
- else if (IS_DSC(line, "%%Qt::Orientation:")) {
+ else if (IS_DSC(line, "%%Orientation:")) {
dsc->id = CDSC_ORIENTATION;
if (dsc_parse_orientation(dsc, &(dsc->page_orientation),
continued ? 3 : 14))
@@ -2330,7 +2330,7 @@ dsc_scan_defaults(CDSC *dsc)
}
else if (IS_DSC(line, "%%PageQt::Orientation:")) {
dsc->id = CDSC_PAGEORIENTATION;
- /* This can override %%Qt::Orientation: */
+ /* This can override %%Orientation: */
if (dsc_parse_orientation(dsc, &(dsc->page_orientation), 18))
return CDSC_ERROR;
}
@@ -2936,30 +2936,30 @@ dsc_scan_page(CDSC *dsc)
* %%DocumentProcessColors:
* %%DocumentSuppliedFiles:
* %%DocumentSuppliedFonts:
- * %%DocumentSuppliedProcSets:
- * %%DocumentSuppliedResources:
- * %%Qt::Orientation:
- * %%Pages:
- * %%PageOrder:
+ * %%DocumentSuppliedProcSets:
+ * %%DocumentSuppliedResources:
+ * %%Orientation:
+ * %%Pages:
+ * %%PageOrder:
*
* Our supported subset is
* %%Trailer
* %%EOF
* %%BoundingBox:
- * %%Qt::Orientation:
- * %%Pages:
- * %%PageOrder:
+ * %%Orientation:
+ * %%Pages:
+ * %%PageOrder:
* In addition to these, we support
* %%DocumentMedia:
*
* A %%PageTrailer can have the following:
- * %%PageBoundingBox:
- * %%PageCustomColors:
- * %%PageFiles:
- * %%PageFonts:
- * %%PageQt::Orientation:
- * %%PageProcessColors:
- * %%PageResources:
+ * %%PageBoundingBox:
+ * %%PageCustomColors:
+ * %%PageFiles:
+ * %%PageFonts:
+ * %%PageQt::Orientation:
+ * %%PageProcessColors:
+ * %%PageResources:
*/
dsc_private int
@@ -3052,7 +3052,7 @@ dsc_scan_trailer(CDSC *dsc)
continued ? 3 : 10))
return CDSC_ERROR;
}
- else if (IS_DSC(line, "%%Qt::Orientation:")) {
+ else if (IS_DSC(line, "%%Orientation:")) {
dsc->id = CDSC_ORIENTATION;
if (dsc_parse_orientation(dsc, &(dsc->page_orientation), continued ? 3 : 14))
return CDSC_ERROR;
diff --git a/kghostview/dscparse/dscparse.h b/kghostview/dscparse/dscparse.h
index d290c0d4..77b670a0 100644
--- a/kghostview/dscparse/dscparse.h
+++ b/kghostview/dscparse/dscparse.h
@@ -98,7 +98,7 @@ typedef enum {
CDSC_FOR = 207, /* %%For: */
CDSC_LANGUAGELEVEL = 208, /* %%LanguageLevel: */
CDSC_BOUNDINGBOX = 209, /* %%BoundingBox: */
- CDSC_ORIENTATION = 210, /* %%Qt::Orientation: */
+ CDSC_ORIENTATION = 210, /* %%Orientation: */
CDSC_PAGEORDER = 211, /* %%PageOrder: */
CDSC_DOCUMENTMEDIA = 212, /* %%DocumentMedia: */
CDSC_DOCUMENTPAPERSIZES = 213, /* %%DocumentPaperSizes: */
@@ -159,7 +159,7 @@ typedef enum {
/* Trailer section */
CDSC_TRAILER = 800, /* %%Trailer */
-/* also %%Pages, %%BoundingBox, %%Qt::Orientation, %%PageOrder, %%DocumentMedia */
+/* also %%Pages, %%BoundingBox, %%Orientation, %%PageOrder, %%DocumentMedia */
/* %%Page is recognised as an error */
/* also %%DocumentNeededFonts, %%DocumentSuppliedFonts */
diff --git a/kghostview/fullscreenfilter.cpp b/kghostview/fullscreenfilter.cpp
index b42a6277..4c269028 100644
--- a/kghostview/fullscreenfilter.cpp
+++ b/kghostview/fullscreenfilter.cpp
@@ -37,7 +37,7 @@ bool FullScreenFilter::eventFilter( TQObject* /*object*/, TQEvent* ev) {
}
}
if ( TQMouseEvent* mouseevent = dynamic_cast<TQMouseEvent*>( ev ) ) {
- if ( mouseevent->stateAfter() & mouseevent->button() & Qt::LeftButton ) {
+ if ( mouseevent->stateAfter() & mouseevent->button() & TQt::LeftButton ) {
// if ( The whole image is visible at once )
if ( parent.m_gvpart->pageView()->contentsHeight() <= parent.m_gvpart->widget()->height() &&
parent.m_gvpart->pageView()->contentsWidth() <= parent.m_gvpart->widget()->width() ) {
diff --git a/kghostview/kgvpageview.cpp b/kghostview/kgvpageview.cpp
index 121f3afe..10651383 100644
--- a/kghostview/kgvpageview.cpp
+++ b/kghostview/kgvpageview.cpp
@@ -88,16 +88,16 @@ void KGVPageView::wheelEvent( TQWheelEvent *e )
}
void KGVPageView::mousePressEvent( TQMouseEvent * e )
{
- if ( e->button() & Qt::LeftButton )
+ if ( e->button() & TQt::LeftButton )
{
_dragGrabPos = e -> globalPos();
setCursor( sizeAllCursor );
}
- else if ( e->button() & Qt::MidButton )
+ else if ( e->button() & TQt::MidButton )
{
emit ReadDown();
}
- else if ( e -> button() & Qt::RightButton )
+ else if ( e -> button() & TQt::RightButton )
{
emit rightClick();
}
@@ -105,7 +105,7 @@ void KGVPageView::mousePressEvent( TQMouseEvent * e )
void KGVPageView::mouseReleaseEvent( TQMouseEvent *e )
{
- if ( e -> button() & Qt::LeftButton )
+ if ( e -> button() & TQt::LeftButton )
{
setCursor( arrowCursor );
}
@@ -113,7 +113,7 @@ void KGVPageView::mouseReleaseEvent( TQMouseEvent *e )
void KGVPageView::mouseMoveEvent( TQMouseEvent * e )
{
- if ( e->state() & Qt::LeftButton )
+ if ( e->state() & TQt::LeftButton )
{
TQPoint delta = _dragGrabPos - e->globalPos();
scrollBy( delta.x(), delta.y() );
diff --git a/kghostview/scrollbox.cpp b/kghostview/scrollbox.cpp
index e50f353a..10b1a6eb 100644
--- a/kghostview/scrollbox.cpp
+++ b/kghostview/scrollbox.cpp
@@ -31,15 +31,15 @@ ScrollBox::ScrollBox( TQWidget* parent, const char* name )
void ScrollBox::mousePressEvent( TQMouseEvent* e )
{
mouse = e->pos();
- if( e->button() == Qt::RightButton )
+ if( e->button() == TQt::RightButton )
emit button3Pressed();
- if( e->button() == Qt::MidButton )
+ if( e->button() == TQt::MidButton )
emit button2Pressed();
}
void ScrollBox::mouseMoveEvent( TQMouseEvent* e )
{
- if( e->state() != Qt::LeftButton )
+ if( e->state() != TQt::LeftButton )
return;
int dx = ( e->pos().x() - mouse.x() ) * pagesize.width() / width();
diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp
index fea1cf58..ff6a3271 100644
--- a/kolourpaint/kptool.cpp
+++ b/kolourpaint/kptool.cpp
@@ -942,7 +942,7 @@ void kpTool::mousePressEvent (TQMouseEvent *e)
// state of all the buttons - not just the one that triggered the event (button())
TQt::ButtonState buttonState = e->stateAfter ();
- if (m_mainWindow && e->button () == Qt::MidButton)
+ if (m_mainWindow && e->button () == TQt::MidButton)
{
const TQString text = TQApplication::clipboard ()->text (TQClipboard::Selection);
#if DEBUG_KP_TOOL && 1
@@ -1133,7 +1133,7 @@ void kpTool::mouseReleaseEvent (TQMouseEvent *e)
endDrawInternal (m_currentPoint, TQRect (m_startPoint, m_currentPoint).normalize ());
}
- if ((e->stateAfter () & Qt::MouseButtonMask) == 0)
+ if ((e->stateAfter () & TQt::MouseButtonMask) == 0)
{
releasedAllButtons ();
}
@@ -1239,7 +1239,7 @@ void kpTool::keyPressEvent (TQKeyEvent *e)
// TODO: what about the modifiers
TQMouseEvent me (TQEvent::MouseButtonPress,
view->mapFromGlobal (TQCursor::pos ()),
- Qt::LeftButton,
+ TQt::LeftButton,
0);
mousePressEvent (&me);
e->accept ();
@@ -1336,8 +1336,8 @@ void kpTool::keyReleaseEvent (TQKeyEvent *e)
{
TQMouseEvent me (TQEvent::MouseButtonRelease,
view->mapFromGlobal (TQCursor::pos ()),
- Qt::LeftButton,
- Qt::LeftButton);
+ TQt::LeftButton,
+ TQt::LeftButton);
mouseReleaseEvent (&me);
e->accept ();
}
@@ -1469,17 +1469,17 @@ void kpTool::leaveEvent (TQEvent *)
int kpTool::mouseButton (const TQt::ButtonState &buttonState)
{
// we have nothing to do with mid-buttons
- if (buttonState & Qt::MidButton)
+ if (buttonState & TQt::MidButton)
return -1;
// both left & right together is quite meaningless...
- TQt::ButtonState bothButtons = (TQt::ButtonState) (Qt::LeftButton | Qt::RightButton);
+ TQt::ButtonState bothButtons = (TQt::ButtonState) (TQt::LeftButton | TQt::RightButton);
if ((buttonState & bothButtons) == bothButtons)
return -1;
- if (buttonState & Qt::LeftButton)
+ if (buttonState & TQt::LeftButton)
return 0;
- else if (buttonState & Qt::RightButton)
+ else if (buttonState & TQt::RightButton)
return 1;
else
return -1;
diff --git a/kolourpaint/kpview.cpp b/kolourpaint/kpview.cpp
index 8c979816..da3097e1 100644
--- a/kolourpaint/kpview.cpp
+++ b/kolourpaint/kpview.cpp
@@ -1343,7 +1343,7 @@ void kpView::paintEventDrawSelection (TQPixmap *destPixmap, const TQRect &docRec
destPixmapPainter.setRasterOp (TQt::XorROP);
destPixmapPainter.setPen (TQPen (TQt::white, 1, TQt::DotLine));
- destPixmapPainter.setBackgroundMode (Qt::OpaqueMode);
+ destPixmapPainter.setBackgroundMode (TQt::OpaqueMode);
destPixmapPainter.setBackgroundColor (TQt::blue);
TQBitmap maskBitmap;
diff --git a/kolourpaint/kpviewscrollablecontainer.cpp b/kolourpaint/kpviewscrollablecontainer.cpp
index 50d6ec9c..65b0da89 100644
--- a/kolourpaint/kpviewscrollablecontainer.cpp
+++ b/kolourpaint/kpviewscrollablecontainer.cpp
@@ -234,7 +234,7 @@ void kpGrip::keyReleaseEvent (TQKeyEvent *e)
void kpGrip::mousePressEvent (TQMouseEvent *e)
{
if (m_startPoint == KP_INVALID_POINT &&
- (e->stateAfter () & Qt::MouseButtonMask) == Qt::LeftButton)
+ (e->stateAfter () & TQt::MouseButtonMask) == TQt::LeftButton)
{
m_startPoint = e->pos ();
m_currentPoint = e->pos ();
@@ -290,7 +290,7 @@ void kpGrip::mouseMoveEvent (TQMouseEvent *e)
if (m_startPoint == KP_INVALID_POINT)
{
- if ((e->stateAfter () & Qt::MouseButtonMask) == 0)
+ if ((e->stateAfter () & TQt::MouseButtonMask) == 0)
setUserMessage (haventBegunDrawUserMessage ());
return;
}
@@ -320,7 +320,7 @@ void kpGrip::mouseReleaseEvent (TQMouseEvent *e)
(m_type & Bottom) ? dy : 0);
}
- if ((e->stateAfter () & Qt::MouseButtonMask) == 0)
+ if ((e->stateAfter () & TQt::MouseButtonMask) == 0)
{
m_shouldReleaseMouseButtons = false;
setUserMessage (TQString());
diff --git a/kolourpaint/patches/checkerboard-faster-render.diff b/kolourpaint/patches/checkerboard-faster-render.diff
index ed75fb0a..824106ca 100644
--- a/kolourpaint/patches/checkerboard-faster-render.diff
+++ b/kolourpaint/patches/checkerboard-faster-render.diff
@@ -44,7 +44,7 @@ QPainter::fillRect(). QPainter::drawPixmap() seems much faster. For
+ col = TQColor (224, 224, 224);
+ }
+ else
-+ col = Qt::white;
++ col = TQt::white;
+
+ painter.fillRect (x * cellSize, y * cellSize,
+ cellSize, cellSize,
diff --git a/kolourpaint/patches/doc_resize_no_flicker.diff b/kolourpaint/patches/doc_resize_no_flicker.diff
index ce3a74bd..2254286f 100644
--- a/kolourpaint/patches/doc_resize_no_flicker.diff
+++ b/kolourpaint/patches/doc_resize_no_flicker.diff
@@ -144,7 +144,7 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp
+
+ if (!redrawWidgetRegion.isEmpty ())
{
- // TODO: should be "!widget->testWFlags (Qt::WRepaintNoErase)"
+ // TODO: should be "!widget->testWFlags (TQt::WRepaintNoErase)"
// but for some reason, doesn't work for viewport().
const bool erase = !dynamic_cast <kpView *> (widget);
- widget->repaint (redrawWidgetRect, erase);
@@ -202,25 +202,25 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp
+
QPainter p (viewport (), true/*unclipped*/);
- p.setRasterOp (Qt::NotROP);
+ p.setRasterOp (TQt::NotROP);
- const QRect rightRect = rightResizeLineRect ();
- if (rightRect.isValid ())
-- p.fillRect (mapViewToViewport (rightRect), Qt::white);
+- p.fillRect (mapViewToViewport (rightRect), TQt::white);
-
- const QRect bottomRect = bottomResizeLineRect ();
- if (bottomRect.isValid ())
-- p.fillRect (mapViewToViewport (bottomRect), Qt::white);
+- p.fillRect (mapViewToViewport (bottomRect), TQt::white);
-
- const QRect bottomRightRect = bottomRightResizeLineRect ();
- if (bottomRightRect.isValid ())
-- p.fillRect (mapViewToViewport (bottomRightRect), Qt::white);
+- p.fillRect (mapViewToViewport (bottomRightRect), TQt::white);
+ const QMemArray <QRect> rects = mapViewToViewport (viewRegion).rects ();
+ for (QMemArray <QRect>::ConstIterator it = rects.begin ();
+ it != rects.end ();
+ it++)
+ {
-+ p.fillRect (*it, Qt::white);
++ p.fillRect (*it, TQt::white);
+ }
p.end ();
diff --git a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
index 910e78ac..b6fbd6bb 100644
--- a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
+++ b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
@@ -154,10 +154,10 @@ TQImage convertImageDepth (const TQImage &image, int depth, bool dither)
TQImage retImage = image.convertDepth (depth,
- Qt::AutoColor |
- (dither ? Qt::DiffuseDither : Qt::ThresholdDither) |
- Qt::ThresholdAlphaDither |
- (dither ? Qt::PreferDither : Qt::AvoidDither));
+ TQt::AutoColor |
+ (dither ? TQt::DiffuseDither : TQt::ThresholdDither) |
+ TQt::ThresholdAlphaDither |
+ (dither ? TQt::PreferDither : TQt::AvoidDither));
#if DEBUG_KP_EFFECT_REDUCE_COLORS && 0
kdDebug () << "After colour reduction:" << endl;
diff --git a/kolourpaint/tools/kptoolpolygon.cpp b/kolourpaint/tools/kptoolpolygon.cpp
index 00a70b02..f71ff6f8 100644
--- a/kolourpaint/tools/kptoolpolygon.cpp
+++ b/kolourpaint/tools/kptoolpolygon.cpp
@@ -79,23 +79,23 @@ static const char *pointArrayToString (const TQPointArray &pointArray)
#endif
-static TQPen makeMaskPen (const kpColor &color, int lineWidth, Qt::PenStyle lineStyle)
+static TQPen makeMaskPen (const kpColor &color, int lineWidth, TQt::PenStyle lineStyle)
{
return TQPen (color.maskColor (),
lineWidth == 1 ? 0/*closer to looking width 1*/ : lineWidth, lineStyle,
- Qt::RoundCap, Qt::RoundJoin);
+ TQt::RoundCap, TQt::RoundJoin);
}
-static TQPen makePen (const kpColor &color, int lineWidth, Qt::PenStyle lineStyle)
+static TQPen makePen (const kpColor &color, int lineWidth, TQt::PenStyle lineStyle)
{
if (color.isOpaque ())
{
return TQPen (color.toTQColor (),
lineWidth == 1 ? 0/*closer to looking width 1*/ : lineWidth, lineStyle,
- Qt::RoundCap, Qt::RoundJoin);
+ TQt::RoundCap, TQt::RoundJoin);
}
else
- return Qt::NoPen;
+ return TQt::NoPen;
}
static TQBrush makeMaskBrush (const kpColor &foregroundColor,
@@ -105,7 +105,7 @@ static TQBrush makeMaskBrush (const kpColor &foregroundColor,
if (toolWidgetFillStyle)
return toolWidgetFillStyle->maskBrush (foregroundColor, backgroundColor);
else
- return Qt::NoBrush;
+ return TQt::NoBrush;
}
static TQBrush makeBrush (const kpColor &foregroundColor,
@@ -115,7 +115,7 @@ static TQBrush makeBrush (const kpColor &foregroundColor,
if (toolWidgetFillStyle)
return toolWidgetFillStyle->brush (foregroundColor, backgroundColor);
else
- return Qt::NoBrush;
+ return TQt::NoBrush;
}
static bool only1PixelInPointArray (const TQPointArray &points)
@@ -135,7 +135,7 @@ static bool only1PixelInPointArray (const TQPointArray &points)
static TQPixmap pixmap (const TQPixmap &oldPixmap,
const TQPointArray &points, const TQRect &rect,
const kpColor &foregroundColor, kpColor backgroundColor,
- int lineWidth, Qt::PenStyle lineStyle,
+ int lineWidth, TQt::PenStyle lineStyle,
kpToolWidgetFillStyle *toolWidgetFillStyle,
enum kpToolPolygon::Mode mode, bool final = true)
{
@@ -652,7 +652,7 @@ void kpToolPolygon::updateShape ()
TQPixmap newPixmap = pixmap (oldPixmap,
m_points, boundingRect,
color (m_mouseButton), color (1 - m_mouseButton),
- m_lineWidth, Qt::SolidLine,
+ m_lineWidth, TQt::SolidLine,
m_toolWidgetFillStyle,
m_mode, false/*not final*/);
@@ -790,7 +790,7 @@ void kpToolPolygon::endShape (const TQPoint &, const TQRect &)
(text (),
m_points, boundingRect,
color (m_mouseButton), color (1 - m_mouseButton),
- m_lineWidth, Qt::SolidLine,
+ m_lineWidth, TQt::SolidLine,
m_toolWidgetFillStyle,
document ()->getPixmapAt (boundingRect),
m_mode,
@@ -844,7 +844,7 @@ kpToolPolygonCommand::kpToolPolygonCommand (const TQString &name,
const TQPointArray &points,
const TQRect &normalizedRect,
const kpColor &foregroundColor, const kpColor &backgroundColor,
- int lineWidth, Qt::PenStyle lineStyle,
+ int lineWidth, TQt::PenStyle lineStyle,
kpToolWidgetFillStyle *toolWidgetFillStyle,
const TQPixmap &originalArea,
enum kpToolPolygon::Mode mode,
diff --git a/kolourpaint/tools/kptoolpolygon.h b/kolourpaint/tools/kptoolpolygon.h
index 1bd922ab..e6178025 100644
--- a/kolourpaint/tools/kptoolpolygon.h
+++ b/kolourpaint/tools/kptoolpolygon.h
@@ -130,7 +130,7 @@ public:
const TQPointArray &points,
const TQRect &normalizedRect,
const kpColor &foregroundColor, const kpColor &backgroundColor,
- int lineWidth, Qt::PenStyle lineStyle,
+ int lineWidth, TQt::PenStyle lineStyle,
kpToolWidgetFillStyle *toolWidgetFillStyle,
const TQPixmap &originalArea,
kpToolPolygon::Mode mode,
@@ -148,7 +148,7 @@ private:
kpColor m_foregroundColor, m_backgroundColor;
int m_lineWidth;
- Qt::PenStyle m_lineStyle;
+ TQt::PenStyle m_lineStyle;
kpToolWidgetFillStyle *m_toolWidgetFillStyle;
TQPixmap m_originalArea;
diff --git a/kolourpaint/tools/kptoolrectangle.cpp b/kolourpaint/tools/kptoolrectangle.cpp
index 9e5883ea..90a7352d 100644
--- a/kolourpaint/tools/kptoolrectangle.cpp
+++ b/kolourpaint/tools/kptoolrectangle.cpp
@@ -238,7 +238,7 @@ void kpToolRectangle::updatePen (int mouseButton)
if (color (mouseButton).isOpaque ())
m_pen [mouseButton] = TQPen (color (mouseButton).toTQColor ());
else
- m_pen [mouseButton] = TQPen(Qt::NoPen);
+ m_pen [mouseButton] = TQPen(TQt::NoPen);
m_maskPen [mouseButton] = TQPen (maskPenColor);
}
else
@@ -250,7 +250,7 @@ void kpToolRectangle::updatePen (int mouseButton)
TQt::SolidLine);
}
else
- m_pen [mouseButton] = TQPen(Qt::NoPen);
+ m_pen [mouseButton] = TQPen(TQt::NoPen);
m_maskPen [mouseButton] = TQPen (maskPenColor,
m_toolWidgetLineWidth->lineWidth (),
TQt::SolidLine);
@@ -276,8 +276,8 @@ void kpToolRectangle::updateBrush (int mouseButton)
}
else
{
- m_brush [mouseButton] = TQBrush(Qt::NoBrush);
- m_maskBrush [mouseButton] = TQBrush(Qt::NoBrush);
+ m_brush [mouseButton] = TQBrush(TQt::NoBrush);
+ m_maskBrush [mouseButton] = TQBrush(TQt::NoBrush);
}
}
diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp
index 6160c166..b60f70ed 100644
--- a/kolourpaint/widgets/kpcolortoolbar.cpp
+++ b/kolourpaint/widgets/kpcolortoolbar.cpp
@@ -462,7 +462,7 @@ static bool ownColorsInitialised = false;
#define rows 2
#define cols 11
kpColorCells::kpColorCells (TQWidget *parent,
- Qt::Orientation o,
+ TQt::Orientation o,
const char *name)
: KColorCells (parent, rows, cols),
m_mouseButton (-1)
@@ -514,16 +514,16 @@ kpColorCells::~kpColorCells ()
{
}
-Qt::Orientation kpColorCells::orientation () const
+TQt::Orientation kpColorCells::orientation () const
{
return m_orientation;
}
-void kpColorCells::setOrientation (Qt::Orientation o)
+void kpColorCells::setOrientation (TQt::Orientation o)
{
int c, r;
- if (o == Qt::Horizontal)
+ if (o == TQt::Horizontal)
{
c = cols;
r = rows;
@@ -588,7 +588,7 @@ void kpColorCells::setOrientation (Qt::Orientation o)
int y, x;
int pos;
- if (o == Qt::Horizontal)
+ if (o == TQt::Horizontal)
{
y = i / cols;
x = i % cols;
@@ -660,17 +660,17 @@ void kpColorCells::mouseReleaseEvent (TQMouseEvent *e)
TQt::ButtonState button = e->button ();
#if DEBUG_KP_COLOR_TOOL_BAR
kdDebug () << "kpColorCells::mouseReleaseEvent(left="
- << (button & Qt::LeftButton)
+ << (button & TQt::LeftButton)
<< ",right="
- << (button & Qt::RightButton)
+ << (button & TQt::RightButton)
<< ")"
<< endl;
#endif
- if (!((button & Qt::LeftButton) && (button & Qt::RightButton)))
+ if (!((button & TQt::LeftButton) && (button & TQt::RightButton)))
{
- if (button & Qt::LeftButton)
+ if (button & TQt::LeftButton)
m_mouseButton = 0;
- else if (button & Qt::RightButton)
+ else if (button & TQt::RightButton)
m_mouseButton = 1;
}
@@ -785,12 +785,12 @@ void kpTransparentColorCell::mouseReleaseEvent (TQMouseEvent *e)
{
if (rect ().contains (e->pos ()))
{
- if (e->button () == Qt::LeftButton)
+ if (e->button () == TQt::LeftButton)
{
emit transparentColorSelected (0);
emit foregroundColorChanged (kpColor::transparent);
}
- else if (e->button () == Qt::RightButton)
+ else if (e->button () == TQt::RightButton)
{
emit transparentColorSelected (1);
emit backgroundColorChanged (kpColor::transparent);
@@ -819,7 +819,7 @@ void kpTransparentColorCell::drawContents (TQPainter *p)
*/
kpColorPalette::kpColorPalette (TQWidget *parent,
- Qt::Orientation o,
+ TQt::Orientation o,
const char *name)
: TQWidget (parent, name),
m_boxLayout (0)
@@ -849,18 +849,18 @@ kpColorPalette::~kpColorPalette ()
}
// public
-Qt::Orientation kpColorPalette::orientation () const
+TQt::Orientation kpColorPalette::orientation () const
{
return m_orientation;
}
-void kpColorPalette::setOrientation (Qt::Orientation o)
+void kpColorPalette::setOrientation (TQt::Orientation o)
{
m_colorCells->setOrientation (o);
delete m_boxLayout;
- if (o == Qt::Horizontal)
+ if (o == TQt::Horizontal)
{
m_boxLayout = new TQBoxLayout (this, TQBoxLayout::LeftToRight, 0/*margin*/, 5/*spacing*/);
m_boxLayout->addWidget (m_transparentColorCell, 0/*stretch*/, TQt::AlignVCenter);
@@ -997,7 +997,7 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow,
}
// virtual
-void kpColorToolBar::setOrientation (Qt::Orientation o)
+void kpColorToolBar::setOrientation (TQt::Orientation o)
{
// (TQDockWindow::undock() calls us)
bool isOutsideDock = (place () == TQDockWindow::OutsideDock);
@@ -1014,7 +1014,7 @@ void kpColorToolBar::setOrientation (Qt::Orientation o)
o = m_lastDockedOrientation;
}
- if (o == Qt::Horizontal)
+ if (o == TQt::Horizontal)
{
m_boxLayout->setDirection (TQBoxLayout::LeftToRight);
}
diff --git a/kolourpaint/widgets/kpcolortoolbar.h b/kolourpaint/widgets/kpcolortoolbar.h
index ef3faf3f..d3bff1e3 100644
--- a/kolourpaint/widgets/kpcolortoolbar.h
+++ b/kolourpaint/widgets/kpcolortoolbar.h
@@ -123,12 +123,12 @@ TQ_OBJECT
public:
kpColorCells (TQWidget *parent,
- Qt::Orientation o = Qt::Horizontal,
+ TQt::Orientation o = TQt::Horizontal,
const char *name = 0);
virtual ~kpColorCells ();
- Qt::Orientation orientation () const;
- void setOrientation (Qt::Orientation o);
+ TQt::Orientation orientation () const;
+ void setOrientation (TQt::Orientation o);
signals:
void foregroundColorChanged (const TQColor &color);
@@ -139,7 +139,7 @@ signals:
void backgroundColorChanged (const kpColor &color);
protected:
- Qt::Orientation m_orientation;
+ TQt::Orientation m_orientation;
virtual void dropEvent (TQDropEvent *e);
virtual void paintCell (TQPainter *painter, int row, int col);
@@ -189,19 +189,19 @@ TQ_OBJECT
public:
kpColorPalette (TQWidget *parent,
- Qt::Orientation o = Qt::Horizontal,
+ TQt::Orientation o = TQt::Horizontal,
const char *name = 0);
virtual ~kpColorPalette ();
- Qt::Orientation orientation () const;
- void setOrientation (Qt::Orientation o);
+ TQt::Orientation orientation () const;
+ void setOrientation (TQt::Orientation o);
signals:
void foregroundColorChanged (const kpColor &color);
void backgroundColorChanged (const kpColor &color);
protected:
- Qt::Orientation m_orientation;
+ TQt::Orientation m_orientation;
TQBoxLayout *m_boxLayout;
kpTransparentColorCell *m_transparentColorCell;
@@ -290,9 +290,9 @@ public slots:
private:
kpMainWindow *m_mainWindow;
- Qt::Orientation m_lastDockedOrientation;
+ TQt::Orientation m_lastDockedOrientation;
bool m_lastDockedOrientationSet;
- virtual void setOrientation (Qt::Orientation o);
+ virtual void setOrientation (TQt::Orientation o);
TQBoxLayout *m_boxLayout;
kpDualColorButton *m_dualColorButton;
diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp
index 6e559fa8..dcd79e77 100644
--- a/kolourpaint/widgets/kptooltoolbar.cpp
+++ b/kolourpaint/widgets/kptooltoolbar.cpp
@@ -72,7 +72,7 @@ protected:
// virtual [base TQWidget]
void mouseDoubleClickEvent (TQMouseEvent *e)
{
- if (e->button () == Qt::LeftButton && m_tool)
+ if (e->button () == TQt::LeftButton && m_tool)
m_tool->globalDraw ();
}
@@ -548,11 +548,11 @@ void kpToolToolBar::slotToolActionToolTipChanged ()
// public slot virtual [base TQDockWindow]
-void kpToolToolBar::setOrientation (Qt::Orientation o)
+void kpToolToolBar::setOrientation (TQt::Orientation o)
{
#if DEBUG_KP_TOOL_TOOL_BAR
kdDebug () << "kpToolToolBar::setOrientation("
- << (o == Qt::Vertical ? "vertical" : "horizontal")
+ << (o == TQt::Vertical ? "vertical" : "horizontal")
<< ") called!" << endl;
#endif
@@ -575,7 +575,7 @@ void kpToolToolBar::setOrientation (Qt::Orientation o)
delete m_toolLayout;
delete m_baseLayout;
- if (o == Qt::Vertical)
+ if (o == TQt::Vertical)
{
m_baseLayout = new TQBoxLayout (m_baseWidget, TQBoxLayout::TopToBottom,
5/*margin*/,
@@ -586,7 +586,7 @@ void kpToolToolBar::setOrientation (Qt::Orientation o)
0/*margin*/,
0/*spacing*/);
}
- else // if (o == Qt::Horizontal)
+ else // if (o == TQt::Horizontal)
{
m_baseLayout = new TQBoxLayout (m_baseWidget, TQBoxLayout::LeftToRight,
5/*margin*/,
@@ -616,7 +616,7 @@ void kpToolToolBar::setOrientation (Qt::Orientation o)
{
m_baseLayout->addWidget (*it,
0/*stretch*/,
- o == Qt::Vertical ? TQt::AlignHCenter : TQt::AlignVCenter);
+ o == TQt::Vertical ? TQt::AlignHCenter : TQt::AlignVCenter);
}
}
@@ -624,9 +624,9 @@ void kpToolToolBar::setOrientation (Qt::Orientation o)
}
// private
-void kpToolToolBar::addButton (TQButton *button, Qt::Orientation o, int num)
+void kpToolToolBar::addButton (TQButton *button, TQt::Orientation o, int num)
{
- if (o == Qt::Vertical)
+ if (o == TQt::Vertical)
m_toolLayout->addWidget (button, num / m_vertCols, num % m_vertCols);
else
{
diff --git a/kolourpaint/widgets/kptooltoolbar.h b/kolourpaint/widgets/kptooltoolbar.h
index e556d6cb..ae7de140 100644
--- a/kolourpaint/widgets/kptooltoolbar.h
+++ b/kolourpaint/widgets/kptooltoolbar.h
@@ -100,12 +100,12 @@ private slots:
void slotToolActionToolTipChanged ();
public slots:
- virtual void setOrientation (Qt::Orientation o);
+ virtual void setOrientation (TQt::Orientation o);
private:
- void addButton (TQButton *button, Qt::Orientation o, int num);
+ void addButton (TQButton *button, TQt::Orientation o, int num);
- Qt::Orientation m_lastDockedOrientation;
+ TQt::Orientation m_lastDockedOrientation;
bool m_lastDockedOrientationSet;
int m_vertCols;
diff --git a/kolourpaint/widgets/kptoolwidgetbase.cpp b/kolourpaint/widgets/kptoolwidgetbase.cpp
index e70be6db..bb74cafc 100644
--- a/kolourpaint/widgets/kptoolwidgetbase.cpp
+++ b/kolourpaint/widgets/kptoolwidgetbase.cpp
@@ -541,7 +541,7 @@ void kpToolWidgetBase::mousePressEvent (TQMouseEvent *e)
{
e->ignore ();
- if (e->button () != Qt::LeftButton)
+ if (e->button () != TQt::LeftButton)
return;
diff --git a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
index d13ae932..9cd5c42d 100644
--- a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
+++ b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
@@ -149,7 +149,7 @@ TQBrush kpToolWidgetFillStyle::maskBrushForFillStyle (FillStyle fs,
switch (fs)
{
case NoFill:
- return Qt::NoBrush;
+ return TQt::NoBrush;
break;
case FillWithBackground:
return TQBrush (backgroundColor.maskColor ());
@@ -158,7 +158,7 @@ TQBrush kpToolWidgetFillStyle::maskBrushForFillStyle (FillStyle fs,
return TQBrush (foregroundColor.maskColor ());
break;
default:
- return Qt::NoBrush;
+ return TQt::NoBrush;
break;
}
}
@@ -182,22 +182,22 @@ TQBrush kpToolWidgetFillStyle::brushForFillStyle (FillStyle fs,
switch (fs)
{
case NoFill:
- return Qt::NoBrush;
+ return TQt::NoBrush;
break;
case FillWithBackground:
if (backgroundColor.isOpaque ())
return TQBrush (backgroundColor.toTQColor ());
else
- return Qt::NoBrush;
+ return TQt::NoBrush;
break;
case FillWithForeground:
if (foregroundColor.isOpaque ())
return TQBrush (foregroundColor.toTQColor ());
else
- return Qt::NoBrush;
+ return TQt::NoBrush;
break;
default:
- return Qt::NoBrush;
+ return TQt::NoBrush;
break;
}
}
diff --git a/kooka/imgprintdialog.cpp b/kooka/imgprintdialog.cpp
index a0182457..caf5ac52 100644
--- a/kooka/imgprintdialog.cpp
+++ b/kooka/imgprintdialog.cpp
@@ -57,7 +57,7 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n
// layout->setMargin( KDialog::marginHint() );
// layout->setSpacing( KDialog::spacingHint() );
- m_scaleRadios = new TQButtonGroup( 2, Qt::Vertical, i18n("Image Print Size"), this );
+ m_scaleRadios = new TQButtonGroup( 2, TQt::Vertical, i18n("Image Print Size"), this );
m_scaleRadios->setRadioButtonExclusive(true);
connect( m_scaleRadios, TQT_SIGNAL(clicked(int)), TQT_SLOT(slScaleChanged(int)));
diff --git a/kooka/kocrbase.cpp b/kooka/kocrbase.cpp
index dc13655f..f1c77077 100644
--- a/kooka/kocrbase.cpp
+++ b/kooka/kocrbase.cpp
@@ -178,11 +178,11 @@ void KOCRBase::spellCheckIntro()
m_spellchkPage = addVBoxPage( i18n("Spell-checking") );
/* Want the spell checking at all? Checkbox here */
- TQGroupBox *gb1 = new TQGroupBox( 1, Qt::Horizontal, i18n("OCR Post Processing"), m_spellchkPage );
+ TQGroupBox *gb1 = new TQGroupBox( 1, TQt::Horizontal, i18n("OCR Post Processing"), m_spellchkPage );
m_cbWantCheck = new TQCheckBox( i18n("Enable spell-checking for validation of the OCR result"),
gb1 );
/* Spellcheck options */
- m_gbSpellOpts = new TQGroupBox( 1, Qt::Horizontal, i18n("Spell-Check Options"),
+ m_gbSpellOpts = new TQGroupBox( 1, TQt::Horizontal, i18n("Spell-Check Options"),
m_spellchkPage );
KSpellConfig *sCfg = new KSpellConfig( m_gbSpellOpts, "SPELLCHK", m_spellConfig, false );
diff --git a/kooka/kocrkadmos.cpp b/kooka/kocrkadmos.cpp
index 17ef016f..6769205d 100644
--- a/kooka/kocrkadmos.cpp
+++ b/kooka/kocrkadmos.cpp
@@ -279,13 +279,13 @@ EngineError KadmosDialog::setupGui()
(void) new TQLabel( i18n("Please classify the font type and language of the text on the image:"),
page );
TQHBox *locBox = new TQHBox( page );
- m_bbFont = new TQButtonGroup(1, Qt::Horizontal, i18n("Font Type Selection"), locBox);
+ m_bbFont = new TQButtonGroup(1, TQt::Horizontal, i18n("Font Type Selection"), locBox);
m_rbMachine = new TQRadioButton( i18n("Machine print"), m_bbFont );
m_rbHand = new TQRadioButton( i18n("Hand writing"), m_bbFont );
m_rbNorm = new TQRadioButton( i18n("Norm font"), m_bbFont );
- m_gbLang = new TQGroupBox(1, Qt::Horizontal, i18n("Country"), locBox);
+ m_gbLang = new TQGroupBox(1, TQt::Horizontal, i18n("Country"), locBox);
m_cbLang = new TQComboBox( m_gbLang );
@@ -298,7 +298,7 @@ EngineError KadmosDialog::setupGui()
TQHBox *innerBox = new TQHBox( page );
innerBox->setSpacing( KDialog::spacingHint());
- TQButtonGroup *cbGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("OCR Modifier"), innerBox );
+ TQButtonGroup *cbGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("OCR Modifier"), innerBox );
TQ_CHECK_PTR(cbGroup);
m_cbNoise = new TQCheckBox( i18n( "Enable automatic noise reduction" ), cbGroup );
diff --git a/kooka/kookapref.cpp b/kooka/kookapref.cpp
index 1cb421a9..d813cfb1 100644
--- a/kooka/kookapref.cpp
+++ b/kooka/kookapref.cpp
@@ -86,7 +86,7 @@ void KookaPreferences::setupOCRPage()
/*
* Switch ocr engines
*/
- TQButtonGroup *engGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("OCR Engine to Use"), page );
+ TQButtonGroup *engGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("OCR Engine to Use"), page );
m_gocrBut = new TQRadioButton( i18n("GOCR engine") , engGroup );
m_kadmosBut = new TQRadioButton( i18n("KADMOS engine"), engGroup );
m_ocradBut = new TQRadioButton( i18n("OCRAD engine"), engGroup );
diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp
index 89660b53..a0a3de38 100644
--- a/kooka/ksaneocr.cpp
+++ b/kooka/ksaneocr.cpp
@@ -1313,7 +1313,7 @@ void KSANEOCR::slMisspelling( const TQString& originalword, const TQStringList&
{
TQBrush brush;
brush.setColor( TQColor(red)); // , "Dense4Pattern" );
- brush.setStyle( Qt::Dense4Pattern );
+ brush.setStyle( TQt::Dense4Pattern );
TQPen pen( red, 2 );
TQRect r = resWord.rect();
diff --git a/kpdf/conf/kpdf.kcfg b/kpdf/conf/kpdf.kcfg
index 7f84081e..c9c4f94f 100644
--- a/kpdf/conf/kpdf.kcfg
+++ b/kpdf/conf/kpdf.kcfg
@@ -6,7 +6,7 @@
<kcfgfile name="kpdfpartrc" />
<group name="Accessibility" >
<entry key="PaperColor" type="Color" >
- <default code="true" >Qt::white</default>
+ <default code="true" >TQt::white</default>
</entry>
<entry key="HighlightImages" type="Bool" >
<default>false</default>
@@ -129,7 +129,7 @@
<default>false</default>
</entry>
<entry key="SlidesBackgroundColor" type="Color" >
- <default code="true" >Qt::black</default>
+ <default code="true" >TQt::black</default>
</entry>
<entry key="SlidesTransition" type="Enum" >
<default>Replace</default>
diff --git a/kpdf/ui/minibar.cpp b/kpdf/ui/minibar.cpp
index eaceeed2..73af93d7 100644
--- a/kpdf/ui/minibar.cpp
+++ b/kpdf/ui/minibar.cpp
@@ -275,13 +275,13 @@ void ProgressWidget::setProgress( float percentage )
void ProgressWidget::mouseMoveEvent( TQMouseEvent * e )
{
- if ( e->state() == Qt::LeftButton && width() > 0 )
+ if ( e->state() == TQt::LeftButton && width() > 0 )
m_miniBar->slotGotoNormalizedPage( (float)( TQApplication::reverseLayout() ? width() - e->x() : e->x() ) / (float)width() );
}
void ProgressWidget::mousePressEvent( TQMouseEvent * e )
{
- if ( e->button() == Qt::LeftButton && width() > 0 )
+ if ( e->button() == TQt::LeftButton && width() > 0 )
m_miniBar->slotGotoNormalizedPage( (float)( TQApplication::reverseLayout() ? width() - e->x() : e->x() ) / (float)width() );
}
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index 885383e7..aa03cc57 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -846,7 +846,7 @@ void PageView::contentsMouseMoveEvent( TQMouseEvent * e )
return;
// if holding mouse mid button, perform zoom
- if ( (e->state() & Qt::MidButton) && d->mouseMidStartY >= 0 )
+ if ( (e->state() & TQt::MidButton) && d->mouseMidStartY >= 0 )
{
int deltaY = d->mouseMidStartY - e->globalPos().y();
d->mouseMidStartY = e->globalPos().y();
@@ -857,8 +857,8 @@ void PageView::contentsMouseMoveEvent( TQMouseEvent * e )
return;
}
- bool leftButton = e->state() & Qt::LeftButton,
- rightButton = e->state() & Qt::RightButton;
+ bool leftButton = e->state() & TQt::LeftButton,
+ rightButton = e->state() & TQt::RightButton;
switch ( d->mouseMode )
{
case MouseNormal:
@@ -926,7 +926,7 @@ void PageView::contentsMousePressEvent( TQMouseEvent * e )
}
// if pressing mid mouse button while not doing other things, begin 'comtinous zoom' mode
- if ( e->button() & Qt::MidButton )
+ if ( e->button() & TQt::MidButton )
{
d->mouseMidStartY = e->globalPos().y();
setCursor( KCursor::sizeVerCursor() );
@@ -937,8 +937,8 @@ void PageView::contentsMousePressEvent( TQMouseEvent * e )
d->mousePressPos = e->globalPos();
// handle mode dependant mouse press actions
- bool leftButton = e->button() & Qt::LeftButton,
- rightButton = e->button() & Qt::RightButton;
+ bool leftButton = e->button() & TQt::LeftButton,
+ rightButton = e->button() & TQt::RightButton;
switch ( d->mouseMode )
{
case MouseNormal: // drag start / click / link following
@@ -979,7 +979,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
if ( d->items.isEmpty() )
{
// ..except for right Clicks (emitted even it viewport is empty)
- if ( e->button() == Qt::RightButton )
+ if ( e->button() == TQt::RightButton )
emit rightClick( 0, e->globalPos() );
return;
}
@@ -989,7 +989,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
return;
// handle mode indepent mid buttom zoom
- bool midButton = e->button() & Qt::MidButton;
+ bool midButton = e->button() & TQt::MidButton;
if ( midButton && d->mouseMidStartY > 0 )
{
d->mouseMidStartY = -1;
@@ -998,8 +998,8 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
return;
}
- bool leftButton = e->button() & Qt::LeftButton,
- rightButton = e->button() & Qt::RightButton;
+ bool leftButton = e->button() & TQt::LeftButton,
+ rightButton = e->button() & TQt::RightButton;
switch ( d->mouseMode )
{
case MouseNormal:{
diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp
index 6dfd2a9d..a7d2c0f0 100644
--- a/kpdf/ui/presentationwidget.cpp
+++ b/kpdf/ui/presentationwidget.cpp
@@ -235,7 +235,7 @@ void PresentationWidget::wheelEvent( TQWheelEvent * e )
void PresentationWidget::mousePressEvent( TQMouseEvent * e )
{
// pressing left button
- if ( e->button() == Qt::LeftButton )
+ if ( e->button() == TQt::LeftButton )
{
// if pressing on a link, skip other checks
if ( ( m_pressedLink = getLink( e->x(), e->y() ) ) )
@@ -252,14 +252,14 @@ void PresentationWidget::mousePressEvent( TQMouseEvent * e )
slotNextPage();
}
// pressing right button
- else if ( e->button() == Qt::RightButton )
+ else if ( e->button() == TQt::RightButton )
slotPrevPage();
}
void PresentationWidget::mouseReleaseEvent( TQMouseEvent * e )
{
// if releasing on the same link we pressed over, execute it
- if ( m_pressedLink && e->button() == Qt::LeftButton )
+ if ( m_pressedLink && e->button() == TQt::LeftButton )
{
const KPDFLink * link = getLink( e->x(), e->y() );
if ( link == m_pressedLink )
@@ -290,7 +290,7 @@ void PresentationWidget::mouseMoveEvent( TQMouseEvent * e )
if ( e->y() <= (geometry().top() + 1) )
m_topBar->show();
// handle "dragging the wheel" if clicking on its geometry
- else if ( e->state() == Qt::LeftButton && m_overlayGeometry.contains( e->pos() ) )
+ else if ( e->state() == TQt::LeftButton && m_overlayGeometry.contains( e->pos() ) )
overlayClick( e->pos() );
}
}
diff --git a/kpdf/ui/thumbnaillist.cpp b/kpdf/ui/thumbnaillist.cpp
index 4d0afb57..334651e0 100644
--- a/kpdf/ui/thumbnaillist.cpp
+++ b/kpdf/ui/thumbnaillist.cpp
@@ -311,7 +311,7 @@ void ThumbnailList::keyPressEvent( TQKeyEvent * keyEvent )
void ThumbnailList::contentsMousePressEvent( TQMouseEvent * e )
{
- if ( e->button() != Qt::LeftButton )
+ if ( e->button() != TQt::LeftButton )
return;
int clickY = e->y();
TQValueList<ThumbnailWidget *>::iterator vIt = m_visibleThumbnails.begin(), vEnd = m_visibleThumbnails.end();
@@ -479,7 +479,7 @@ void ThumbnailWidget::setSelected( bool selected )
void ThumbnailWidget::mouseReleaseEvent( TQMouseEvent * e )
{
- if ( e->button() != Qt::RightButton )
+ if ( e->button() != TQt::RightButton )
return;
m_tl->forwardRightClick( m_page, e->globalPos() );
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index 950269ab..7de15eb1 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -798,7 +798,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
if( pw->inherits( "PMDockSplitter" ) )
{
PMDockSplitter* ds = ( PMDockSplitter* ) pw;
- if( ds->splitterOrientation( ) ==Qt::Vertical )
+ if( ds->splitterOrientation( ) ==TQt::Vertical )
found = true;
}
}
@@ -874,8 +874,8 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
// if to dock not to the center of the target dockwidget,
// dock to newDock
PMDockSplitter* panner = 0L;
- if ( dockPos == PMDockWidget::DockTop || dockPos == PMDockWidget::DockBottom ) panner = new PMDockSplitter( newDock, "_dock_split_",Qt::Horizontal, spliPos, manager->splitterHighResolution() );
- if ( dockPos == PMDockWidget::DockLeft || dockPos == PMDockWidget::DockRight ) panner = new PMDockSplitter( newDock, "_dock_split_",Qt::Vertical , spliPos, manager->splitterHighResolution() );
+ if ( dockPos == PMDockWidget::DockTop || dockPos == PMDockWidget::DockBottom ) panner = new PMDockSplitter( newDock, "_dock_split_",TQt::Horizontal, spliPos, manager->splitterHighResolution() );
+ if ( dockPos == PMDockWidget::DockLeft || dockPos == PMDockWidget::DockRight ) panner = new PMDockSplitter( newDock, "_dock_split_",TQt::Vertical , spliPos, manager->splitterHighResolution() );
newDock->setWidget( panner );
panner->setOpaqueResize(manager->splitterOpaqueResize());
@@ -994,13 +994,13 @@ void PMDockWidget::undock()
split->deactivate();
if ( split->getFirst() == parentOfTab ){
split->activate( lastTab );
- if ( ((PMDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical )
+ if ( ((PMDockWidget*)split->parent())->splitterOrientation ==TQt::Vertical )
emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockLeft );
else
emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockTop );
} else {
split->activate( 0L, lastTab );
- if ( ((PMDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical )
+ if ( ((PMDockWidget*)split->parent())->splitterOrientation ==TQt::Vertical )
emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockRight );
else
emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockBottom );
@@ -1343,7 +1343,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
else curdw->toDesktop( );
break;
case TQEvent::MouseButtonPress:
- if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){
+ if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){
if ( curdw->eDocking != (int)PMDockWidget::DockNone ){
dropCancel = true;
curdw->setFocus();
@@ -1367,7 +1367,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
}
break;
case TQEvent::MouseButtonRelease:
- if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){
+ if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){
if ( draging ){
if ( !dropCancel )
drop();
@@ -1426,7 +1426,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
if (d->readyToDrag) {
d->readyToDrag = false;
}
- if ( (((TQMouseEvent*)event)->state() == Qt::LeftButton) &&
+ if ( (((TQMouseEvent*)event)->state() == TQt::LeftButton) &&
(curdw->eDocking != (int)PMDockWidget::DockNone) ) {
startDrag( curdw);
}
@@ -1915,7 +1915,7 @@ void PMDockManager::readConfig(TQDomElement &base)
PMDockWidget *second = getDockWidgetFromName(secondName);
if (first && second) {
obj = first->manualDock(second,
- (orientation == (int)Qt::Vertical)? PMDockWidget::DockLeft : PMDockWidget::DockTop,
+ (orientation == (int)TQt::Vertical)? PMDockWidget::DockLeft : PMDockWidget::DockTop,
separatorPos);
if (obj)
obj->setName(name.latin1());
@@ -2165,9 +2165,9 @@ void PMDockManager::readConfig( TDEConfig* c, TQString group )
PMDockWidget* last = getDockWidgetFromName( c->readEntry( oname + ":last_name" ) );
int sepPos = c->readNumEntry( oname + ":sepPos" );
- Qt::Orientation p = (Qt::Orientation)c->readNumEntry( oname + ":orientation" );
+ TQt::Orientation p = (TQt::Orientation)c->readNumEntry( oname + ":orientation" );
if ( first && last ){
- obj = first->manualDock( last, ( p ==Qt::Vertical ) ? PMDockWidget::DockLeft : PMDockWidget::DockTop, sepPos );
+ obj = first->manualDock( last, ( p ==TQt::Vertical ) ? PMDockWidget::DockLeft : PMDockWidget::DockTop, sepPos );
if (obj){
obj->setName( oname.latin1() );
}
diff --git a/kpovmodeler/pmdockwidget.h b/kpovmodeler/pmdockwidget.h
index a997aefb..d65c5aa7 100644
--- a/kpovmodeler/pmdockwidget.h
+++ b/kpovmodeler/pmdockwidget.h
@@ -805,7 +805,7 @@ private:
// GROUP data
TQString firstName;
TQString lastName;
- Qt::Orientation splitterOrientation;
+ TQt::Orientation splitterOrientation;
bool isGroup;
bool isTabGroup;
diff --git a/kpovmodeler/pmdockwidget_private.cpp b/kpovmodeler/pmdockwidget_private.cpp
index c0b9355a..60a06867 100644
--- a/kpovmodeler/pmdockwidget_private.cpp
+++ b/kpovmodeler/pmdockwidget_private.cpp
@@ -22,7 +22,7 @@
#include <tqpainter.h>
#include <tqcursor.h>
-PMDockSplitter::PMDockSplitter(TQWidget *parent, const char *name, Qt::Orientation orient, int pos, bool highResolution)
+PMDockSplitter::PMDockSplitter(TQWidget *parent, const char *name, TQt::Orientation orient, int pos, bool highResolution)
: TQWidget(parent, name)
{
divider = 0L;
@@ -49,7 +49,7 @@ void PMDockSplitter::activate(TQWidget *c0, TQWidget *c1)
divider->setLineWidth(1);
divider->raise();
- if (orientation ==Qt::Horizontal)
+ if (orientation ==TQt::Horizontal)
divider->setCursor(TQCursor(sizeVerCursor));
else
divider->setCursor(TQCursor(sizeHorCursor));
@@ -68,7 +68,7 @@ void PMDockSplitter::setupMinMaxSize()
{
// Set the minimum and maximum sizes
int minx, maxx, miny, maxy;
- if (orientation ==Qt::Horizontal) {
+ if (orientation ==TQt::Horizontal) {
miny = child0->minimumSize().height() + child1->minimumSize().height()+4;
maxy = child0->maximumSize().height() + child1->maximumSize().height()+4;
minx = (child0->minimumSize().width() > child1->minimumSize().width()) ? child0->minimumSize().width() : child1->minimumSize().width();
@@ -118,7 +118,7 @@ void PMDockSplitter::resizeEvent(TQResizeEvent *ev)
int factor = (mHighResolution)? 10000:100;
// real resize event, recalculate xpos
if (ev && mKeepSize && isVisible()) {
- if (orientation ==Qt::Horizontal) {
+ if (orientation ==TQt::Horizontal) {
if (ev->oldSize().height() != ev->size().height())
xpos = factor * checkValue( child0->height()+1 ) / height();
} else {
@@ -126,8 +126,8 @@ void PMDockSplitter::resizeEvent(TQResizeEvent *ev)
xpos = factor * checkValue( child0->width()+1 ) / width();
}
}
- int position = checkValue( (orientation ==Qt::Vertical ? width() : height()) * xpos/factor );
- if (orientation ==Qt::Horizontal){
+ int position = checkValue( (orientation ==TQt::Vertical ? width() : height()) * xpos/factor );
+ if (orientation ==TQt::Horizontal){
child0->setGeometry(0, 0, width(), position);
child1->setGeometry(0, position+4, width(), height()-position-4);
divider->setGeometry(0, position, width(), 4);
@@ -142,7 +142,7 @@ void PMDockSplitter::resizeEvent(TQResizeEvent *ev)
int PMDockSplitter::checkValue( int position ) const
{
if (initialised){
- if (orientation ==Qt::Vertical){
+ if (orientation ==TQt::Vertical){
if (position < (child0->minimumSize().width()))
position = child0->minimumSize().width();
if ((width()-4-position) < (child1->minimumSize().width()))
@@ -157,9 +157,9 @@ int PMDockSplitter::checkValue( int position ) const
if (position < 0) position = 0;
- if ((orientation ==Qt::Vertical) && (position > width()))
+ if ((orientation ==TQt::Vertical) && (position > width()))
position = width();
- if ((orientation ==Qt::Horizontal) && (position > height()))
+ if ((orientation ==TQt::Horizontal) && (position > height()))
position = height();
return position;
@@ -176,7 +176,7 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e)
mev= (TQMouseEvent*)e;
child0->setUpdatesEnabled(mOpaqueResize);
child1->setUpdatesEnabled(mOpaqueResize);
- if (orientation ==Qt::Horizontal) {
+ if (orientation ==TQt::Horizontal) {
if (!mOpaqueResize) {
int position = checkValue( mapFromGlobal(mev->globalPos()).y() );
divider->move( 0, position );
@@ -201,7 +201,7 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e)
child0->setUpdatesEnabled(true);
child1->setUpdatesEnabled(true);
mev= (TQMouseEvent*)e;
- if (orientation ==Qt::Horizontal){
+ if (orientation ==TQt::Horizontal){
xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).y() ) / height();
resizeEvent(0);
divider->repaint(true);
diff --git a/kpovmodeler/pmdockwidget_private.h b/kpovmodeler/pmdockwidget_private.h
index 0bf8ebba..b9f9f06d 100644
--- a/kpovmodeler/pmdockwidget_private.h
+++ b/kpovmodeler/pmdockwidget_private.h
@@ -44,7 +44,7 @@ class PMDockSplitter : public TQWidget
TQ_OBJECT
public:
- PMDockSplitter(TQWidget *parent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50, bool highResolution=false);
+ PMDockSplitter(TQWidget *parent= 0, const char *name= 0, TQt::Orientation orient=TQt::Vertical, int pos= 50, bool highResolution=false);
virtual ~PMDockSplitter(){};
void activate(TQWidget *c0, TQWidget *c1 = 0L);
@@ -71,7 +71,7 @@ public:
bool highResolution() const;
// MODIFICATION (Zehender)
- Qt::Orientation splitterOrientation( ) const { return orientation; }
+ TQt::Orientation splitterOrientation( ) const { return orientation; }
protected:
int checkValue( int ) const;
@@ -81,7 +81,7 @@ private:
void setupMinMaxSize();
TQWidget *child0, *child1;
- Qt::Orientation orientation;
+ TQt::Orientation orientation;
bool initialised;
TQFrame* divider;
int xpos;
diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp
index 794aac67..9e0e6deb 100644
--- a/kpovmodeler/pmglview.cpp
+++ b/kpovmodeler/pmglview.cpp
@@ -507,7 +507,7 @@ void PMGLView::mousePressEvent( TQMouseEvent* e )
{
if( m_bScaleMode || m_bTranslateMode )
{
- if( ( e->button( ) & Qt::LeftButton ) && ( e->state( ) == 0 ) )
+ if( ( e->button( ) & TQt::LeftButton ) && ( e->state( ) == 0 ) )
{
m_bMousePressed = true;
m_mousePos = e->pos( );
@@ -517,7 +517,7 @@ void PMGLView::mousePressEvent( TQMouseEvent* e )
}
else if( m_type != PMViewCamera )
{
- if( ( e->button( ) & Qt::LeftButton ) && m_bInverseValid
+ if( ( e->button( ) & TQt::LeftButton ) && m_bInverseValid
&& m_pActiveObject )
{
if( m_pUnderMouse )
@@ -578,7 +578,7 @@ void PMGLView::mousePressEvent( TQMouseEvent* e )
if( !( m_bGraphicalChangeMode || m_bMousePressed ) )
{
- if( ( e->button( ) == Qt::RightButton ) && ( e->state( ) == 0 ) )
+ if( ( e->button( ) == TQt::RightButton ) && ( e->state( ) == 0 ) )
{
m_contextClickPosition = PMVector( screenToInternalX( e->x( ) ),
screenToInternalY( e->y( ) ) );
@@ -599,7 +599,7 @@ void PMGLView::mousePressEvent( TQMouseEvent* e )
}
}
- if( e->button( ) == Qt::MidButton )
+ if( e->button( ) == TQt::MidButton )
{
m_bMidMousePressed = true;
m_mousePos = e->pos( );
@@ -677,7 +677,7 @@ void PMGLView::mouseReleaseEvent( TQMouseEvent* e )
m_autoScrollTimer.stop( );
}
- if( e->button( ) & Qt::MidButton )
+ if( e->button( ) & TQt::MidButton )
m_bMidMousePressed = false;
m_bSelectUnderMouse = false;
diff --git a/kpovmodeler/pmtreeview.cpp b/kpovmodeler/pmtreeview.cpp
index 51be79b1..41cd66b9 100644
--- a/kpovmodeler/pmtreeview.cpp
+++ b/kpovmodeler/pmtreeview.cpp
@@ -472,7 +472,7 @@ void PMTreeView::viewportMousePressEvent( TQMouseEvent* e )
TQPoint p = e->pos( );
- if( e->button( ) & Qt::RightButton )
+ if( e->button( ) & TQt::RightButton )
{
if( m_pPart->factory( ) )
{
@@ -497,7 +497,7 @@ void PMTreeView::viewportMousePressEvent( TQMouseEvent* e )
if( item )
{
- if( e->button( ) == Qt::LeftButton || e->button( ) == Qt::MidButton )
+ if( e->button( ) == TQt::LeftButton || e->button( ) == TQt::MidButton )
{
m_pressed = true;
m_pressedPos = e->pos( );
diff --git a/kpovmodeler/pmvectorlistedit.cpp b/kpovmodeler/pmvectorlistedit.cpp
index 0fa5ded9..3d3862c8 100644
--- a/kpovmodeler/pmvectorlistedit.cpp
+++ b/kpovmodeler/pmvectorlistedit.cpp
@@ -345,7 +345,7 @@ bool PMVectorListEdit::eventFilter( TQObject* o, TQEvent* e )
if( e->type( ) == TQEvent::Wheel && parent( ) )
return TQApplication::sendEvent( parent( ), e );
if( e->type( ) == TQEvent::MouseButtonPress
- && ( ( TQMouseEvent* ) e )->button( ) == Qt::RightButton )
+ && ( ( TQMouseEvent* ) e )->button( ) == TQt::RightButton )
{
bool b = TQTable::eventFilter( o, e );
emit showContextMenu( );
diff --git a/kpovmodeler/pmview.cpp b/kpovmodeler/pmview.cpp
index e9ec01d1..8ede8ab1 100644
--- a/kpovmodeler/pmview.cpp
+++ b/kpovmodeler/pmview.cpp
@@ -40,8 +40,8 @@ PMView::PMView( PMPart* part, TQWidget* parent, const char* name )
setBackgroundMode( PaletteBase );
TQVBoxLayout* layout = new TQVBoxLayout( this );
- m_pMainSplitter = new TQSplitter( Qt::Horizontal, this, "MainSplitter" );
- m_pTreeEditSplitter = new TQSplitter( Qt::Vertical, m_pMainSplitter,
+ m_pMainSplitter = new TQSplitter( TQt::Horizontal, this, "MainSplitter" );
+ m_pTreeEditSplitter = new TQSplitter( TQt::Vertical, m_pMainSplitter,
"TreeEditSplitter" );
diff --git a/kpovmodeler/pmviewlayoutmanager.cpp b/kpovmodeler/pmviewlayoutmanager.cpp
index a3eb400b..92cab2e7 100644
--- a/kpovmodeler/pmviewlayoutmanager.cpp
+++ b/kpovmodeler/pmviewlayoutmanager.cpp
@@ -520,7 +520,7 @@ void PMViewLayout::recursiveExtractColumns(
if( w->inherits( "PMDockSplitter" ) )
{
PMDockSplitter* sp = ( PMDockSplitter* ) w;
- if( sp->splitterOrientation( ) == Qt::Vertical )
+ if( sp->splitterOrientation( ) == TQt::Vertical )
{
colStart = false;
// vertical splitter, split up the current column
diff --git a/kruler/klineal.cpp b/kruler/klineal.cpp
index 7041fea1..477fc6cf 100644
--- a/kruler/klineal.cpp
+++ b/kruler/klineal.cpp
@@ -575,15 +575,15 @@ void KLineal::mousePressEvent(TQMouseEvent *inEvent) {
TQRect gr = geometry();
mDragOffset = mLastClickPos - TQPoint(gr.left(), gr.top());
- if (inEvent->button() == Qt::LeftButton) {
+ if (inEvent->button() == TQt::LeftButton) {
if (!mDragging) {
grabMouse(KCursor::sizeAllCursor());
mDragging = TRUE;
}
- } else if (inEvent->button() == Qt::MidButton) {
+ } else if (inEvent->button() == TQt::MidButton) {
_clicked = true;
turnLeft();
- } else if (inEvent->button() == Qt::RightButton) {
+ } else if (inEvent->button() == TQt::RightButton) {
showMenu();
}
}
diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp
index f9fd5f12..4b18d30e 100644
--- a/ksnapshot/ksnapshot.cpp
+++ b/ksnapshot/ksnapshot.cpp
@@ -483,7 +483,7 @@ bool KSnapshot::eventFilter( TQObject* o, TQEvent* e)
TQMouseEvent* me = (TQMouseEvent*) e;
if ( TQWidget::mouseGrabber() != grabber )
return false;
- if ( me->button() == Qt::LeftButton )
+ if ( me->button() == TQt::LeftButton )
performGrab();
}
return false;
diff --git a/ksnapshot/regiongrabber.cpp b/ksnapshot/regiongrabber.cpp
index 2c4d4a2b..61c45c47 100644
--- a/ksnapshot/regiongrabber.cpp
+++ b/ksnapshot/regiongrabber.cpp
@@ -104,7 +104,7 @@ void RegionGrabber::initGrabber()
void RegionGrabber::mousePressEvent( TQMouseEvent *e )
{
- if ( e->button() == Qt::LeftButton )
+ if ( e->button() == TQt::LeftButton )
{
mouseDown = true;
grabRect = TQRect( e->pos(), e->pos() );
diff --git a/ksnapshot/windowgrabber.cpp b/ksnapshot/windowgrabber.cpp
index eac0fa6e..70fbabdc 100644
--- a/ksnapshot/windowgrabber.cpp
+++ b/ksnapshot/windowgrabber.cpp
@@ -240,7 +240,7 @@ TQPixmap WindowGrabber::grabCurrent( bool includeDecorations )
void WindowGrabber::mousePressEvent( TQMouseEvent *e )
{
- if ( e->button() == Qt::RightButton )
+ if ( e->button() == TQt::RightButton )
yPos = e->globalY();
else {
TQPixmap pm;
@@ -258,7 +258,7 @@ void WindowGrabber::mousePressEvent( TQMouseEvent *e )
void WindowGrabber::mouseReleaseEvent( TQMouseEvent *e )
{
- if ( e->button() == Qt::RightButton )
+ if ( e->button() == TQt::RightButton )
yPos = -1;
}
diff --git a/ksvg/impl/SVGGlyphElementImpl.cpp b/ksvg/impl/SVGGlyphElementImpl.cpp
index 9b909960..b267fe18 100644
--- a/ksvg/impl/SVGGlyphElementImpl.cpp
+++ b/ksvg/impl/SVGGlyphElementImpl.cpp
@@ -46,7 +46,7 @@ TQString SVGGlyphElementImpl::d() const
unicode SVGGlyphElementImpl::Unicode DontDelete|ReadOnly
glyph-name SVGGlyphElementImpl::GlyphName DontDelete|ReadOnly
d SVGGlyphElementImpl::D DontDelete|ReadOnly
- orientation SVGGlyphElementImpl::Qt::Orientation DontDelete|ReadOnly
+ orientation SVGGlyphElementImpl::Orientation DontDelete|ReadOnly
arabic-form SVGGlyphElementImpl::ArabicForm DontDelete|ReadOnly
lang SVGGlyphElementImpl::Lang DontDelete|ReadOnly
horiz-adv-x SVGGlyphElementImpl::HorizAdvX DontDelete|ReadOnly
diff --git a/ksvg/plugin/ksvg_widget.cpp b/ksvg/plugin/ksvg_widget.cpp
index bd64899c..be8d0559 100644
--- a/ksvg/plugin/ksvg_widget.cpp
+++ b/ksvg/plugin/ksvg_widget.cpp
@@ -74,11 +74,11 @@ KSVG::SVGMouseEventImpl *KSVGWidget::newMouseEvent(KSVG::SVGEvent::EventId id, T
}
int button = 0;
- if(event->stateAfter() & Qt::LeftButton)
+ if(event->stateAfter() & TQt::LeftButton)
button = 1;
- else if(event->stateAfter() & Qt::MidButton)
+ else if(event->stateAfter() & TQt::MidButton)
button = 2;
- else if(event->stateAfter() & Qt::RightButton)
+ else if(event->stateAfter() & TQt::RightButton)
button = 3;
KSVG::SVGMouseEventImpl *mev = new KSVG::SVGMouseEventImpl(id, // type
@@ -104,7 +104,7 @@ KSVG::SVGMouseEventImpl *KSVGWidget::newMouseEvent(KSVG::SVGEvent::EventId id, T
void KSVGWidget::mouseMoveEvent(TQMouseEvent *event)
{
- if(event->state() & TQt::ControlButton && event->state() & Qt::LeftButton)
+ if(event->state() & TQt::ControlButton && event->state() & TQt::LeftButton)
{
if(m_panningPos.isNull())
m_panningPos = event->pos();
@@ -186,7 +186,7 @@ void KSVGWidget::mousePressEvent(TQMouseEvent *event)
if(event->state() & TQt::ControlButton)
return;
- if(event->button() == Qt::RightButton)
+ if(event->button() == TQt::RightButton)
{
if(part() && part()->factory())
{
diff --git a/ksvg/test/external/SVGTestWidget.cpp b/ksvg/test/external/SVGTestWidget.cpp
index db1d362b..0e0d5f9d 100644
--- a/ksvg/test/external/SVGTestWidget.cpp
+++ b/ksvg/test/external/SVGTestWidget.cpp
@@ -88,11 +88,11 @@ KSVG::SVGMouseEventImpl *newMouseEvent(SVGDocument *doc, KSVG::SVGEventImpl::Eve
}
int button = 0;
- if(event->stateAfter() & Qt::LeftButton)
+ if(event->stateAfter() & TQt::LeftButton)
button = 1;
- else if(event->stateAfter() & Qt::MidButton)
+ else if(event->stateAfter() & TQt::MidButton)
button = 2;
- else if(event->stateAfter() & Qt::RightButton)
+ else if(event->stateAfter() & TQt::RightButton)
button = 3;
KSVG::SVGMouseEventImpl *mev = new KSVG::SVGMouseEventImpl(id, // type
diff --git a/kuickshow/src/aboutwidget.cpp b/kuickshow/src/aboutwidget.cpp
index 72ce1839..d45734ba 100644
--- a/kuickshow/src/aboutwidget.cpp
+++ b/kuickshow/src/aboutwidget.cpp
@@ -39,7 +39,7 @@ AboutWidget::AboutWidget( TQWidget *parent, const char *name )
setFrameStyle( WinPanel | Raised );
- TQGroupBox *gBox = new TQGroupBox( 1,Qt::Horizontal, this);
+ TQGroupBox *gBox = new TQGroupBox( 1,TQt::Horizontal, this);
gBox->setGeometry( 10, 10, width()-20, height()-20 );
gBox->setAlignment( AlignHCenter );
gBox->installEventFilter( this );
diff --git a/kuickshow/src/defaultswidget.cpp b/kuickshow/src/defaultswidget.cpp
index 4746638e..734241ca 100644
--- a/kuickshow/src/defaultswidget.cpp
+++ b/kuickshow/src/defaultswidget.cpp
@@ -42,7 +42,7 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name)
// create all the widgets
gbScale = new TQGroupBox( i18n("Scaling"), this );
- gbScale->setColumnLayout( 0, Qt::Horizontal );
+ gbScale->setColumnLayout( 0, TQt::Horizontal );
cbDownScale = new TQCheckBox( i18n("Shrink image to screen size, if larger"),
gbScale, "shrinktoscreen" );
@@ -58,7 +58,7 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name)
// --
gbGeometry = new TQGroupBox( i18n("Geometry"), this );
- gbGeometry->setColumnLayout( 0, Qt::Horizontal );
+ gbGeometry->setColumnLayout( 0, TQt::Horizontal );
cbFlipVertically = new TQCheckBox( i18n("Flip vertically"), gbGeometry );
diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
index 42216dab..70b3ffd2 100644
--- a/kuickshow/src/imagewindow.cpp
+++ b/kuickshow/src/imagewindow.cpp
@@ -630,7 +630,7 @@ void ImageWindow::mousePressEvent( TQMouseEvent *e )
xposPress = xmove;
yposPress = ymove;
- if ( e->button() == Qt::LeftButton ) {
+ if ( e->button() == TQt::LeftButton ) {
if ( e->state() & ShiftButton )
updateCursor( ZoomCursor );
else
@@ -675,7 +675,7 @@ void ImageWindow::updateCursor( KuickCursor cursor )
void ImageWindow::mouseMoveEvent( TQMouseEvent *e )
{
- if ( !(e->state() & Qt::LeftButton) ) { // only handle LeftButton actions
+ if ( !(e->state() & TQt::LeftButton) ) { // only handle LeftButton actions
return;
}
@@ -736,7 +736,7 @@ void ImageWindow::mouseReleaseEvent( TQMouseEvent *e )
}
// only proceed if shift-Key is still pressed
- if ( !(e->button() == Qt::LeftButton && e->state() & ShiftButton) )
+ if ( !(e->button() == TQt::LeftButton && e->state() & ShiftButton) )
return;
int neww, newh, topX, topY, botX, botY;
diff --git a/kuickshow/src/imlibwidget.cpp b/kuickshow/src/imlibwidget.cpp
index 530875e8..033d73db 100644
--- a/kuickshow/src/imlibwidget.cpp
+++ b/kuickshow/src/imlibwidget.cpp
@@ -320,7 +320,7 @@ bool ImlibWidget::autoRotate( KuickImage *kuim )
switch ( metaitem.value().toInt() )
{
- // Qt::Orientation:
+ // Orientation:
// 1: normal
// 2: flipped horizontally
// 3: ROT 180
diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp
index a67cfc79..091e2964 100644
--- a/kuickshow/src/kuickshow.cpp
+++ b/kuickshow/src/kuickshow.cpp
@@ -1037,7 +1037,7 @@ bool KuickShow::eventFilter( TQObject *o, TQEvent *e )
else if ( eventType == TQEvent::MouseButtonDblClick )
{
TQMouseEvent *ev = TQT_TQMOUSEEVENT( e );
- if ( ev->button() == Qt::LeftButton )
+ if ( ev->button() == TQt::LeftButton )
{
if ( s_viewers.count() == 1 )
{
diff --git a/kuickshow/src/printing.cpp b/kuickshow/src/printing.cpp
index 2f1fd700..feefec43 100644
--- a/kuickshow/src/printing.cpp
+++ b/kuickshow/src/printing.cpp
@@ -93,7 +93,7 @@ bool Printing::printImageWithTQt( const TQString& filename, KPrinter& printer,
// Black & white print?
if ( printer.option( "app-kuickshow-blackwhite" ) != f) {
- image = image.convertDepth( 1, Qt::MonoOnly | Qt::ThresholdDither | Qt::AvoidDither );
+ image = image.convertDepth( 1, TQt::MonoOnly | TQt::ThresholdDither | TQt::AvoidDither );
}
int filenameOffset = 0;
diff --git a/kview/kview.cpp b/kview/kview.cpp
index 8ecaeba9..2d12200b 100644
--- a/kview/kview.cpp
+++ b/kview/kview.cpp
@@ -595,7 +595,7 @@ void KView::fitWindowToImage()
TQSize winsize = sizeForCentralWidgetSize( imagesize );
TQRect workarea = m_pWinModule->workArea();
- TQScrollBar * sb = new TQScrollBar( Qt::Horizontal, this );
+ TQScrollBar * sb = new TQScrollBar( TQt::Horizontal, this );
int scrollbarwidth = sb->height();
delete sb;
diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp
index 8f1c31eb..7a317d9c 100644
--- a/kview/kviewcanvas/kimagecanvas.cpp
+++ b/kview/kviewcanvas/kimagecanvas.cpp
@@ -83,7 +83,7 @@ KImageCanvas::KImageCanvas( TQWidget * parent, const char * name, const TQString
TQWidget::setMouseTracking( true );
viewport()->setMouseTracking( true );
- m_cursor.setShape( Qt::CrossCursor );
+ m_cursor.setShape( TQt::CrossCursor );
viewport()->setCursor( m_cursor );
m_pTimer->start( MOUSECURSORHIDETIME, true );
@@ -589,7 +589,7 @@ void KImageCanvas::mouseMoveEvent( TQMouseEvent * )
{
if( m_cursor.shape() == TQt::BlankCursor )
{
- m_cursor.setShape( Qt::CrossCursor );
+ m_cursor.setShape( TQt::CrossCursor );
viewport()->setCursor( m_cursor );
if( m_client )
m_client->setCursor( m_cursor );
@@ -607,7 +607,7 @@ void KImageCanvas::resizeEvent( TQResizeEvent * ev )
void KImageCanvas::contentsMousePressEvent( TQMouseEvent * ev )
{
- if ( ev->button() == Qt::RightButton )
+ if ( ev->button() == TQt::RightButton )
emit contextPress( ev->globalPos() );
TQScrollView::contentsMousePressEvent( ev );
}
@@ -772,7 +772,7 @@ void KImageCanvas::timerEvent( TQTimerEvent * ev )
void KImageCanvas::hideCursor()
{
kdDebug( 4620 ) << k_funcinfo << endl;
- m_cursor.setShape( Qt::BlankCursor );
+ m_cursor.setShape( TQt::BlankCursor );
viewport()->setCursor( m_cursor );
if( m_client )
m_client->setCursor( m_cursor );
diff --git a/kview/kviewcanvas/kimageholder.cpp b/kview/kviewcanvas/kimageholder.cpp
index 2f578382..7a0e35ba 100644
--- a/kview/kviewcanvas/kimageholder.cpp
+++ b/kview/kviewcanvas/kimageholder.cpp
@@ -64,7 +64,7 @@ void KImageHolder::mousePressEvent( TQMouseEvent *ev )
{
//kdDebug( 4620 ) << k_funcinfo << " ev->state() = " << ev->state() << endl;
// if the right mouse button is pressed emit the contextPress signal
- if ( ev->button() == Qt::RightButton )
+ if ( ev->button() == TQt::RightButton )
{
emit contextPress( mapToGlobal( ev->pos() ) );
return;
@@ -73,7 +73,7 @@ void KImageHolder::mousePressEvent( TQMouseEvent *ev )
if( m_pPixmap == 0 )
return;
- if( ev->button() == Qt::LeftButton || ev->button() == Qt::MidButton )
+ if( ev->button() == TQt::LeftButton || ev->button() == TQt::MidButton )
{
m_scrollpos = ev->globalPos();
m_selectionStartPoint = ev->pos();
@@ -86,10 +86,10 @@ void KImageHolder::mouseMoveEvent( TQMouseEvent *ev )
if( this->rect().contains( ev->pos(), false ) )
emit cursorPos( ev->pos() );
//kdDebug( 4620 ) << k_funcinfo << " ev->state() = " << ev->state() << endl;
- if( ev->state() & Qt::LeftButton || ev->state() & Qt::MidButton )
+ if( ev->state() & TQt::LeftButton || ev->state() & TQt::MidButton )
{
// scroll when a modifier and left button or the middle button is pressed
- if( ev->state() & AltButton || ev->state() & ControlButton || ev->state() & ShiftButton || ev->state() & Qt::MidButton )
+ if( ev->state() & AltButton || ev->state() & ControlButton || ev->state() & ShiftButton || ev->state() & TQt::MidButton )
{
TQPoint difference = m_scrollpos - ev->globalPos();
emit wannaScroll( difference.x(), difference.y() );
@@ -181,7 +181,7 @@ void KImageHolder::mouseReleaseEvent( TQMouseEvent * ev )
m_scrollTimerId = 0;
}
}
- if( ev->state() & Qt::LeftButton || ev->state() & Qt::MidButton )
+ if( ev->state() & TQt::LeftButton || ev->state() & TQt::MidButton )
if( m_bSelecting )
m_bSelecting = false;
else
diff --git a/kviewshell/documentWidget.cpp b/kviewshell/documentWidget.cpp
index 988fda30..a4737821 100644
--- a/kviewshell/documentWidget.cpp
+++ b/kviewshell/documentWidget.cpp
@@ -450,7 +450,7 @@ void DocumentWidget::mousePressEvent ( TQMouseEvent * e )
}
// Check if the mouse is pressed on a regular hyperlink
- if (e->button() == Qt::LeftButton) {
+ if (e->button() == TQt::LeftButton) {
if (pageData->hyperLinkList.size() > 0)
for(unsigned int i = 0; i < pageData->hyperLinkList.size(); i++) {
if (pageData->hyperLinkList[i].box.contains(e->pos())) {
@@ -464,7 +464,7 @@ void DocumentWidget::mousePressEvent ( TQMouseEvent * e )
setCursor(TQt::IbeamCursor);
}
- if (e->button() == Qt::RightButton || (!moveTool && e->button() == Qt::LeftButton))
+ if (e->button() == TQt::RightButton || (!moveTool && e->button() == TQt::LeftButton))
{
setCursor(TQt::IbeamCursor);
// If Shift is not pressed clear the current selection,
@@ -486,7 +486,7 @@ void DocumentWidget::mouseReleaseEvent ( TQMouseEvent *e )
// otherwise the mouse cursor in the centeringScrollview is wrong
e->ignore();
- if (e->button() == Qt::RightButton || (!moveTool && e->button() == Qt::LeftButton))
+ if (e->button() == TQt::RightButton || (!moveTool && e->button() == TQt::LeftButton))
{
// If the selectedRectangle is empty then there was only a single right click.
if (firstSelectedPoint == e->pos())
@@ -589,7 +589,7 @@ void DocumentWidget::mouseMoveEvent ( TQMouseEvent * e )
clearStatusBarTimer.start(200, true); // clear the statusbar after 200 msec.
// Left mouse button pressed -> Text scroll function
- if ((e->state() & Qt::LeftButton) != 0 && moveTool)
+ if ((e->state() & TQt::LeftButton) != 0 && moveTool)
{
// Pass the mouse event on to the owner of this widget ---under
// normal circumstances that is the centeringScrollView which will
@@ -598,7 +598,7 @@ void DocumentWidget::mouseMoveEvent ( TQMouseEvent * e )
}
// Right mouse button pressed -> Text copy function
- if ((e->state() & Qt::RightButton) != 0 || (!moveTool && (e->state() & Qt::LeftButton != 0)))
+ if ((e->state() & TQt::RightButton) != 0 || (!moveTool && (e->state() & TQt::LeftButton != 0)))
{
if (selectedRectangle.isEmpty()) {
firstSelectedPoint = e->pos();
diff --git a/kviewshell/kviewshell.kcfg b/kviewshell/kviewshell.kcfg
index b292b1ec..9a025e8a 100644
--- a/kviewshell/kviewshell.kcfg
+++ b/kviewshell/kviewshell.kcfg
@@ -81,7 +81,7 @@
</group>
<group name="Accessibility" >
<entry key="PaperColor" type="Color" >
- <default code="true" >Qt::white</default>
+ <default code="true" >TQt::white</default>
</entry>
<entry key="ChangeColors" type="Bool" >
<default>false</default>
diff --git a/kviewshell/marklist.cpp b/kviewshell/marklist.cpp
index 9c2a7dee..799b5eea 100644
--- a/kviewshell/marklist.cpp
+++ b/kviewshell/marklist.cpp
@@ -258,11 +258,11 @@ bool MarkListWidget::isVisible()
void MarkListWidget::mousePressEvent(TQMouseEvent* e)
{
// Select Page
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
emit selected(pageNumber);
}
- else if (e->button() == Qt::RightButton)
+ else if (e->button() == TQt::RightButton)
{
emit showPopupMenu(pageNumber, e->globalPos());
}
@@ -502,7 +502,7 @@ void MarkList::updateWidgetSize(const PageNumber& pageNumber)
void MarkList::mousePressEvent(TQMouseEvent* e)
{
- if (e->button() == Qt::RightButton)
+ if (e->button() == TQt::RightButton)
{
// We call showPopupMenu with an invalid pageNumber to indicate that
// the mouse does not point at a thumbnailWidget.
diff --git a/kviewshell/pageView.cpp b/kviewshell/pageView.cpp
index f59e197b..c651b0b6 100644
--- a/kviewshell/pageView.cpp
+++ b/kviewshell/pageView.cpp
@@ -195,7 +195,7 @@ void PageView::keyPressEvent( TQKeyEvent* e )
void PageView::contentsMousePressEvent( TQMouseEvent* e )
{
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
if (moveTool)
{
@@ -222,7 +222,7 @@ void PageView::contentsMouseMoveEvent( TQMouseEvent* e )
{
TQPoint newPos = e->globalPos();
- if (e->state() == Qt::LeftButton && moveTool)
+ if (e->state() == TQt::LeftButton && moveTool)
{
TQPoint delta = dragGrabPos - newPos;
scrollBy(delta.x(), delta.y());
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h
index 54c91e83..2fc77cbb 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h
@@ -151,10 +151,10 @@ public:
special cases.
\end{description} */
int mode;
- /**Qt::Horizontal page alignment. Possible values are #ALIGN_LEFT#,
+ /** Horizontal page alignment. Possible values are #ALIGN_LEFT#,
#ALIGN_CENTER#, #ALIGN_RIGHT# and #ALIGN_UNSPEC#. */
alignment hor_align;
- /**Qt::Vertical page alignment. Possible values are #ALIGN_TOP#,
+ /** Vertical page alignment. Possible values are #ALIGN_TOP#,
#ALIGN_CENTER#, #ALIGN_BOTTOM# and #ALIGN_UNSPEC#. */
alignment ver_align;
/** List of defined map areas. They may be just areas of highlighting
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp
index 152efa2c..fc69e154 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp
@@ -87,7 +87,7 @@ static inline TYPE min(TYPE a,TYPE b) { return (a<b)?a:b; }
//******************************** DjVuTXT **********************************
//***************************************************************************
-const char DjVuTXT::end_of_column = 013; // VT:Qt::Vertical Tab
+const char DjVuTXT::end_of_column = 013; // VT: Vertical Tab
const char DjVuTXT::end_of_region = 035; // GS: Group Separator
const char DjVuTXT::end_of_paragraph = 037; // US: Unit Separator
const char DjVuTXT::end_of_line = 012; // LF: Line Feed
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuText.h b/kviewshell/plugins/djvu/libdjvu/DjVuText.h
index abd57a62..6f23c3b3 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuText.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuText.h
@@ -171,13 +171,13 @@ public:
control character:
\begin{tabular}{lll}
{\bf Name} & {\bf Octal} & {\bf Ascii name} \\\hline\\
- {\tt DjVuText::end_of_column} & 013 & VT,Qt::Vertical Tab \\
+ {\tt DjVuText::end_of_column} & 013 & VT, Vertical Tab \\
{\tt DjVuText::end_of_region} & 035 & GS, Group Separator \\
{\tt DjVuText::end_of_paragraph} & 037 & US, Unit Separator \\
{\tt DjVuText::end_of_line} & 012 & LF: Line Feed
\end{tabular} */
GUTF8String textUTF8;
- static const char end_of_column ; // VT:Qt::Vertical Tab
+ static const char end_of_column ; // VT: Vertical Tab
static const char end_of_region ; // GS: Group Separator
static const char end_of_paragraph ; // US: Unit Separator
static const char end_of_line ; // LF: Line Feed
diff --git a/kviewshell/plugins/djvu/libdjvu/GRect.h b/kviewshell/plugins/djvu/libdjvu/GRect.h
index 67c0ce94..518691ea 100644
--- a/kviewshell/plugins/djvu/libdjvu/GRect.h
+++ b/kviewshell/plugins/djvu/libdjvu/GRect.h
@@ -131,7 +131,7 @@ namespace DJVU {
class GRect
{
public:
- /** #Qt::OrientationBits# defines 3 mutually exclusive
+ /** #OrientationBits# defines 3 mutually exclusive
bits to indicate the image orientation.
There are four possible rotation values for an image
@@ -149,7 +149,7 @@ public:
};
/** #Orientations# defines all 8 possible orientations, using
- the three \Ref{Qt::OrientationBits}.
+ the three \Ref{OrientationBits}.
\begin{itemize}
\item {\em TDLRNR} for Top Down, Left to Right, No Rotation.
\item {\em BULRNR} for Bottom Up, Left to Right, No Rotation.
diff --git a/kviewshell/plugins/djvu/libdjvu/JB2Image.h b/kviewshell/plugins/djvu/libdjvu/JB2Image.h
index d3f2acaa..4619445e 100644
--- a/kviewshell/plugins/djvu/libdjvu/JB2Image.h
+++ b/kviewshell/plugins/djvu/libdjvu/JB2Image.h
@@ -196,9 +196,9 @@ class ByteStream;
class JB2Blit {
public:
- /**Qt::Horizontal coordinate of the blit. */
+ /** Horizontal coordinate of the blit. */
unsigned short left;
- /**Qt::Vertical coordinate of the blit. */
+ /** Vertical coordinate of the blit. */
unsigned short bottom;
/** Index of the shape to blit. */
unsigned int shapeno;
diff --git a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp
index add09e3b..3dced77a 100644
--- a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp
@@ -602,7 +602,7 @@ MMRDecoder::scanruns(const unsigned short **endptr)
b1 += *pr++;
break;
}
- /*Qt::Horizontal Mode */
+ /* Horizontal Mode */
case H:
{
// First run
@@ -616,7 +616,7 @@ MMRDecoder::scanruns(const unsigned short **endptr)
*xr = rle; xr++; rle = 0;
break;
}
- /*Qt::Vertical Modes */
+ /* Vertical Modes */
case V0:
case VR3:
case VR2:
diff --git a/libkscan/devselector.cpp b/libkscan/devselector.cpp
index 542b975b..cff05d14 100644
--- a/libkscan/devselector.cpp
+++ b/libkscan/devselector.cpp
@@ -59,7 +59,7 @@ DeviceSelector::DeviceSelector( TQWidget *parent, TQStrList& devList,
label->resize( 100, 350 );
topLayout->addWidget( label );
- selectBox = new TQButtonGroup( 1,Qt::Horizontal, i18n( "Select Scan Device" ),
+ selectBox = new TQButtonGroup( 1,TQt::Horizontal, i18n( "Select Scan Device" ),
page, "ButtonBox");
TQ_CHECK_PTR( selectBox );
selectBox->setExclusive( true );
diff --git a/libkscan/img_canvas.cpp b/libkscan/img_canvas.cpp
index 832ca4c6..c4b2c680 100644
--- a/libkscan/img_canvas.cpp
+++ b/libkscan/img_canvas.cpp
@@ -457,7 +457,7 @@ void ImageCanvas::viewportMousePressEvent(TQMouseEvent *ev)
{
if( ! acquired || ! image ) return;
- if(ev->button()==Qt::LeftButton )
+ if(ev->button()==TQt::LeftButton )
{
int cx = contentsX(), cy = contentsY();
@@ -486,7 +486,7 @@ void ImageCanvas::viewportMousePressEvent(TQMouseEvent *ev)
void ImageCanvas::viewportMouseReleaseEvent(TQMouseEvent *ev)
{
- if(ev->button()!=Qt::LeftButton || !acquired ) return;
+ if(ev->button()!=TQt::LeftButton || !acquired ) return;
//// debug( "Mouse Release at %d/%d", ev->x(), ev->y());
if(moving!=MOVE_NONE) {
diff --git a/libkscan/imgscaledialog.cpp b/libkscan/imgscaledialog.cpp
index d7841339..2726baf9 100644
--- a/libkscan/imgscaledialog.cpp
+++ b/libkscan/imgscaledialog.cpp
@@ -40,7 +40,7 @@ ImgScaleDialog::ImgScaleDialog( TQWidget *parent, int curr_sel,
// (void) new TQLabel( , main, "Page");
//
// makeMainWidget();
- TQButtonGroup *radios = new TQButtonGroup ( 2, Qt::Horizontal, this );
+ TQButtonGroup *radios = new TQButtonGroup ( 2, TQt::Horizontal, this );
setMainWidget(radios);
TQ_CHECK_PTR(radios);
radios->setTitle( i18n("Select Image Zoom") );
diff --git a/libkscan/kscanslider.cpp b/libkscan/kscanslider.cpp
index 6d64f213..01179b8d 100644
--- a/libkscan/kscanslider.cpp
+++ b/libkscan/kscanslider.cpp
@@ -58,7 +58,7 @@ KScanSlider::KScanSlider( TQWidget *parent, const TQString& text,
hb->addSpacing( 4 );
}
- slider = new TQSlider( (int) min, (int)max, 1, (int)min, Qt::Horizontal, this, "AUTO_SLIDER_" );
+ slider = new TQSlider( (int) min, (int)max, 1, (int)min, TQt::Horizontal, this, "AUTO_SLIDER_" );
slider->setTickmarks( TQSlider::Below );
slider->setTickInterval( int(TQMAX( (max-min)/10, 1 )) );
slider->setSteps( int(TQMAX( (max-min)/20, 1) ), int(TQMAX( (max-min)/10, 1) ) );
diff --git a/libkscan/previewer.cpp b/libkscan/previewer.cpp
index 2925d50f..e8194b6d 100644
--- a/libkscan/previewer.cpp
+++ b/libkscan/previewer.cpp
@@ -200,7 +200,7 @@ Previewer::Previewer(TQWidget *parent, const char *name )
/** Autoselection Box **/
- d->m_autoSelGroup = new TQGroupBox( 1,Qt::Horizontal, i18n("Auto-Selection"), frame);
+ d->m_autoSelGroup = new TQGroupBox( 1,TQt::Horizontal, i18n("Auto-Selection"), frame);
TQHBox *hbox = new TQHBox(d->m_autoSelGroup);
d->m_cbAutoSel = new TQCheckBox( i18n("Active on"), hbox );
@@ -224,7 +224,7 @@ Previewer::Previewer(TQWidget *parent, const char *name )
(void) new TQLabel( i18n("scanner background"), d->m_autoSelGroup );
TQLabel *l1= new TQLabel( i18n("Thresh&old:"), d->m_autoSelGroup );
- d->m_sliderThresh = new TQSlider( 0, 254, 10, d->m_autoSelThresh, Qt::Horizontal,
+ d->m_sliderThresh = new TQSlider( 0, 254, 10, d->m_autoSelThresh, TQt::Horizontal,
d->m_autoSelGroup );
connect( d->m_sliderThresh, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slSetAutoSelThresh(int)));
TQToolTip::add( d->m_sliderThresh,
@@ -236,7 +236,7 @@ Previewer::Previewer(TQWidget *parent, const char *name )
#if 0 /** Dustsize-Slider: No deep impact on result **/
(void) new TQLabel( i18n("Dust size:"), grBox );
- d->m_sliderDust = new TQSlider( 0, 50, 5, d->m_dustsize, Qt::Horizontal, grBox );
+ d->m_sliderDust = new TQSlider( 0, 50, 5, d->m_dustsize, TQt::Horizontal, grBox );
connect( d->m_sliderDust, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slSetAutoSelDustsize(int)));
#endif
@@ -246,7 +246,7 @@ Previewer::Previewer(TQWidget *parent, const char *name )
left->addWidget(d->m_autoSelGroup);
/* Labels for the dimension */
- TQGroupBox *gbox = new TQGroupBox( 1,Qt::Horizontal, i18n("Selection"), frame, "GROUPBOX" );
+ TQGroupBox *gbox = new TQGroupBox( 1,TQt::Horizontal, i18n("Selection"), frame, "GROUPBOX" );
TQLabel *l2 = new TQLabel( i18n("width - mm" ), gbox );
TQLabel *l3 = new TQLabel( i18n("height - mm" ), gbox );
diff --git a/libkscan/scandialog.cpp b/libkscan/scandialog.cpp
index bd38caa1..f2656e33 100644
--- a/libkscan/scandialog.cpp
+++ b/libkscan/scandialog.cpp
@@ -74,7 +74,7 @@ ScanDialog::ScanDialog( TQWidget *parent, const char *name, bool modal )
{
TQVBox *page = addVBoxPage( i18n("&Scanning") );
- splitter = new TQSplitter(Qt::Horizontal, page, "splitter" );
+ splitter = new TQSplitter(TQt::Horizontal, page, "splitter" );
TQ_CHECK_PTR( splitter );
m_scanParams = 0;
@@ -110,7 +110,7 @@ void ScanDialog::createOptionsTab( void )
TQVBox *page = addVBoxPage( i18n("&Options"));
setMainWidget(page);
- TQGroupBox *gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Startup Options"), page, "GB_STARTUP" );
+ TQGroupBox *gb = new TQGroupBox( 1, TQt::Horizontal, i18n("Startup Options"), page, "GB_STARTUP" );
TQLabel *label = new TQLabel( i18n( "Note: changing these options will affect the scan plugin on next start." ),
gb );
label->setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
diff --git a/libkscan/scanparams.cpp b/libkscan/scanparams.cpp
index cd9325d9..3dafbc6e 100644
--- a/libkscan/scanparams.cpp
+++ b/libkscan/scanparams.cpp
@@ -662,7 +662,7 @@ void ScanParams::virtualScannerParams( void )
TQWidget *w = 0;
/* Selection if virt. Scanner or SANE Debug */
- bg_virt_scan_mode = new TQButtonGroup( 2, Qt::Horizontal,
+ bg_virt_scan_mode = new TQButtonGroup( 2, TQt::Horizontal,
this, "GroupBoxVirtScanner" );
connect( bg_virt_scan_mode, TQT_SIGNAL(clicked(int)),
this, TQT_SLOT( slVirtScanModeSelect(int)));
diff --git a/tdefile-plugins/RETURNED_ITEMS b/tdefile-plugins/RETURNED_ITEMS
index 4da0c461..9bf09559 100644
--- a/tdefile-plugins/RETURNED_ITEMS
+++ b/tdefile-plugins/RETURNED_ITEMS
@@ -50,7 +50,7 @@ String Camera make
String Camera model
String Date/time
Size Dimensions Width x Height in pixels
-int Qt::Orientation 1 - "The 0th row is at the visual top of the image,
+int Orientation 1 - "The 0th row is at the visual top of the image,
and the 0th column is the visual left-hand side."
2 - "The 0th row is at the visual top of the image,
and the 0th column is the visual right-hand side."
diff --git a/tdefile-plugins/raw/parse.c b/tdefile-plugins/raw/parse.c
index 467b0577..4f7e8dc1 100644
--- a/tdefile-plugins/raw/parse.c
+++ b/tdefile-plugins/raw/parse.c
@@ -284,7 +284,7 @@ int parse_tiff_ifd (int base, int level)
case 0x111: /* StripOffset */
if (!offset || is_dng) offset = val;
break;
- case 0x112: /* Qt::Orientation */
+ case 0x112: /* Orientation */
flip = flip_map[(val-1) & 7];
break;
case 0x117: /* StripByteCounts */
diff --git a/tdeiconedit/kresize.cpp b/tdeiconedit/kresize.cpp
index b7007238..4a46ae31 100644
--- a/tdeiconedit/kresize.cpp
+++ b/tdeiconedit/kresize.cpp
@@ -34,7 +34,7 @@ KResizeWidget::KResizeWidget( TQWidget* parent, const char* name,
TQHBoxLayout* genLayout = new TQHBoxLayout( this );
TQGroupBox* group = new TQGroupBox( i18n( "Size" ), this );
- group->setColumnLayout( 0, Qt::Horizontal );
+ group->setColumnLayout( 0, TQt::Horizontal );
genLayout->addWidget( group );
TQHBoxLayout* layout = new TQHBoxLayout( group->layout(), 6 );
diff --git a/tdeiconedit/palettetoolbar.cpp b/tdeiconedit/palettetoolbar.cpp
index 04914f2b..407821cc 100644
--- a/tdeiconedit/palettetoolbar.cpp
+++ b/tdeiconedit/palettetoolbar.cpp
@@ -35,7 +35,7 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name )
{
TQWidget *base = new TQWidget( this );
- TQBoxLayout::Direction d = orientation() == Qt::Horizontal?
+ TQBoxLayout::Direction d = orientation() == TQt::Horizontal?
TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom;
m_layout = new TQBoxLayout( base, d, 2, 6 );
@@ -86,12 +86,12 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name )
setMovingEnabled( false );
}
-void PaletteToolBar::setOrientation( Qt::Orientation o )
+void PaletteToolBar::setOrientation( TQt::Orientation o )
{
if( barPos() == Floating )
- o = o == Qt::Vertical ? Qt::Horizontal : Qt::Vertical;
+ o = o == TQt::Vertical ? TQt::Horizontal : TQt::Vertical;
- TQBoxLayout::Direction d = o == Qt::Horizontal? TQBoxLayout::LeftToRight
+ TQBoxLayout::Direction d = o == TQt::Horizontal? TQBoxLayout::LeftToRight
: TQBoxLayout::TopToBottom;
m_layout->setDirection( d );
diff --git a/tdeiconedit/palettetoolbar.h b/tdeiconedit/palettetoolbar.h
index 5a39bd81..254d49d0 100644
--- a/tdeiconedit/palettetoolbar.h
+++ b/tdeiconedit/palettetoolbar.h
@@ -41,7 +41,7 @@ class PaletteToolBar : public TDEToolBar
void newColor( uint c );
public slots:
- virtual void setOrientation( Qt::Orientation o );
+ virtual void setOrientation( TQt::Orientation o );
void previewChanged( const TQPixmap &p );
void addColors( uint n, uint *c );
void addColor( uint color );
diff --git a/tdeiconedit/tdeiconconfig.cpp b/tdeiconedit/tdeiconconfig.cpp
index 0fb4639a..464497f3 100644
--- a/tdeiconedit/tdeiconconfig.cpp
+++ b/tdeiconedit/tdeiconconfig.cpp
@@ -59,7 +59,7 @@ KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent)
TQFrame *frame = makeMainWidget();
TQVBoxLayout *ml = new TQVBoxLayout(frame);
TQGroupBox *grp = new TQGroupBox(i18n("Template"), frame);
- grp->setColumnLayout(0, Qt::Vertical);
+ grp->setColumnLayout(0, TQt::Vertical);
grp->layout()->setSpacing(spacingHint());
grp->layout()->setMargin(marginHint());
TQGridLayout *l = new TQGridLayout(grp->layout());
@@ -119,7 +119,7 @@ KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent)
btadd = btremove = btedit = 0L;
TQGroupBox* grp = new TQGroupBox( i18n( "Templates" ), this );
- grp->setColumnLayout( 0, Qt::Horizontal );
+ grp->setColumnLayout( 0, TQt::Horizontal );
templates = new TDEIconListBox( grp );
connect( templates, TQT_SIGNAL( highlighted( int ) ),
@@ -245,7 +245,7 @@ KBackgroundConfig::KBackgroundConfig( TQWidget* parent )
TQVBoxLayout *mainLayout = new TQVBoxLayout( this );
TQGroupBox *grp1 = new TQGroupBox( i18n( "Select Background" ), this );
- grp1->setColumnLayout(0, Qt::Vertical );
+ grp1->setColumnLayout(0, TQt::Vertical );
grp1->layout()->setSpacing( KDialog::spacingHint() );
grp1->layout()->setMargin( KDialog::marginHint() );
mainLayout->addWidget( grp1 );
diff --git a/tdeiconedit/tdeicongrid.cpp b/tdeiconedit/tdeicongrid.cpp
index 3424be07..6d357f08 100644
--- a/tdeiconedit/tdeicongrid.cpp
+++ b/tdeiconedit/tdeicongrid.cpp
@@ -112,12 +112,12 @@ KGridView::KGridView(TQImage *image, KCommandHistory* history, TQWidget *parent,
_corner = new TQFrame(this);
_corner->setFrameStyle(TQFrame::WinPanel | TQFrame::Raised);
- _hruler = new KRuler(Qt::Horizontal, this);
+ _hruler = new KRuler(TQt::Horizontal, this);
_hruler->setEndLabel(i18n("width"));
_hruler->setOffset( -2 );
_hruler->setRange(0, 1000);
- _vruler = new KRuler(Qt::Vertical, this);
+ _vruler = new KRuler(TQt::Vertical, this);
_vruler->setEndLabel(i18n("height"));
_vruler->setOffset( -2 );
_vruler->setRange(0, 1000);
@@ -710,7 +710,7 @@ void TDEIconEditGrid::paintForeground(TQPainter* p, TQPaintEvent* e)
void TDEIconEditGrid::mousePressEvent( TQMouseEvent *e )
{
- if(!e || (e->button() != Qt::LeftButton))
+ if(!e || (e->button() != TQt::LeftButton))
return;
int row = findRow( e->pos().y() );
@@ -886,7 +886,7 @@ void TDEIconEditGrid::mouseMoveEvent( TQMouseEvent *e )
void TDEIconEditGrid::mouseReleaseEvent( TQMouseEvent *e )
{
- if(!e || (e->button() != Qt::LeftButton))
+ if(!e || (e->button() != TQt::LeftButton))
return;
int row = findRow( e->pos().y() );