From b965cbac5b21345e9dfc768a7e4f660ffa4aa72f Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 13 Nov 2023 21:03:36 +0900 Subject: Replace Qt with TQt Signed-off-by: Michele Calgaro --- kdesktop/kdesktop.kcfg | 2 +- kdesktop/kdesktopapp.cpp | 2 +- kdesktop/kdesktopapp.h | 4 ++-- kdesktop/kdesktopbindings.cpp | 20 ++++++++++---------- kdesktop/kdiconview.cpp | 4 ++-- kdesktop/krootwm.cpp | 6 +++--- kdesktop/lock/autologout.cpp | 2 +- kdesktop/lock/infodlg.cpp | 4 ++-- kdesktop/lock/lockdlg.cpp | 20 ++++++++++---------- kdesktop/lock/lockprocess.cpp | 8 ++++---- kdesktop/lock/main.h | 2 +- kdesktop/lock/querydlg.cpp | 4 ++-- kdesktop/lock/sakdlg.cpp | 2 +- kdesktop/main.cpp | 2 +- kdesktop/minicli.cpp | 2 +- kdesktop/pixmapserver.h | 4 ++-- kdesktop/startupid.cpp | 2 +- kdesktop/tdefileividesktop.h | 2 +- 18 files changed, 46 insertions(+), 46 deletions(-) (limited to 'kdesktop') diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg index 71e008562..183fcc417 100644 --- a/kdesktop/kdesktop.kcfg +++ b/kdesktop/kdesktop.kcfg @@ -123,7 +123,7 @@ - Qt::white + TQt::white diff --git a/kdesktop/kdesktopapp.cpp b/kdesktop/kdesktopapp.cpp index ba05dc655..35f763f9c 100644 --- a/kdesktop/kdesktopapp.cpp +++ b/kdesktop/kdesktopapp.cpp @@ -27,7 +27,7 @@ KUniqueApplication() #endif } -KDesktopApp::KDesktopApp(Display * dpy, Qt::HANDLE visual, Qt::HANDLE colormap): +KDesktopApp::KDesktopApp(Display * dpy, TQt::HANDLE visual, TQt::HANDLE colormap): KUniqueApplication(dpy, visual, colormap) { #ifdef COMPOSITE diff --git a/kdesktop/kdesktopapp.h b/kdesktop/kdesktopapp.h index 39bcf13f4..465598a3d 100644 --- a/kdesktop/kdesktopapp.h +++ b/kdesktop/kdesktopapp.h @@ -38,8 +38,8 @@ class KDesktopApp : public KUniqueApplication TQ_OBJECT public: KDesktopApp(); - KDesktopApp(Display * dpy, Qt::HANDLE visual = 0, - Qt::HANDLE colormap = 0); + KDesktopApp(Display * dpy, TQt::HANDLE visual = 0, + TQt::HANDLE colormap = 0); #ifdef COMPOSITE bool x11EventFilter (XEvent *); diff --git a/kdesktop/kdesktopbindings.cpp b/kdesktop/kdesktopbindings.cpp index 91bddb5b3..fe751db4f 100644 --- a/kdesktop/kdesktopbindings.cpp +++ b/kdesktop/kdesktopbindings.cpp @@ -17,34 +17,34 @@ if (kapp->authorize("run_command")) { #endif - DEF( I18N_NOOP("Run Command"), ALT+Qt::Key_F2, WIN+Qt::Key_Return, slotExecuteCommand() ); + DEF( I18N_NOOP("Run Command"), ALT+TQt::Key_F2, WIN+TQt::Key_Return, slotExecuteCommand() ); #ifndef NOSLOTS } #endif - DEF( I18N_NOOP("Show Taskmanager"), CTRL+Qt::Key_Escape, WIN+CTRL+Qt::Key_Pause, slotShowTaskManager() ); - DEF( I18N_NOOP("Show Window List"), ALT+Qt::Key_F5, WIN+Qt::Key_0, slotShowWindowList() ); - DEF( I18N_NOOP("Switch User"), ALT+CTRL+Qt::Key_Insert, WIN+Qt::Key_Insert, slotSwitchUser() ); + DEF( I18N_NOOP("Show Taskmanager"), CTRL+TQt::Key_Escape, WIN+CTRL+TQt::Key_Pause, slotShowTaskManager() ); + DEF( I18N_NOOP("Show Window List"), ALT+TQt::Key_F5, WIN+TQt::Key_0, slotShowWindowList() ); + DEF( I18N_NOOP("Switch User"), ALT+CTRL+TQt::Key_Insert, WIN+TQt::Key_Insert, slotSwitchUser() ); #ifndef NOSLOTS if (kapp->authorize("lock_screen")) { #endif - DEF2( I18N_NOOP("Lock Session"), ALT+CTRL+Qt::Key_L, WIN+Qt::Key_ScrollLock, KRootWm::self(), TQT_SLOT(slotLock()) ); + DEF2( I18N_NOOP("Lock Session"), ALT+CTRL+TQt::Key_L, WIN+TQt::Key_ScrollLock, KRootWm::self(), TQT_SLOT(slotLock()) ); DEF2( I18N_NOOP("Lock Session (Hotkey)"), TDEShortcut(TQString("XF86ScreenSaver")), TDEShortcut(TQString("XF86ScreenSaver")), KRootWm::self(), TQT_SLOT(slotLock()) ); #ifndef NOSLOTS } if (kapp->authorize("start_screensaver")) { #endif - DEF2( I18N_NOOP("Start Screen Saver"), ALT+CTRL+Qt::Key_S, WIN+Qt::Key_S, KRootWm::self(), TQT_SLOT(slotSave()) ); + DEF2( I18N_NOOP("Start Screen Saver"), ALT+CTRL+TQt::Key_S, WIN+TQt::Key_S, KRootWm::self(), TQT_SLOT(slotSave()) ); #ifndef NOSLOTS } if (kapp->authorize("logout")) { #endif - DEF( I18N_NOOP("Log Out"), ALT+CTRL+Qt::Key_Delete, WIN+Qt::Key_Escape, slotLogout() ); - DEF( I18N_NOOP("Log Out Without Confirmation"), ALT+CTRL+SHIFT+Qt::Key_Delete, WIN+SHIFT+Qt::Key_Escape, slotLogoutNoCnf() ); - DEF( I18N_NOOP("Halt without Confirmation"), ALT+CTRL+SHIFT+Qt::Key_PageDown, WIN+CTRL+SHIFT+Qt::Key_PageDown, slotHaltNoCnf() ); - DEF( I18N_NOOP("Reboot without Confirmation"), ALT+CTRL+SHIFT+Qt::Key_PageUp, WIN+CTRL+SHIFT+Qt::Key_PageUp, slotRebootNoCnf() ); + DEF( I18N_NOOP("Log Out"), ALT+CTRL+TQt::Key_Delete, WIN+TQt::Key_Escape, slotLogout() ); + DEF( I18N_NOOP("Log Out Without Confirmation"), ALT+CTRL+SHIFT+TQt::Key_Delete, WIN+SHIFT+TQt::Key_Escape, slotLogoutNoCnf() ); + DEF( I18N_NOOP("Halt without Confirmation"), ALT+CTRL+SHIFT+TQt::Key_PageDown, WIN+CTRL+SHIFT+TQt::Key_PageDown, slotHaltNoCnf() ); + DEF( I18N_NOOP("Reboot without Confirmation"), ALT+CTRL+SHIFT+TQt::Key_PageUp, WIN+CTRL+SHIFT+TQt::Key_PageUp, slotRebootNoCnf() ); #ifndef NOSLOTS } #endif diff --git a/kdesktop/kdiconview.cpp b/kdesktop/kdiconview.cpp index 409887784..a628aaa12 100644 --- a/kdesktop/kdiconview.cpp +++ b/kdesktop/kdiconview.cpp @@ -650,7 +650,7 @@ void KDIconView::contentsMousePressEvent( TQMouseEvent *e ) if (!m_dirLister) return; //kdDebug(1204) << "KDIconView::contentsMousePressEvent" << endl; // TQIconView, as of Qt 2.2, doesn't emit mouseButtonPressed for LMB on background - if ( e->button() == Qt::LeftButton && KRootWm::self()->hasLeftButtonMenu() ) + if ( e->button() == TQt::LeftButton && KRootWm::self()->hasLeftButtonMenu() ) { TQIconViewItem *item = findItem( e->pos() ); if ( !item ) @@ -731,7 +731,7 @@ void KDIconView::slotMouseButtonClickedKDesktop(int _button, TQIconViewItem* _it { if (!m_dirLister) return; //kdDebug(1204) << "KDIconView::slotMouseButtonClickedKDesktop" << endl; - if ( _item && _button == Qt::MidButton ) { + if ( _item && _button == TQt::MidButton ) { slotExecuted(_item); } } diff --git a/kdesktop/krootwm.cpp b/kdesktop/krootwm.cpp index 62ee673e0..f3c6170e7 100644 --- a/kdesktop/krootwm.cpp +++ b/kdesktop/krootwm.cpp @@ -609,15 +609,15 @@ void KRootWm::mousePressed( const TQPoint& _global, int _button ) { if (!desktopMenu) return; // initialisation not yet done switch ( _button ) { - case Qt::LeftButton: + case TQt::LeftButton: if ( m_bShowMenuBar && menuBar ) menuBar->raise(); activateMenu( leftButtonChoice, _global ); break; - case Qt::MidButton: + case TQt::MidButton: activateMenu( middleButtonChoice, _global ); break; - case Qt::RightButton: + case TQt::RightButton: if (!kapp->authorize("action/kdesktop_rmb")) return; activateMenu( rightButtonChoice, _global ); break; diff --git a/kdesktop/lock/autologout.cpp b/kdesktop/lock/autologout.cpp index 6e05c439d..1b63160f6 100644 --- a/kdesktop/lock/autologout.cpp +++ b/kdesktop/lock/autologout.cpp @@ -67,7 +67,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog" unlockDialogLayout->addWidget( frame ); frameLayout = new TQGridLayout(frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint()); - frameLayout->addMultiCellWidget(pixLabel, 0, 2, 0, 0, Qt::AlignCenter | Qt::AlignTop); + frameLayout->addMultiCellWidget(pixLabel, 0, 2, 0, 0, TQt::AlignCenter | TQt::AlignTop); frameLayout->addWidget(greetLabel, 0, 1); frameLayout->addWidget(mStatusLabel, 1, 1); frameLayout->addWidget(infoLabel, 2, 1); diff --git a/kdesktop/lock/infodlg.cpp b/kdesktop/lock/infodlg.cpp index 3efaf060d..6fc604b43 100644 --- a/kdesktop/lock/infodlg.cpp +++ b/kdesktop/lock/infodlg.cpp @@ -97,7 +97,7 @@ InfoDlg::InfoDlg(LockProcess *parent) layStatus->addWidget( mStatusLabel ); frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); - frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, Qt::AlignTop ); + frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, TQt::AlignTop ); frameLayout->addLayout( layStatus, 1, 1 ); installEventFilter(this); @@ -111,7 +111,7 @@ InfoDlg::~InfoDlg() void InfoDlg::updateLabel(TQString &txt) { - mStatusLabel->setPaletteForegroundColor(Qt::black); + mStatusLabel->setPaletteForegroundColor(TQt::black); mStatusLabel->setText("" + txt + ""); } diff --git a/kdesktop/lock/lockdlg.cpp b/kdesktop/lock/lockdlg.cpp index 890aa7c53..969dcb77a 100644 --- a/kdesktop/lock/lockdlg.cpp +++ b/kdesktop/lock/lockdlg.cpp @@ -200,7 +200,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin) if (!m_lockStartDT.isNull()) { frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); - frameLayout->addMultiCellWidget( theader, 0, 0, 0, 2, Qt::AlignTop ); + frameLayout->addMultiCellWidget( theader, 0, 0, 0, 2, TQt::AlignTop ); frameLayout->addWidget( greetLabel, 1, 1 ); frameLayout->addWidget( lockDTLabel, 2, 1 ); frameLayout->addItem( greet->getLayoutItem(), 3, 1 ); @@ -210,7 +210,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin) } else { frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); - frameLayout->addMultiCellWidget( theader, 0, 0, 0, 2, Qt::AlignTop ); + frameLayout->addMultiCellWidget( theader, 0, 0, 0, 2, TQt::AlignTop ); frameLayout->addWidget( greetLabel, 1, 1 ); frameLayout->addItem( greet->getLayoutItem(), 2, 1 ); frameLayout->addLayout( layStatus, 3, 1 ); @@ -220,7 +220,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin) } else { frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); - frameLayout->addMultiCellWidget( pixLabel, 0, 2, 0, 0, Qt::AlignTop ); + frameLayout->addMultiCellWidget( pixLabel, 0, 2, 0, 0, TQt::AlignTop ); frameLayout->addWidget( greetLabel, 0, 1 ); frameLayout->addItem( greet->getLayoutItem(), 1, 1 ); frameLayout->addLayout( layStatus, 2, 1 ); @@ -329,12 +329,12 @@ void PasswordDlg::setLayoutText( const TQString &txt ) void PasswordDlg::updateLabel() { if (mUnlockingFailed) { - mStatusLabel->setPaletteForegroundColor(Qt::black); + mStatusLabel->setPaletteForegroundColor(TQt::black); mStatusLabel->setText(i18n("Unlocking failed")); // mStatusLabel->show(); } else if (mCapsLocked) { - mStatusLabel->setPaletteForegroundColor(Qt::red); + mStatusLabel->setPaletteForegroundColor(TQt::red); mStatusLabel->setText(i18n("Warning: Caps Lock on")); // mStatusLabel->show(); } @@ -715,9 +715,9 @@ void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text ) connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( accept() ) ); TQGridLayout *grid = new TQGridLayout( winFrame, 2, 2, 10 ); - grid->addWidget( label1, 0, 0, Qt::AlignCenter ); - grid->addWidget( label2, 0, 1, Qt::AlignCenter ); - grid->addMultiCellWidget( button, 1,1, 0,1, Qt::AlignCenter ); + grid->addWidget( label1, 0, 0, TQt::AlignCenter ); + grid->addWidget( label2, 0, 1, TQt::AlignCenter ); + grid->addMultiCellWidget( button, 1,1, 0,1, TQt::AlignCenter ); static_cast< LockProcess* >(parent())->execDialog( &dialog ); } @@ -791,8 +791,8 @@ void PasswordDlg::slotStartNewSession() TQGridLayout *grid = new TQGridLayout( mbox, 2, 2, 2 * KDialog::spacingHint() ); grid->setMargin( KDialog::marginHint() ); - grid->addWidget( label1, 0, 0, Qt::AlignCenter ); - grid->addWidget( label2, 0, 1, Qt::AlignCenter ); + grid->addWidget( label1, 0, 0, TQt::AlignCenter ); + grid->addWidget( label2, 0, 1, TQt::AlignCenter ); TQCheckBox *cb = new TQCheckBox( i18n("&Do not ask again"), winFrame ); grid->addMultiCellWidget( cb, 1,1, 0,1 ); diff --git a/kdesktop/lock/lockprocess.cpp b/kdesktop/lock/lockprocess.cpp index 3ebf80442..bbb6d3175 100644 --- a/kdesktop/lock/lockprocess.cpp +++ b/kdesktop/lock/lockprocess.cpp @@ -2046,7 +2046,7 @@ int LockProcess::execDialog( TQDialog *dlg ) void LockProcess::slotForcePaintBackground() { TQPixmap blankPixmap(mRootWidth, mRootHeight); - blankPixmap.fill(Qt::black); + blankPixmap.fill(TQt::black); slotPaintBackground(blankPixmap); printf("[WARNING] Unable to obtain desktop wallpaper in a timely manner. High system load or possibly a TDE bug!\n"); fflush(stdout); } @@ -2447,9 +2447,9 @@ void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt ) TQVBoxLayout *vbox = new TQVBoxLayout( &box ); vbox->addWidget( winFrame ); TQGridLayout *grid = new TQGridLayout( winFrame, 2, 2, 10 ); - grid->addWidget( label1, 0, 0, Qt::AlignCenter ); - grid->addWidget( label2, 0, 1, Qt::AlignCenter ); - grid->addMultiCellWidget( button, 1,1, 0,1, Qt::AlignCenter ); + grid->addWidget( label1, 0, 0, TQt::AlignCenter ); + grid->addWidget( label2, 0, 1, TQt::AlignCenter ); + grid->addMultiCellWidget( button, 1,1, 0,1, TQt::AlignCenter ); execDialog( &box ); } diff --git a/kdesktop/lock/main.h b/kdesktop/lock/main.h index ec20b43c2..162542555 100644 --- a/kdesktop/lock/main.h +++ b/kdesktop/lock/main.h @@ -28,7 +28,7 @@ class MyApp : public TDEApplication { TQ_OBJECT public: MyApp() : TDEApplication(), lastTick( 0 ) {} - MyApp(Display *display, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0, bool allowStyles=true) : TDEApplication(display, visual, colormap, allowStyles), lastTick( 0 ) {} + MyApp(Display *display, TQt::HANDLE visual = 0, TQt::HANDLE colormap = 0, bool allowStyles=true) : TDEApplication(display, visual, colormap, allowStyles), lastTick( 0 ) {} protected: bool x11EventFilter( XEvent * ); diff --git a/kdesktop/lock/querydlg.cpp b/kdesktop/lock/querydlg.cpp index 1fc5d260c..9d594ecba 100644 --- a/kdesktop/lock/querydlg.cpp +++ b/kdesktop/lock/querydlg.cpp @@ -111,7 +111,7 @@ QueryDlg::QueryDlg(LockProcess *parent) layButtons->addWidget( ok ); frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); - frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, Qt::AlignTop ); + frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, TQt::AlignTop ); frameLayout->addLayout( layStatus, 0, 1 ); frameLayout->addLayout( layPin, 2, 1 ); frameLayout->addMultiCellWidget( sep, 3, 3, 0, 1 ); @@ -140,7 +140,7 @@ TQString QueryDlg::getEntry() void QueryDlg::updateLabel(TQString &txt) { - mStatusLabel->setPaletteForegroundColor(Qt::black); + mStatusLabel->setPaletteForegroundColor(TQt::black); mStatusLabel->setText("" + txt + ""); } diff --git a/kdesktop/lock/sakdlg.cpp b/kdesktop/lock/sakdlg.cpp index 803c77919..274826e69 100644 --- a/kdesktop/lock/sakdlg.cpp +++ b/kdesktop/lock/sakdlg.cpp @@ -142,7 +142,7 @@ void SAKDlg::reject() void SAKDlg::updateLabel(TQString &txt) { - mStatusLabel->setPaletteForegroundColor(Qt::black); + mStatusLabel->setPaletteForegroundColor(TQt::black); mStatusLabel->setText("" + txt + ""); } diff --git a/kdesktop/main.cpp b/kdesktop/main.cpp index b54c03cb7..8892778da 100644 --- a/kdesktop/main.cpp +++ b/kdesktop/main.cpp @@ -247,7 +247,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) *qt_no_foreign_hack = true; // else argb_visual = false ... ? *shrug* if( argb_visual ) - myApp = new KDesktopApp( dpy, Qt::HANDLE( visual ), 0 ); + myApp = new KDesktopApp( dpy, TQt::HANDLE( visual ), 0 ); else XCloseDisplay( dpy ); } diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp index 0f49229a6..4b04ac3fe 100644 --- a/kdesktop/minicli.cpp +++ b/kdesktop/minicli.cpp @@ -375,7 +375,7 @@ void Minicli::reset() void Minicli::keyPressEvent( TQKeyEvent* e ) { - if ( e->key() == Qt::Key_Escape ) + if ( e->key() == TQt::Key_Escape ) { e->accept(); m_dlg->pbCancel->animateClick(); diff --git a/kdesktop/pixmapserver.h b/kdesktop/pixmapserver.h index 876d19822..661d531ad 100644 --- a/kdesktop/pixmapserver.h +++ b/kdesktop/pixmapserver.h @@ -24,7 +24,7 @@ struct KPixmapInode { - Qt::HANDLE handle; + TQt::HANDLE handle; Atom selection; }; @@ -37,7 +37,7 @@ struct KPixmapData struct TDESelectionInode { - Qt::HANDLE handle; + TQt::HANDLE handle; TQString name; }; diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp index 4027b7e9a..d7b1cf75a 100644 --- a/kdesktop/startupid.cpp +++ b/kdesktop/startupid.cpp @@ -176,7 +176,7 @@ void StartupId::start_startupid( const TQString& icon_P ) { const TQColor startup_colors[ StartupId::NUM_BLINKING_PIXMAPS ] - = { Qt::black, Qt::darkGray, Qt::lightGray, Qt::white, Qt::white }; + = { TQt::black, TQt::darkGray, TQt::lightGray, TQt::white, TQt::white }; TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( icon_P, TDEIcon::Small, 0, diff --git a/kdesktop/tdefileividesktop.h b/kdesktop/tdefileividesktop.h index 46f77f636..0434a706e 100644 --- a/kdesktop/tdefileividesktop.h +++ b/kdesktop/tdefileividesktop.h @@ -33,7 +33,7 @@ /* * The dither flags used to display the shadow image */ -#define DITHER_FLAGS (Qt::DiffuseAlphaDither | Qt::ColorOnly | Qt::AvoidDither) +#define DITHER_FLAGS (TQt::DiffuseAlphaDither | TQt::ColorOnly | TQt::AvoidDither) class TQFont; -- cgit v1.2.1