From 845281400a4c6124e2cf8ab28174e9c3f0bc2895 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 13 Jan 2024 11:49:24 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro (cherry picked from commit 69e4de2f4cee257151ca13b207dc677b2d958fed) --- keduca/keduca/keduca.cpp | 8 +++--- keduca/keduca/keduca_part.cpp | 4 +-- keduca/keduca/keducaview.cpp | 12 ++++----- keduca/keduca/kquestion.cpp | 4 +-- keduca/keducabuilder/keducabuilder.cpp | 34 ++++++++++++------------ keduca/keducabuilder/keducaeditorstartdialog.cpp | 4 +-- keduca/keducabuilder/ktagcombobox.cpp | 16 +++++------ keduca/libkeduca/fileread.cpp | 4 +-- 8 files changed, 43 insertions(+), 43 deletions(-) (limited to 'keduca') diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp index 04573545..06d617a4 100644 --- a/keduca/keduca/keduca.cpp +++ b/keduca/keduca/keduca.cpp @@ -63,12 +63,12 @@ Keduca::~Keduca() void Keduca::setupActions() { - KStdAction::open( this, TQT_SLOT( slotFileOpen() ), actionCollection() ); - (void)new TDEAction( i18n( "Open &Gallery..." ), 0, 0, this, TQT_SLOT( slotGallery() ), + KStdAction::open( this, TQ_SLOT( slotFileOpen() ), actionCollection() ); + (void)new TDEAction( i18n( "Open &Gallery..." ), 0, 0, this, TQ_SLOT( slotGallery() ), actionCollection(), "open_gallery" ); - _recentFiles = KStdAction::openRecent(this, TQT_SLOT ( slotFileOpenURL(const KURL &) ), + _recentFiles = KStdAction::openRecent(this, TQ_SLOT ( slotFileOpenURL(const KURL &) ), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT( quit() ), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT( quit() ), actionCollection()); } void Keduca::slotFileOpen() diff --git a/keduca/keduca/keduca_part.cpp b/keduca/keduca/keduca_part.cpp index 21bb99fb..333c02d5 100644 --- a/keduca/keduca/keduca_part.cpp +++ b/keduca/keduca/keduca_part.cpp @@ -71,7 +71,7 @@ bool KEducaPart::openFile() void KEducaPart::setupActions() { - KStdAction::preferences( this, TQT_SLOT( slotConfigure() ), actionCollection(), "configure" ); + KStdAction::preferences( this, TQ_SLOT( slotConfigure() ), actionCollection(), "configure" ); } void KEducaPart::slotConfigure() @@ -83,7 +83,7 @@ void KEducaPart::slotConfigure() ConfigDialogBase *confDlg = new ConfigDialogBase( 0, "ConfigDialogBase" ); dialog->addPage( confDlg, i18n("General"), "keduca" ); - connect( dialog, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( updateConfiguration() ) ); + connect( dialog, TQ_SIGNAL( settingsChanged() ), TQ_SLOT( updateConfiguration() ) ); dialog->show(); } diff --git a/keduca/keduca/keducaview.cpp b/keduca/keduca/keducaview.cpp index a5e2ac28..81037237 100644 --- a/keduca/keduca/keducaview.cpp +++ b/keduca/keduca/keducaview.cpp @@ -69,7 +69,7 @@ void KEducaView::init() _viewInfo = new TQTextEdit( _infoWidget ); _viewInfo->setReadOnly( true ); _buttonStartTest = new KPushButton( i18n( "&Start Test" ), _infoWidget ); - connect( _buttonStartTest, TQT_SIGNAL( clicked() ), TQT_SLOT( slotButtonNext() ) ); + connect( _buttonStartTest, TQ_SIGNAL( clicked() ), TQ_SLOT( slotButtonNext() ) ); addWidget( _infoWidget, 1 ); // Question Widget @@ -79,7 +79,7 @@ void KEducaView::init() _buttonGroup = new KGroupEduca( _split, "ButtonGroup" ); _buttonGroup->setRadioButtonExclusive( true ); _buttonNext = new KPushButton( i18n( "&Next >>" ), _questionWidget, "ButtonNext" ); - connect( _buttonNext, TQT_SIGNAL( clicked() ), TQT_SLOT( slotButtonNext() ) ); + connect( _buttonNext, TQ_SIGNAL( clicked() ), TQ_SLOT( slotButtonNext() ) ); addWidget( _questionWidget, 2 ); // Results Widget @@ -87,14 +87,14 @@ void KEducaView::init() _viewResults = new TQTextEdit( _resultsWidget ); _viewResults->setReadOnly( true ); _buttonSave = new KPushButton( i18n( "&Save Results..." ), _resultsWidget ); - connect( _buttonSave, TQT_SIGNAL( clicked() ), TQT_SLOT( slotButtonSave() ) ); + connect( _buttonSave, TQ_SIGNAL( clicked() ), TQ_SLOT( slotButtonSave() ) ); /* FIXME: This is a hack * The results widget can be shown only in the end of the test (when you should be shown the * option to save the results) or at the middle of the test, after each question (when there should * be a "Next" button). */ _buttonResultsNext = new KPushButton( i18n( "&Next >>" ), _resultsWidget ); - connect( _buttonResultsNext, TQT_SIGNAL( clicked() ), TQT_SLOT( slotButtonNext() ) ); + connect( _buttonResultsNext, TQ_SIGNAL( clicked() ), TQ_SLOT( slotButtonNext() ) ); _buttonResultsNext->hide(); addWidget( _resultsWidget, 3 ); @@ -275,8 +275,8 @@ void KEducaView::showRecord() if (!_timeoutTimer) { _timeoutTimer = new TQTimer(this); - connect(_timeoutTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(questionTimedOut())); + connect(_timeoutTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(questionTimedOut())); } _timeoutTimer->start(1000*timeout); _questionText->countdown(timeout); diff --git a/keduca/keduca/kquestion.cpp b/keduca/keduca/kquestion.cpp index 46a8322f..83b19467 100644 --- a/keduca/keduca/kquestion.cpp +++ b/keduca/keduca/kquestion.cpp @@ -84,8 +84,8 @@ void KQuestion::countdown(int starttime) if (!_countdownTimer) { _countdownTimer = new TQTimer(this); - connect(_countdownTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(countDownOne())); + connect(_countdownTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(countDownOne())); } _countdownTimer->start(1000); // make one step less than time passes by in seconds diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp index d90fb876..361045d5 100644 --- a/keduca/keducabuilder/keducabuilder.cpp +++ b/keduca/keducabuilder/keducabuilder.cpp @@ -92,8 +92,8 @@ void KEducaBuilder::init() _listAnswer = new TDEListBox( _split, "_listAnswer" ); _listAnswer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) ); - connect( _listAnswer, TQT_SIGNAL( highlighted(TQListBoxItem *) ), this, TQT_SLOT( slotPreview(TQListBoxItem *) ) ); - connect( _listAnswer, TQT_SIGNAL( doubleClicked(TQListBoxItem *) ), this, TQT_SLOT( slotEditbyList(TQListBoxItem *) ) ); + connect( _listAnswer, TQ_SIGNAL( highlighted(TQListBoxItem *) ), this, TQ_SLOT( slotPreview(TQListBoxItem *) ) ); + connect( _listAnswer, TQ_SIGNAL( doubleClicked(TQListBoxItem *) ), this, TQ_SLOT( slotEditbyList(TQListBoxItem *) ) ); _preview = new TQTextView( _split, "_preview" ); _preview->setFrameShape( TQTextView::NoFrame ); @@ -111,21 +111,21 @@ void KEducaBuilder::init() /** Init menu bar settings */ void KEducaBuilder::initMenuBar() { - KStdAction::openNew(this, TQT_SLOT( slotFileOpenNew() ), actionCollection()); - KStdAction::open (this, TQT_SLOT( slotFileOpen() ), actionCollection()); - (void)new TDEAction(i18n("Open &Gallery..."), 0, 0, this, TQT_SLOT( slotGallery() ), actionCollection(), "open_gallery"); - _recentFiles = KStdAction::openRecent(this, TQT_SLOT ( slotFileOpenURL(const KURL &)), actionCollection()); - KStdAction::save (this, TQT_SLOT( slotFileSave() ), actionCollection()); - KStdAction::saveAs (this, TQT_SLOT( slotFileSaveAs() ), actionCollection()); - KStdAction::print (this, TQT_SLOT( slotFilePrint() ), actionCollection()); - (void)new TDEAction(i18n("Document Info"), "application-vnd.tde.info", 0, this, TQT_SLOT( slotHeader() ), actionCollection(), "info_doc"); - KStdAction::quit(this, TQT_SLOT( close() ), actionCollection()); - - (void)new TDEAction(i18n("&Add..."), "addquestion", 0, this, TQT_SLOT( slotAdd() ), actionCollection(), "question_add"); - (void)new TDEAction(i18n("&Edit..."), "editquestion", 0, this, TQT_SLOT( slotEdit() ), actionCollection(), "question_edit"); - (void)new TDEAction(i18n("&Remove"), "delquestion", 0, this, TQT_SLOT( slotRemove() ), actionCollection(), "question_remove"); - (void)new TDEAction(i18n("&Up"), "go-up", 0, this, TQT_SLOT( slotUp() ), actionCollection(), "question_up"); - (void)new TDEAction(i18n("&Down"), "go-down", 0, this, TQT_SLOT( slotDown() ), actionCollection(), "question_down"); + KStdAction::openNew(this, TQ_SLOT( slotFileOpenNew() ), actionCollection()); + KStdAction::open (this, TQ_SLOT( slotFileOpen() ), actionCollection()); + (void)new TDEAction(i18n("Open &Gallery..."), 0, 0, this, TQ_SLOT( slotGallery() ), actionCollection(), "open_gallery"); + _recentFiles = KStdAction::openRecent(this, TQ_SLOT ( slotFileOpenURL(const KURL &)), actionCollection()); + KStdAction::save (this, TQ_SLOT( slotFileSave() ), actionCollection()); + KStdAction::saveAs (this, TQ_SLOT( slotFileSaveAs() ), actionCollection()); + KStdAction::print (this, TQ_SLOT( slotFilePrint() ), actionCollection()); + (void)new TDEAction(i18n("Document Info"), "application-vnd.tde.info", 0, this, TQ_SLOT( slotHeader() ), actionCollection(), "info_doc"); + KStdAction::quit(this, TQ_SLOT( close() ), actionCollection()); + + (void)new TDEAction(i18n("&Add..."), "addquestion", 0, this, TQ_SLOT( slotAdd() ), actionCollection(), "question_add"); + (void)new TDEAction(i18n("&Edit..."), "editquestion", 0, this, TQ_SLOT( slotEdit() ), actionCollection(), "question_edit"); + (void)new TDEAction(i18n("&Remove"), "delquestion", 0, this, TQ_SLOT( slotRemove() ), actionCollection(), "question_remove"); + (void)new TDEAction(i18n("&Up"), "go-up", 0, this, TQ_SLOT( slotUp() ), actionCollection(), "question_up"); + (void)new TDEAction(i18n("&Down"), "go-down", 0, this, TQ_SLOT( slotDown() ), actionCollection(), "question_down"); } /** Delete current document and start new */ diff --git a/keduca/keducabuilder/keducaeditorstartdialog.cpp b/keduca/keducabuilder/keducaeditorstartdialog.cpp index b75d4f40..a9fc0b2a 100644 --- a/keduca/keducabuilder/keducaeditorstartdialog.cpp +++ b/keduca/keducabuilder/keducaeditorstartdialog.cpp @@ -42,8 +42,8 @@ KEducaEditorStartDialog::KEducaEditorStartDialog(KEducaBuilder * parent, const c // setup connections urlRequester->setFilter( "application/x-edu"); - connect( startChoiceBtnGrp, TQT_SIGNAL( clicked(int) ), - this, TQT_SLOT( slotChoiceChanged(int) ) ); + connect( startChoiceBtnGrp, TQ_SIGNAL( clicked(int) ), + this, TQ_SLOT( slotChoiceChanged(int) ) ); } /** based on code in tdeaction.cpp diff --git a/keduca/keducabuilder/ktagcombobox.cpp b/keduca/keducabuilder/ktagcombobox.cpp index 081d4254..905c7698 100644 --- a/keduca/keducabuilder/ktagcombobox.cpp +++ b/keduca/keducabuilder/ktagcombobox.cpp @@ -41,10 +41,10 @@ KTagComboBox::KTagComboBox (TQWidget * parent, const char *name) { _popup = new TQPopupMenu(this); _tags = new TQStringList; - connect( _popup, TQT_SIGNAL(activated(int)), - TQT_SLOT(internalActivate(int)) ); - connect( _popup, TQT_SIGNAL(highlighted(int)), - TQT_SLOT(internalHighlight(int)) ); + connect( _popup, TQ_SIGNAL(activated(int)), + TQ_SLOT(internalActivate(int)) ); + connect( _popup, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(internalHighlight(int)) ); } void KTagComboBox::popupMenu() @@ -148,10 +148,10 @@ void KTagComboBox::insertSubmenu(const TQString &text, const TQString &tag, cons TQPopupMenu *p = new TQPopupMenu(pi); pi->insertItem(text, p, count(), index); _tags->append(tag); - connect( p, TQT_SIGNAL(activated(int)), - TQT_SLOT(internalActivate(int)) ); - connect( p, TQT_SIGNAL(highlighted(int)), - TQT_SLOT(internalHighlight(int)) ); + connect( p, TQ_SIGNAL(activated(int)), + TQ_SLOT(internalActivate(int)) ); + connect( p, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(internalHighlight(int)) ); } void KTagComboBox::changeItem( const TQString &text, int index ) diff --git a/keduca/libkeduca/fileread.cpp b/keduca/libkeduca/fileread.cpp index 67c60d00..f3470214 100644 --- a/keduca/libkeduca/fileread.cpp +++ b/keduca/libkeduca/fileread.cpp @@ -670,7 +670,7 @@ bool FileRead::saveFile( const KURL &url, bool copyimages, bool saveCompressed ) if( saveFile(_tmpfile->name(), copyimages, saveCompressed) ) { // upload the file TDEIO::Job * job = TDEIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotUploadFinished (TDEIO::Job *) ) ); return true; } } @@ -847,7 +847,7 @@ bool FileRead::saveResults( const KURL &url, const TQString &results ) if( saveResults(_tmpfile->name(), results) ) { // upload the file TDEIO::Job * job = TDEIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotUploadFinished (TDEIO::Job *) ) ); return true; } } -- cgit v1.2.1