From 4078a8959dd0b8045165fb0c4a9a153ff4e7b038 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 4 Nov 2023 22:49:22 +0900 Subject: Replace Qt with TQt Signed-off-by: Michele Calgaro (cherry picked from commit 9761441f6e9756d823d652fadc71ff65fcb63dcd) --- acinclude.m4 | 2 +- ksquirrel/imageedit/sq_imageconvert.ui.h | 2 +- ksquirrel/ksquirrel.cpp | 2 +- ksquirrel/ksquirrel.h | 2 +- ksquirrel/ksquirrelpart/sq_glwidget.cpp | 12 ++++++------ ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp | 6 +++--- ksquirrel/sidebar/sq_categorybrowsermenu.cpp | 2 +- ksquirrel/sidebar/sq_multibar.cpp | 2 +- ksquirrel/sidebar/sq_previewwidget.cpp | 2 +- ksquirrel/sq_filethumbviewitem.cpp | 2 +- ksquirrel/sq_glwidget.cpp | 12 ++++++------ ksquirrel/sq_glwidget_stuff.cpp | 6 +++--- ksquirrel/sq_pluginsinfo.ui.h | 2 +- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index dc1ef4f..18bcff2 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1141,7 +1141,7 @@ fi if test "$kde_qtver" = "3"; then cat >> conftest.$ac_ext <> conftest.$ac_ext <slider->setRange(0, 255, 1, true); setExtension(c); - setOrientation(Qt::Horizontal); + setOrientation(TQt::Horizontal); } void SQ_ImageConvert::slotDebugText(const TQString &text, bool bold) diff --git a/ksquirrel/ksquirrel.cpp b/ksquirrel/ksquirrel.cpp index a6030e5..bcceaa3 100644 --- a/ksquirrel/ksquirrel.cpp +++ b/ksquirrel/ksquirrel.cpp @@ -530,7 +530,7 @@ void KSquirrel::createWidgets(int createFirst) pTLocation->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); // main splitter - mainView = new TQSplitter(Qt::Horizontal, mainPage); Q_ASSERT(mainView); + mainView = new TQSplitter(TQt::Horizontal, mainPage); Q_ASSERT(mainView); KStatusBar *s = new KStatusBar(mainPage); diff --git a/ksquirrel/ksquirrel.h b/ksquirrel/ksquirrel.h index f76b268..5a4a3ed 100644 --- a/ksquirrel/ksquirrel.h +++ b/ksquirrel/ksquirrel.h @@ -323,7 +323,7 @@ class KSquirrel : public TDEMainWindow, public DCOPObject * * will call KSquirrel::control("image_next"), which will * construct TQKeyEvent(TQEvent::KeyPress, TQt::Key_PageDown, - * TQt::Key_PageDown, Qt::NoButton) + * TQt::Key_PageDown, TQt::NoButton) * and send it to SQ_GLWidget. SQ_GLWidget will catch keypress event, * and load next image in the current directory. */ diff --git a/ksquirrel/ksquirrelpart/sq_glwidget.cpp b/ksquirrel/ksquirrelpart/sq_glwidget.cpp index 30e6ea1..30f67d7 100644 --- a/ksquirrel/ksquirrelpart/sq_glwidget.cpp +++ b/ksquirrel/ksquirrelpart/sq_glwidget.cpp @@ -521,7 +521,7 @@ void SQ_GLWidget::matrixChanged() */ void SQ_GLWidget::wheelEvent(TQWheelEvent *e) { - if(e->delta() < 0 && e->state() == Qt::NoButton) + if(e->delta() < 0 && e->state() == TQt::NoButton) { #ifndef KSQUIRREL_PART SQ_Config::instance()->setGroup("GL view"); @@ -534,7 +534,7 @@ void SQ_GLWidget::wheelEvent(TQWheelEvent *e) slotZoomPlus(); } - else if(e->delta() > 0 && e->state() == Qt::NoButton) + else if(e->delta() > 0 && e->state() == TQt::NoButton) { #ifndef KSQUIRREL_PART SQ_Config::instance()->setGroup("GL view"); @@ -564,7 +564,7 @@ void SQ_GLWidget::mousePressEvent(TQMouseEvent *e) setFocus(); // left button, update cursor - if(e->button() == Qt::LeftButton && e->state() == Qt::NoButton && tab->glselection == -1) + if(e->button() == TQt::LeftButton && e->state() == TQt::NoButton && tab->glselection == -1) { #ifndef KSQUIRREL_PART TQTime t = TQTime::currentTime(); @@ -593,7 +593,7 @@ void SQ_GLWidget::mousePressEvent(TQMouseEvent *e) movetype = 1; } // left button + SHIFT, let's start drawing zoom frame - else if(e->button() == Qt::LeftButton && (e->state() == TQt::ShiftButton || tab->glselection != -1)) + else if(e->button() == TQt::LeftButton && (e->state() == TQt::ShiftButton || tab->glselection != -1)) { // stop animation! stopAnimation(); @@ -609,10 +609,10 @@ void SQ_GLWidget::mousePressEvent(TQMouseEvent *e) movetype = 2; } // right button - show context menu - else if(e->button() == Qt::RightButton) + else if(e->button() == TQt::RightButton) menu->popup(TQCursor::pos()); // middle button - toggle fullscreen state - else if(e->button() == Qt::MidButton) + else if(e->button() == TQt::MidButton) toggleFullScreen(); } diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp index ed41772..87d02ab 100644 --- a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp +++ b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp @@ -199,7 +199,7 @@ void SQ_GLWidget::createToolbar() pAToolPrint = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/print.png")), i18n("Print"), TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), toolbar); new SQ_ToolButton(TQPixmap(locate("data", "images/actions/shownav.png")), i18n("Show navigator"), TQT_TQOBJECT(this), TQT_SLOT(slotShowNav()), toolbar); - slider_zoom = new TQSlider(1, 38, 2, 19, Qt::Horizontal, toolbar); + slider_zoom = new TQSlider(1, 38, 2, 19, TQt::Horizontal, toolbar); slider_zoom->setTickmarks(TQSlider::Below); slider_zoom->setTickInterval(19); connect(slider_zoom, TQT_SIGNAL(valueChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetZoomPercents(int))); @@ -1395,8 +1395,8 @@ void SQ_GLWidget::slotCloseRequest(int index) TQMouseEvent ev(TQEvent::MouseMove, TQCursor::pos(), SQ_GLView::window()->tabbar()->mapFromGlobal(TQCursor::pos()), - Qt::NoButton, - Qt::NoButton); + TQt::NoButton, + TQt::NoButton); TDEApplication::sendEvent(SQ_GLView::window()->tabbar(), &ev); diff --git a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp b/ksquirrel/sidebar/sq_categorybrowsermenu.cpp index 565ff91..5585ed5 100644 --- a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp +++ b/ksquirrel/sidebar/sq_categorybrowsermenu.cpp @@ -388,7 +388,7 @@ void SQ_CategoryBrowserMenu::mouseMoveEvent(TQMouseEvent *e) { TQPopupMenu::mouseMoveEvent(e); - if (!(e->state() & Qt::LeftButton)) return; + if (!(e->state() & TQt::LeftButton)) return; if(_lastpress == TQPoint(-1, -1)) return; // DND delay diff --git a/ksquirrel/sidebar/sq_multibar.cpp b/ksquirrel/sidebar/sq_multibar.cpp index 337a246..3af025c 100644 --- a/ksquirrel/sidebar/sq_multibar.cpp +++ b/ksquirrel/sidebar/sq_multibar.cpp @@ -56,7 +56,7 @@ SQ_MultiBar::SQ_MultiBar(TQWidget *parent, const char *name) : TQHBox(parent, na setSpacing(0); - TQSplitter *ts = new TQSplitter(Qt::Vertical, this); + TQSplitter *ts = new TQSplitter(TQt::Vertical, this); ts->setOpaqueResize(false); // TQWigdetStack will contain all widgets diff --git a/ksquirrel/sidebar/sq_previewwidget.cpp b/ksquirrel/sidebar/sq_previewwidget.cpp index bf4d710..4ff93da 100644 --- a/ksquirrel/sidebar/sq_previewwidget.cpp +++ b/ksquirrel/sidebar/sq_previewwidget.cpp @@ -243,7 +243,7 @@ void SQ_PreviewWidget::mousePressEvent(TQMouseEvent *e) { e->accept(); - if(e->button() == Qt::RightButton) + if(e->button() == TQt::RightButton) popup->exec(e->globalPos()); } diff --git a/ksquirrel/sq_filethumbviewitem.cpp b/ksquirrel/sq_filethumbviewitem.cpp index f5325cd..d2be112 100644 --- a/ksquirrel/sq_filethumbviewitem.cpp +++ b/ksquirrel/sq_filethumbviewitem.cpp @@ -54,7 +54,7 @@ void SQ_FileThumbViewItem::paintText(TQPainter *p, const TQColorGroup &cg) } else { - if(iconView()->itemTextBackground() != Qt::NoBrush) + if(iconView()->itemTextBackground() != TQt::NoBrush) p->fillRect(rectText, iconView()->itemTextBackground()); p->setPen(cg.text()); diff --git a/ksquirrel/sq_glwidget.cpp b/ksquirrel/sq_glwidget.cpp index 30e6ea1..30f67d7 100644 --- a/ksquirrel/sq_glwidget.cpp +++ b/ksquirrel/sq_glwidget.cpp @@ -521,7 +521,7 @@ void SQ_GLWidget::matrixChanged() */ void SQ_GLWidget::wheelEvent(TQWheelEvent *e) { - if(e->delta() < 0 && e->state() == Qt::NoButton) + if(e->delta() < 0 && e->state() == TQt::NoButton) { #ifndef KSQUIRREL_PART SQ_Config::instance()->setGroup("GL view"); @@ -534,7 +534,7 @@ void SQ_GLWidget::wheelEvent(TQWheelEvent *e) slotZoomPlus(); } - else if(e->delta() > 0 && e->state() == Qt::NoButton) + else if(e->delta() > 0 && e->state() == TQt::NoButton) { #ifndef KSQUIRREL_PART SQ_Config::instance()->setGroup("GL view"); @@ -564,7 +564,7 @@ void SQ_GLWidget::mousePressEvent(TQMouseEvent *e) setFocus(); // left button, update cursor - if(e->button() == Qt::LeftButton && e->state() == Qt::NoButton && tab->glselection == -1) + if(e->button() == TQt::LeftButton && e->state() == TQt::NoButton && tab->glselection == -1) { #ifndef KSQUIRREL_PART TQTime t = TQTime::currentTime(); @@ -593,7 +593,7 @@ void SQ_GLWidget::mousePressEvent(TQMouseEvent *e) movetype = 1; } // left button + SHIFT, let's start drawing zoom frame - else if(e->button() == Qt::LeftButton && (e->state() == TQt::ShiftButton || tab->glselection != -1)) + else if(e->button() == TQt::LeftButton && (e->state() == TQt::ShiftButton || tab->glselection != -1)) { // stop animation! stopAnimation(); @@ -609,10 +609,10 @@ void SQ_GLWidget::mousePressEvent(TQMouseEvent *e) movetype = 2; } // right button - show context menu - else if(e->button() == Qt::RightButton) + else if(e->button() == TQt::RightButton) menu->popup(TQCursor::pos()); // middle button - toggle fullscreen state - else if(e->button() == Qt::MidButton) + else if(e->button() == TQt::MidButton) toggleFullScreen(); } diff --git a/ksquirrel/sq_glwidget_stuff.cpp b/ksquirrel/sq_glwidget_stuff.cpp index ed41772..87d02ab 100644 --- a/ksquirrel/sq_glwidget_stuff.cpp +++ b/ksquirrel/sq_glwidget_stuff.cpp @@ -199,7 +199,7 @@ void SQ_GLWidget::createToolbar() pAToolPrint = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/print.png")), i18n("Print"), TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), toolbar); new SQ_ToolButton(TQPixmap(locate("data", "images/actions/shownav.png")), i18n("Show navigator"), TQT_TQOBJECT(this), TQT_SLOT(slotShowNav()), toolbar); - slider_zoom = new TQSlider(1, 38, 2, 19, Qt::Horizontal, toolbar); + slider_zoom = new TQSlider(1, 38, 2, 19, TQt::Horizontal, toolbar); slider_zoom->setTickmarks(TQSlider::Below); slider_zoom->setTickInterval(19); connect(slider_zoom, TQT_SIGNAL(valueChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetZoomPercents(int))); @@ -1395,8 +1395,8 @@ void SQ_GLWidget::slotCloseRequest(int index) TQMouseEvent ev(TQEvent::MouseMove, TQCursor::pos(), SQ_GLView::window()->tabbar()->mapFromGlobal(TQCursor::pos()), - Qt::NoButton, - Qt::NoButton); + TQt::NoButton, + TQt::NoButton); TDEApplication::sendEvent(SQ_GLView::window()->tabbar(), &ev); diff --git a/ksquirrel/sq_pluginsinfo.ui.h b/ksquirrel/sq_pluginsinfo.ui.h index 6522b62..bc8f05a 100644 --- a/ksquirrel/sq_pluginsinfo.ui.h +++ b/ksquirrel/sq_pluginsinfo.ui.h @@ -83,6 +83,6 @@ void SQ_PluginsInfo::slotDoubleClicked(TQListViewItem *i) void SQ_PluginsInfo::slotMouseButtonClicked(int button, TQListViewItem *i, const TQPoint &, int c) { - if(button == Qt::LeftButton && i && !c) + if(button == TQt::LeftButton && i && !c) slotDoubleClicked(i); } -- cgit v1.2.1