From af0b8f5d1e5e00b1f3b48658d89876c2df28e71c Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 14 Jan 2024 14:09:37 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- kdf/disklist.cpp | 8 ++++---- kdf/disks.cpp | 8 ++++---- kdf/kdf.cpp | 8 ++++---- kdf/kdfconfig.cpp | 18 +++++++++--------- kdf/kdfwidget.cpp | 26 +++++++++++++------------- kdf/kwikdisk.cpp | 26 +++++++++++++------------- kdf/mntconfig.cpp | 36 ++++++++++++++++++------------------ kdf/optiondialog.cpp | 4 ++-- 8 files changed, 67 insertions(+), 67 deletions(-) (limited to 'kdf') diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp index 3526999..8927f0a 100644 --- a/kdf/disklist.cpp +++ b/kdf/disklist.cpp @@ -53,10 +53,10 @@ DiskList::DiskList(TQObject *parent, const char *name) // BackgroundProcesses **************************************** dfProc = new TDEProcess(); TQ_CHECK_PTR(dfProc); - connect( dfProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int) ), - this, TQT_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) ); - connect(dfProc,TQT_SIGNAL(processExited(TDEProcess *) ), - this, TQT_SLOT(dfDone() ) ); + connect( dfProc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int) ), + this, TQ_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) ); + connect(dfProc,TQ_SIGNAL(processExited(TDEProcess *) ), + this, TQ_SLOT(dfDone() ) ); readingDFStdErrOut=FALSE; config = kapp->config(); diff --git a/kdf/disks.cpp b/kdf/disks.cpp index 1084380..391b5d9 100644 --- a/kdf/disks.cpp +++ b/kdf/disks.cpp @@ -56,10 +56,10 @@ void DiskEntry::init() // BackgroundProcesses **************************************** sysProc = new KShellProcess(); TQ_CHECK_PTR(sysProc); - connect( sysProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int) ), - this, TQT_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) ); - connect( sysProc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int) ), - this, TQT_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) ); + connect( sysProc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int) ), + this, TQ_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) ); + connect( sysProc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int) ), + this, TQ_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) ); readingSysStdErrOut=FALSE; diff --git a/kdf/kdf.cpp b/kdf/kdf.cpp index 60b590d..ea3263a 100644 --- a/kdf/kdf.cpp +++ b/kdf/kdf.cpp @@ -41,11 +41,11 @@ KDFTopLevel::KDFTopLevel(TQWidget *, const char *name) { kdf = new KDFWidget(this,"kdf",FALSE); TQ_CHECK_PTR(kdf); - (void) new TDEAction( i18n( "&Update" ), 0, kdf, TQT_SLOT( updateDF() ), actionCollection(), "updatedf" ); + (void) new TDEAction( i18n( "&Update" ), 0, kdf, TQ_SLOT( updateDF() ), actionCollection(), "updatedf" ); - KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); - KStdAction::preferences(kdf, TQT_SLOT(settingsBtnClicked()), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdAction::preferences(kdf, TQ_SLOT(settingsBtnClicked()), actionCollection()); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); setCentralWidget(kdf); // kdf->setMinimumSize(kdf->sizeHint()); diff --git a/kdf/kdfconfig.cpp b/kdf/kdfconfig.cpp index d1f5c15..b3fef55 100644 --- a/kdf/kdfconfig.cpp +++ b/kdf/kdfconfig.cpp @@ -79,10 +79,10 @@ KDFConfigWidget::KDFConfigWidget(TQWidget *parent, const char *name, bool init) { mList->addColumn( mTabName[i]->mName ); } - connect( mList, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(toggleListText(TQListViewItem *,const TQPoint &,int))); - connect( mList, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(slotChanged())); + connect( mList, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(toggleListText(TQListViewItem *,const TQPoint &,int))); + connect( mList, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(slotChanged())); topLayout->addWidget( mList ); TQListViewItem *mListItem = new TQListViewItem( mList ); @@ -103,13 +103,13 @@ KDFConfigWidget::KDFConfigWidget(TQWidget *parent, const char *name, bool init) mScroll->setSteps(1,20); mScroll->setRange(0, 180 ); gl->addWidget( mScroll, 1, 1 ); - connect(mScroll,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotChanged())); + connect(mScroll,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(slotChanged())); mLCD = new TQLCDNumber( this ); TQ_CHECK_PTR(mLCD); mLCD->setNumDigits( 3 ); mLCD->setSegmentStyle(TQLCDNumber::Filled); - connect(mScroll,TQT_SIGNAL(valueChanged(int)),mLCD,TQT_SLOT(display(int))); + connect(mScroll,TQ_SIGNAL(valueChanged(int)),mLCD,TQ_SLOT(display(int))); gl->addMultiCellWidget( mLCD, 0, 1, 0, 0 ); text = i18n("Update frequency [seconds]. The value 0 disables update" ); @@ -125,19 +125,19 @@ KDFConfigWidget::KDFConfigWidget(TQWidget *parent, const char *name, bool init) mFileManagerEdit = new TQLineEdit( this ); TQ_CHECK_PTR(mFileManagerEdit); topLayout->addWidget( mFileManagerEdit ); - connect(mFileManagerEdit,TQT_SIGNAL(textChanged (const TQString &)),this,TQT_SLOT(slotChanged())); + connect(mFileManagerEdit,TQ_SIGNAL(textChanged (const TQString &)),this,TQ_SLOT(slotChanged())); text = i18n("Open file manager automatically on mount"); mOpenMountCheck = new TQCheckBox(text, this ); TQ_CHECK_PTR(mOpenMountCheck); topLayout->addWidget( mOpenMountCheck ); - connect(mOpenMountCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotChanged())); + connect(mOpenMountCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotChanged())); text = i18n("Pop up a window when a disk gets critically full"); mPopupFullCheck = new TQCheckBox( text, this ); TQ_CHECK_PTR(mPopupFullCheck); topLayout->addWidget( mPopupFullCheck ); - connect(mPopupFullCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotChanged())); + connect(mPopupFullCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotChanged())); } loadSettings(); diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp index 5a759ed..0c8a08e 100644 --- a/kdf/kdfwidget.cpp +++ b/kdf/kdfwidget.cpp @@ -95,10 +95,10 @@ void CListViewItem::setKeys (int kb_size, int kb_avail, float percent_full) KDFWidget::KDFWidget( TQWidget *parent, const char *name, bool init ) : TQWidget(parent, name), mOptionDialog(0), mPopup(0), mTimer(0) { - connect(&mDiskList , TQT_SIGNAL(readDFDone() ), - this, TQT_SLOT (updateDFDone()) ); - connect(&mDiskList , TQT_SIGNAL(criticallyFull(DiskEntry*)), - this, TQT_SLOT (criticallyFull(DiskEntry*)) ); + connect(&mDiskList , TQ_SIGNAL(readDFDone() ), + this, TQ_SLOT (updateDFDone()) ); + connect(&mDiskList , TQ_SIGNAL(criticallyFull(DiskEntry*)), + this, TQ_SLOT (criticallyFull(DiskEntry*)) ); mTabProp.resize(8); mTabProp[0] = new CTabEntry( "Icon", i18n("Icon"), true, 32); @@ -122,13 +122,13 @@ KDFWidget::KDFWidget( TQWidget *parent, const char *name, bool init ) mList->setFrameStyle( TQFrame::WinPanel + TQFrame::Sunken ); mList->setShowSortIndicator(true); connect( mList, - TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT( rightButtonPressed( TQListViewItem *, const TQPoint &, int ))); + TQ_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int )), + this, TQ_SLOT( rightButtonPressed( TQListViewItem *, const TQPoint &, int ))); connect( mList, - TQT_SIGNAL( rightButtonClicked( TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT( rightButtonClicked( TQListViewItem *, const TQPoint &, int ))); - connect( mList->header(), TQT_SIGNAL(sizeChange(int, int, int)), - this, TQT_SLOT(columnSizeChanged(int, int, int)) ); + TQ_SIGNAL( rightButtonClicked( TQListViewItem *, const TQPoint &, int )), + this, TQ_SLOT( rightButtonClicked( TQListViewItem *, const TQPoint &, int ))); + connect( mList->header(), TQ_SIGNAL(sizeChange(int, int, int)), + this, TQ_SLOT(columnSizeChanged(int, int, int)) ); makeColumns(); mIsTopLevel = TQString(parent->className()) == "KDFTopLevel" ? true : false; @@ -266,8 +266,8 @@ void KDFWidget::settingsBtnClicked( void ) { mOptionDialog = new COptionDialog( this, "options", false ); if( mOptionDialog == 0 ) { return; } - connect( mOptionDialog, TQT_SIGNAL(valueChanged()), - this, TQT_SLOT(settingsChanged()) ); + connect( mOptionDialog, TQ_SIGNAL(valueChanged()), + this, TQ_SLOT(settingsChanged()) ); } mOptionDialog->show(); } @@ -632,7 +632,7 @@ void KDFWidget::columnSizeChanged( int, int, int ) if( mTimer == 0 ) { mTimer = new TQTimer( this ); - connect( mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateDiskBarPixmaps()) ); + connect( mTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateDiskBarPixmaps()) ); } else if( mTimer->isActive() == true ) { diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp index 6b9dafb..aba455b 100644 --- a/kdf/kwikdisk.cpp +++ b/kdf/kwikdisk.cpp @@ -69,11 +69,11 @@ KwikDisk::KwikDisk() setPixmap(KSystemTray::loadIcon("kdf")); show(); - connect( &m_diskList, TQT_SIGNAL(readDFDone()), this, TQT_SLOT(updateDFDone()) ); - connect( &m_diskList, TQT_SIGNAL(criticallyFull(DiskEntry*)), - this, TQT_SLOT(criticallyFull(DiskEntry*)) ); + connect( &m_diskList, TQ_SIGNAL(readDFDone()), this, TQ_SLOT(updateDFDone()) ); + connect( &m_diskList, TQ_SIGNAL(criticallyFull(DiskEntry*)), + this, TQ_SLOT(criticallyFull(DiskEntry*)) ); - connect( contextMenu(), TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(aboutToHide()) ); + connect( contextMenu(), TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(aboutToHide()) ); loadSettings(); updateDF(); @@ -184,7 +184,7 @@ void KwikDisk::updateDFDone() { entryName += TQString("\t\t\t[%1]").arg(disk->prettyKBAvail()); } - int id = contextMenu()->insertItem("", this, TQT_SLOT(toggleMount(int)) ); + int id = contextMenu()->insertItem("", this, TQ_SLOT(toggleMount(int)) ); contextMenu()->setItemParameter(id, itemNo); itemNo++; @@ -215,7 +215,7 @@ void KwikDisk::updateDFDone() qp.drawRect(0,0,pix->width(),pix->height()); qp.end(); } - contextMenu()->disconnectItem(id,disk,TQT_SLOT(toggleMount())); + contextMenu()->disconnectItem(id,disk,TQ_SLOT(toggleMount())); toolTipText = i18n("You must login as root to mount this disk"); } @@ -226,21 +226,21 @@ void KwikDisk::updateDFDone() contextMenu()->insertItem( KSystemTray::loadIcon("kdf"), - i18n("&Start KDiskFree"), this, TQT_SLOT(startKDF()),0); + i18n("&Start KDiskFree"), this, TQ_SLOT(startKDF()),0); contextMenu()->insertItem( KSystemTray::loadIcon("configure"), - i18n("&Configure KwikDisk..."), this, TQT_SLOT(changeSettings()),0); + i18n("&Configure KwikDisk..."), this, TQ_SLOT(changeSettings()),0); contextMenu()->insertItem( KSystemTray::loadIcon("help"), - KStdGuiItem::help().text(), this, TQT_SLOT(invokeHelp()),0); + KStdGuiItem::help().text(), this, TQ_SLOT(invokeHelp()),0); contextMenu()->insertSeparator(); contextMenu()->insertItem( KSystemTray::loadIcon("system-log-out"), - KStdGuiItem::quit().text(), this, TQT_SIGNAL(quitSelected()) ); + KStdGuiItem::quit().text(), this, TQ_SIGNAL(quitSelected()) ); } void KwikDisk::toggleMount(int item) @@ -297,8 +297,8 @@ void KwikDisk::changeSettings() { m_optionDialog = new COptionDialog(this, "options", FALSE); if( !m_optionDialog ) return; - connect(m_optionDialog, TQT_SIGNAL(valueChanged()), - this, TQT_SLOT(loadSettings())); + connect(m_optionDialog, TQ_SIGNAL(valueChanged()), + this, TQ_SLOT(loadSettings())); } m_optionDialog->show(); } @@ -335,7 +335,7 @@ int main(int argc, char **argv) KwikDisk *mainWin = 0; mainWin = new KwikDisk; - TQObject::connect(mainWin, TQT_SIGNAL(quitSelected()), &app, TQT_SLOT(quit())); + TQObject::connect(mainWin, TQ_SIGNAL(quitSelected()), &app, TQ_SLOT(quit())); // mainWin has WDestructiveClose flag by default, so it will delete itself. return app.exec(); diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp index 37b9ff8..dc9a771 100644 --- a/kdf/mntconfig.cpp +++ b/kdf/mntconfig.cpp @@ -59,7 +59,7 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init) mDiskList.readFSTAB(); mDiskList.readDF(); mInitializing = true; - connect( &mDiskList,TQT_SIGNAL(readDFDone()),this,TQT_SLOT(readDFDone())); + connect( &mDiskList,TQ_SIGNAL(readDFDone()),this,TQ_SLOT(readDFDone())); TQString text; TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint()); @@ -72,8 +72,8 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init) mList->addColumn( i18n("Mount Command") ); mList->addColumn( i18n("Unmount Command") ); mList->setFrameStyle( TQFrame::WinPanel + TQFrame::Sunken ); - connect( mList, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(clicked(TQListViewItem *))); + connect( mList, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(clicked(TQListViewItem *))); topLayout->addWidget( mList ); @@ -93,47 +93,47 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init) mIconLineEdit = new TQLineEdit(mGroupBox); TQ_CHECK_PTR(mIconLineEdit); mIconLineEdit->setMinimumWidth( fontMetrics().maxWidth()*10 ); - connect( mIconLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(iconChanged(const TQString&))); - connect( mIconLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(slotChanged())); + connect( mIconLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(iconChanged(const TQString&))); + connect( mIconLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(slotChanged())); gl->addWidget( mIconLineEdit, 2, 0 ); mIconButton = new TDEIconButton(mGroupBox); mIconButton->setIconType(TDEIcon::Small, TDEIcon::Device); TQ_CHECK_PTR(mIconButton); mIconButton->setFixedWidth( mIconButton->sizeHint().height() ); - connect(mIconButton,TQT_SIGNAL(iconChanged(TQString)),this,TQT_SLOT(iconChangedButton(TQString))); + connect(mIconButton,TQ_SIGNAL(iconChanged(TQString)),this,TQ_SLOT(iconChangedButton(TQString))); gl->addWidget( mIconButton, 2, 1 ); //Mount mMountButton = new TQPushButton( i18n("Get Mount Command"), mGroupBox ); TQ_CHECK_PTR(mMountButton); - connect(mMountButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(selectMntFile())); + connect(mMountButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(selectMntFile())); gl->addWidget( mMountButton, 1, 2 ); mMountLineEdit = new TQLineEdit(mGroupBox); TQ_CHECK_PTR(mMountLineEdit); mMountLineEdit->setMinimumWidth( fontMetrics().maxWidth()*10 ); - connect(mMountLineEdit,TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(mntCmdChanged(const TQString&))); - connect( mMountLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(slotChanged())); + connect(mMountLineEdit,TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(mntCmdChanged(const TQString&))); + connect( mMountLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(slotChanged())); gl->addWidget( mMountLineEdit, 1, 3 ); //Umount mUmountButton = new TQPushButton(i18n("Get Unmount Command"), mGroupBox ); TQ_CHECK_PTR( mUmountButton ); - connect(mUmountButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(selectUmntFile())); + connect(mUmountButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(selectUmntFile())); gl->addWidget( mUmountButton, 2, 2 ); mUmountLineEdit=new TQLineEdit(mGroupBox); TQ_CHECK_PTR(mUmountLineEdit); mUmountLineEdit->setMinimumWidth( fontMetrics().maxWidth()*10 ); - connect(mUmountLineEdit,TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(umntCmdChanged(const TQString&))); - connect( mUmountLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(slotChanged())); + connect(mUmountLineEdit,TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(umntCmdChanged(const TQString&))); + connect( mUmountLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(slotChanged())); gl->addWidget( mUmountLineEdit, 2, 3 ); } diff --git a/kdf/optiondialog.cpp b/kdf/optiondialog.cpp index 6734294..6d96fe3 100644 --- a/kdf/optiondialog.cpp +++ b/kdf/optiondialog.cpp @@ -33,13 +33,13 @@ COptionDialog::COptionDialog( TQWidget *parent, const char *name, bool modal ) TQVBoxLayout *l1 = new TQVBoxLayout( f1 ); mConf = new KDFConfigWidget( f1, "kdfconf" ); l1->addWidget(mConf); - connect( mConf, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) ); + connect( mConf, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) ); TQFrame *f2 = addPage( i18n("Mount Commands") ); TQVBoxLayout *l2 = new TQVBoxLayout( f2 ); mMnt = new MntConfigWidget( f2, "mntconf"); l2->addWidget(mMnt); - connect( mMnt, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) ); + connect( mMnt, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) ); enableButton( Apply, false ); dataChanged = false; } -- cgit v1.2.1