diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-13 11:49:24 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-19 11:12:48 +0900 |
| commit | 845281400a4c6124e2cf8ab28174e9c3f0bc2895 (patch) | |
| tree | fe2d221d237349ce9e1709802676323f747a4c66 | |
| parent | b06213ed1ee55fef2ebc1de1d9759d8c9df5f4bd (diff) | |
| download | tdeedu-84528140.tar.gz tdeedu-84528140.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 69e4de2f4cee257151ca13b207dc677b2d958fed)
202 files changed, 1805 insertions, 1805 deletions
diff --git a/blinken/src/artsplayer.cpp b/blinken/src/artsplayer.cpp index a83890f9..6d82e9fb 100644 --- a/blinken/src/artsplayer.cpp +++ b/blinken/src/artsplayer.cpp @@ -23,7 +23,7 @@ artsPlayer::artsPlayer() : m_playobj(0) { m_endChecker = new TQTimer(this); - connect(m_endChecker, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkEnded())); + connect(m_endChecker, TQ_SIGNAL(timeout()), this, TQ_SLOT(checkEnded())); #ifndef WITHOUT_ARTS m_dispatcher = new KArtsDispatcher; diff --git a/blinken/src/blinken.cpp b/blinken/src/blinken.cpp index 1c681ce6..969efc20 100644 --- a/blinken/src/blinken.cpp +++ b/blinken/src/blinken.cpp @@ -65,11 +65,11 @@ blinken::blinken() : TQWidget(0, 0, WStaticContents | WNoAutoErase), m_overHighs show(); m_unhighlighter = new TQTimer(this); - connect(m_unhighlighter, TQT_SIGNAL(timeout()), this, TQT_SLOT(unhighlight())); + connect(m_unhighlighter, TQ_SIGNAL(timeout()), this, TQ_SLOT(unhighlight())); - connect(&m_game, TQT_SIGNAL(gameEnded()), this, TQT_SLOT(checkHS())); - connect(&m_game, TQT_SIGNAL(phaseChanged()), this, TQT_SLOT(update())); - connect(&m_game, TQT_SIGNAL(highlight(blinkenGame::color, bool)), this, TQT_SLOT(highlight(blinkenGame::color, bool))); + connect(&m_game, TQ_SIGNAL(gameEnded()), this, TQ_SLOT(checkHS())); + connect(&m_game, TQ_SIGNAL(phaseChanged()), this, TQ_SLOT(update())); + connect(&m_game, TQ_SIGNAL(highlight(blinkenGame::color, bool)), this, TQ_SLOT(highlight(blinkenGame::color, bool))); m_helpMenu = new KHelpMenu(this, kapp->aboutData()); diff --git a/blinken/src/blinkengame.cpp b/blinken/src/blinkengame.cpp index 20284a69..7c1304d0 100644 --- a/blinken/src/blinkengame.cpp +++ b/blinken/src/blinkengame.cpp @@ -20,7 +20,7 @@ blinkenGame::blinkenGame() : m_phase(starting) { m_artsPlayer = new artsPlayer; m_waitTimer = new TQTimer(this); - connect(m_waitTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(waiting())); + connect(m_waitTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(waiting())); } blinkenGame::~blinkenGame() @@ -114,8 +114,8 @@ void blinkenGame::nextSound() void blinkenGame::soundEnded() { - TQTimer::singleShot(100, this, TQT_SLOT(nextSound())); - TQTimer::singleShot(50, this, TQT_SLOT(unhighlight())); + TQTimer::singleShot(100, this, TQ_SLOT(nextSound())); + TQTimer::singleShot(50, this, TQ_SLOT(unhighlight())); } void blinkenGame::unhighlight() @@ -135,7 +135,7 @@ void blinkenGame::waiting() } else m_sequence.append(generateColor()); - connect(m_artsPlayer, TQT_SIGNAL(ended()), this, TQT_SLOT(soundEnded())); + connect(m_artsPlayer, TQ_SIGNAL(ended()), this, TQ_SLOT(soundEnded())); m_nextColor = m_sequence.begin(); soundEnded(); } diff --git a/blinken/src/main.cpp b/blinken/src/main.cpp index c013c752..fdc6987f 100644 --- a/blinken/src/main.cpp +++ b/blinken/src/main.cpp @@ -24,7 +24,7 @@ int main(int argc, char *argv[]) about.addCredit("Steve Jordi", I18N_NOOP("GPL'ed his 'Steve' font so that we could use it"), "steve@sjordi.com"); TDECmdLineArgs::init(argc, argv, &about); TDEApplication app; - app.connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit())); + app.connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit())); TQFont f("Steve", 12, TQFont::Normal, true); if (!fontChecker::checkInstalled(f, locate("appdata", "fonts/steve.ttf"))) diff --git a/kalzium/src/detailinfodlg.cpp b/kalzium/src/detailinfodlg.cpp index 194eb38a..a66e7cf8 100644 --- a/kalzium/src/detailinfodlg.cpp +++ b/kalzium/src/detailinfodlg.cpp @@ -66,7 +66,7 @@ DetailedInfoDlg::DetailedInfoDlg( Element *el , TQWidget *parent, const char *na createContent(); m_actionCollection = new TDEActionCollection(this); - KStdAction::quit(this, TQT_SLOT(slotClose()), m_actionCollection); + KStdAction::quit(this, TQ_SLOT(slotClose()), m_actionCollection); setButtonTip( User2, i18n( "Goes to the previous element" ) ); setButtonTip( User1, i18n( "Goes to the next element" ) ); diff --git a/kalzium/src/elementdataviewer.cpp b/kalzium/src/elementdataviewer.cpp index edb897c8..ba679d00 100644 --- a/kalzium/src/elementdataviewer.cpp +++ b/kalzium/src/elementdataviewer.cpp @@ -69,15 +69,15 @@ ElementDataViewer::ElementDataViewer( TQWidget *parent, const char* name ) setButtonText( User1, i18n("&Plot") ); m_actionCollection = new TDEActionCollection(this); - KStdAction::quit(this, TQT_SLOT(slotClose()), m_actionCollection); + KStdAction::quit(this, TQ_SLOT(slotClose()), m_actionCollection); - connect ( m_pPlotSetupWidget->KCB_y, TQT_SIGNAL( activated(int) ), - this, TQT_SLOT( drawPlot()) ); + connect ( m_pPlotSetupWidget->KCB_y, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT( drawPlot()) ); - connect ( m_pPlotSetupWidget->connectPoints, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( drawPlot()) ); - connect ( m_pPlotSetupWidget->showNames, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( drawPlot()) ); + connect ( m_pPlotSetupWidget->connectPoints, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( drawPlot()) ); + connect ( m_pPlotSetupWidget->showNames, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( drawPlot()) ); // Draw the plot so that the user doesn't have to press the "Plot" // button to seee anything. diff --git a/kalzium/src/eqchemview.cpp b/kalzium/src/eqchemview.cpp index 19d1469a..86410749 100644 --- a/kalzium/src/eqchemview.cpp +++ b/kalzium/src/eqchemview.cpp @@ -63,7 +63,7 @@ eqchemView::eqchemView(TQWidget *parent) : TQWidget(parent) m_eqclear->setIconSet( TDEGlobal::instance()->iconLoader()->loadIconSet("locationbar_erase", TDEIcon::NoGroup, 22 /*TDEIcon::SizeSmallMedium*/) ); - connect(m_eqclear, TQT_SIGNAL(clicked()), m_eqedit, TQT_SLOT(clear()) ); + connect(m_eqclear, TQ_SIGNAL(clicked()), m_eqedit, TQ_SLOT(clear()) ); } eqchemView::~eqchemView() diff --git a/kalzium/src/eqresult.cpp b/kalzium/src/eqresult.cpp index 1f3f44bf..5308cf66 100644 --- a/kalzium/src/eqresult.cpp +++ b/kalzium/src/eqresult.cpp @@ -111,7 +111,7 @@ void EqResult::add(const TQString & question, const TQString & answer) new QuestionItem( this, question, bgcolor ); new AnswerItem( this, question, answer, bgcolor ); - TQTimer::singleShot( 100, this, TQT_SLOT( scrollToEnd() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( scrollToEnd() ) ); } void EqResult::scrollToEnd() diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp index 92c03fee..ff89e575 100644 --- a/kalzium/src/kalzium.cpp +++ b/kalzium/src/kalzium.cpp @@ -74,8 +74,8 @@ Kalzium::Kalzium() m_infoDialog = 0; m_toolboxCurrent = 0; - connect( m_PerodicTableView, TQT_SIGNAL( ElementClicked( int ) ), this, TQT_SLOT( openInformationDialog( int ) )); - connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), this, TQT_SLOT( slotStatusbar( int ) )); + connect( m_PerodicTableView, TQ_SIGNAL( ElementClicked( int ) ), this, TQ_SLOT( openInformationDialog( int ) )); + connect( m_PerodicTableView, TQ_SIGNAL( MouseOver( int ) ), this, TQ_SLOT( slotStatusbar( int ) )); // layouting setCentralWidget( centralWidget ); @@ -107,14 +107,14 @@ Kalzium::Kalzium() void Kalzium::setupActions() { - m_actionNoScheme = new TDEToggleAction(i18n("&No Color Scheme"), 0, this, TQT_SLOT(slotNoLook()), actionCollection(), "view_look_noscheme"); + m_actionNoScheme = new TDEToggleAction(i18n("&No Color Scheme"), 0, this, TQ_SLOT(slotNoLook()), actionCollection(), "view_look_noscheme"); // the actions for the color schemes - m_actionGroups = new TDEToggleAction(i18n("Show &Groups"), 0, this, TQT_SLOT(slotLookGroups()), actionCollection(), "view_look_groups"); - m_actionBlocks = new TDEToggleAction(i18n("Show &Blocks"), 0, this, TQT_SLOT(slotLookBlocks()), actionCollection(), "view_look_blocks"); - m_actionAcid = new TDEToggleAction(i18n("Show &Acid Behavior"), 0, this, TQT_SLOT(slotLookAcidBehavior()), actionCollection(), "view_look_acid"); - m_actionFamily = new TDEToggleAction(i18n("Show &Family"), 0, this, TQT_SLOT(slotLookFamily()), actionCollection(), "view_look_family"); - m_actionCrystal = new TDEToggleAction(i18n("Show &Crystal Structures"), 0, this, TQT_SLOT(slotLookCrystal()), actionCollection(), "view_look_crystal"); + m_actionGroups = new TDEToggleAction(i18n("Show &Groups"), 0, this, TQ_SLOT(slotLookGroups()), actionCollection(), "view_look_groups"); + m_actionBlocks = new TDEToggleAction(i18n("Show &Blocks"), 0, this, TQ_SLOT(slotLookBlocks()), actionCollection(), "view_look_blocks"); + m_actionAcid = new TDEToggleAction(i18n("Show &Acid Behavior"), 0, this, TQ_SLOT(slotLookAcidBehavior()), actionCollection(), "view_look_acid"); + m_actionFamily = new TDEToggleAction(i18n("Show &Family"), 0, this, TQ_SLOT(slotLookFamily()), actionCollection(), "view_look_family"); + m_actionCrystal = new TDEToggleAction(i18n("Show &Crystal Structures"), 0, this, TQ_SLOT(slotLookCrystal()), actionCollection(), "view_look_crystal"); //the actions for switching PerodicTableView TQStringList gradientlist; @@ -129,7 +129,7 @@ void Kalzium::setupActions() gradientlist.append(i18n("Electron Affinity")); gradient_action = new TDESelectAction(i18n("&Gradient"), 0, this, 0, actionCollection(), "view_look_gradmenu"); gradient_action->setItems(gradientlist); - connect (gradient_action, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSwitchtoGradient(int))); + connect (gradient_action, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSwitchtoGradient(int))); // the actions for switching PerodicTableView TQStringList numlist; @@ -140,25 +140,25 @@ void Kalzium::setupActions() numeration_action = new TDESelectAction (i18n("&Numeration"), 0, this, 0, actionCollection(), "view_numerationtype"); numeration_action->setItems(numlist); numeration_action->setCurrentItem(Prefs::numeration()); - connect (numeration_action, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSwitchtoNumeration(int))); + connect (numeration_action, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSwitchtoNumeration(int))); - m_SidebarAction = new TDEAction(i18n("Show &Sidebar"), "sidebar", 0, this, TQT_SLOT(slotShowHideSidebar()), actionCollection(), "view_sidebar"); + m_SidebarAction = new TDEAction(i18n("Show &Sidebar"), "sidebar", 0, this, TQ_SLOT(slotShowHideSidebar()), actionCollection(), "view_sidebar"); #ifdef HAVE_FACILE - m_EQSolverAction = new TDEAction(i18n("&Equation Solver..."), "eqchem", 0, this, TQT_SLOT(slotShowEQSolver()), actionCollection(), "tools_eqsolver"); + m_EQSolverAction = new TDEAction(i18n("&Equation Solver..."), "eqchem", 0, this, TQ_SLOT(slotShowEQSolver()), actionCollection(), "tools_eqsolver"); #endif // tools actions - m_pPlotAction = new TDEAction(i18n("&Plot Data..."), "plot", 0, this, TQT_SLOT(slotPlotData()), actionCollection(), "tools_plotdata"); - m_pGlossaryAction = new TDEAction(i18n("&Glossary..."), "glossary", 0, this, TQT_SLOT(slotGlossary()), actionCollection(), "tools_glossary"); + m_pPlotAction = new TDEAction(i18n("&Plot Data..."), "plot", 0, this, TQ_SLOT(slotPlotData()), actionCollection(), "tools_plotdata"); + m_pGlossaryAction = new TDEAction(i18n("&Glossary..."), "glossary", 0, this, TQ_SLOT(slotGlossary()), actionCollection(), "tools_glossary"); // other period view options - m_pLegendAction = new TDEAction(i18n("Show &Legend"), "legend", 0, this, TQT_SLOT(slotShowLegend()), actionCollection(), "view_legend"); - m_pTooltipAction = new TDEAction(i18n("Show &Tooltip"), "tooltip", 0, this, TQT_SLOT(slotEnableTooltips()), actionCollection(), "view_tooltip"); + m_pLegendAction = new TDEAction(i18n("Show &Legend"), "legend", 0, this, TQ_SLOT(slotShowLegend()), actionCollection(), "view_legend"); + m_pTooltipAction = new TDEAction(i18n("Show &Tooltip"), "tooltip", 0, this, TQ_SLOT(slotEnableTooltips()), actionCollection(), "view_tooltip"); // the standard actions - KStdAction::preferences(this, TQT_SLOT(showSettingsDialog()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT (closeAllWindows()),actionCollection() ); + KStdAction::preferences(this, TQ_SLOT(showSettingsDialog()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT (closeAllWindows()),actionCollection() ); slotShowScheme( Prefs::colorschemebox() ); slotSwitchtoNumeration( Prefs::numeration() ); @@ -213,7 +213,7 @@ void Kalzium::setupSidebars() lay->activate(); m_detailWidget = new DetailedGraphicalOverview( fake, "DetailedGraphicalOverview" ); m_detailWidget->setMinimumSize( 200, m_detailWidget->minimumSize().height() ); - connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), this, TQT_SLOT( slotSelectedNumber( int ) )); + connect( m_PerodicTableView, TQ_SIGNAL( MouseOver( int ) ), this, TQ_SLOT( slotSelectedNumber( int ) )); lay->addWidget( m_detailWidget ); lay->addItem( new TQSpacerItem( 10, 10, TQSizePolicy::Fixed, TQSizePolicy::MinimumExpanding ) ); m_toolbox->addItem( fake, SmallIcon( "overview" ), i18n( "Overview" ) ); @@ -222,26 +222,26 @@ void Kalzium::setupSidebars() m_toolbox->addItem( m_calcWidget, SmallIcon( "calculate" ), i18n( "Calculate" ) ); m_timeWidget = new TimeWidgetIMPL( this, "TimeWidget" ); - connect( m_timeWidget->time_slider, TQT_SIGNAL( valueChanged( int ) ), - m_PerodicTableView, TQT_SLOT( setDate( int ) ) ); - connect( m_timeWidget->time_slider, TQT_SIGNAL( valueChanged( int ) ), - m_timeWidget, TQT_SLOT( slotChanged( int ) ) ); - connect( m_timeWidget->Number1, TQT_SIGNAL( valueChanged( int ) ), - m_timeWidget, TQT_SLOT( slotChanged( int ) ) ); + connect( m_timeWidget->time_slider, TQ_SIGNAL( valueChanged( int ) ), + m_PerodicTableView, TQ_SLOT( setDate( int ) ) ); + connect( m_timeWidget->time_slider, TQ_SIGNAL( valueChanged( int ) ), + m_timeWidget, TQ_SLOT( slotChanged( int ) ) ); + connect( m_timeWidget->Number1, TQ_SIGNAL( valueChanged( int ) ), + m_timeWidget, TQ_SLOT( slotChanged( int ) ) ); m_toolbox->addItem( m_timeWidget, SmallIcon( "timeline" ), i18n( "Timeline" ) ); m_somWidget = new SOMWidgetIMPL( this, "somWidget" ); - connect( m_somWidget->temp_slider, TQT_SIGNAL( valueChanged( int ) ), - m_PerodicTableView, TQT_SLOT( setTemperature( int ) ) ); + connect( m_somWidget->temp_slider, TQ_SIGNAL( valueChanged( int ) ), + m_PerodicTableView, TQ_SLOT( setTemperature( int ) ) ); m_toolbox->addItem( m_somWidget, SmallIcon( "statematter" ), i18n( "State of Matter" ) ); - connect( m_toolbox, TQT_SIGNAL( currentChanged( int ) ), this, TQT_SLOT( slotToolboxCurrentChanged( int ) ) ); + connect( m_toolbox, TQ_SIGNAL( currentChanged( int ) ), this, TQ_SLOT( slotToolboxCurrentChanged( int ) ) ); moveDockWindow( m_dockWin, DockLeft ); setDockEnabled( /*m_dockWin, */DockTop, false ); setDockEnabled( /*m_dockWin, */DockBottom, false ); m_dockWin->hide(); - connect( m_dockWin, TQT_SIGNAL(visibilityChanged(bool)), this, TQT_SLOT(slotSidebarVisibilityChanged(bool))); + connect( m_dockWin, TQ_SIGNAL(visibilityChanged(bool)), this, TQ_SLOT(slotSidebarVisibilityChanged(bool))); } @@ -263,7 +263,7 @@ void Kalzium::slotShowEQSolver() eqsolver->setMinimumSize( 600,400 ); vbox->addWidget( eqsolver ); - connect(dlg, TQT_SIGNAL(applyClicked()), eqsolver, TQT_SLOT(compute())); + connect(dlg, TQ_SIGNAL(applyClicked()), eqsolver, TQ_SLOT(compute())); dlg->show(); #endif } @@ -398,8 +398,8 @@ void Kalzium::showSettingsDialog() //TDEConfigDialog didn't find an instance of this dialog, so lets create it : TDEConfigDialog *dialog = new TDEConfigDialog(this,"settings", Prefs::self()); - connect( dialog, TQT_SIGNAL( settingsChanged() ), this , TQT_SLOT( slotUpdateSettings() ) ); - connect( dialog, TQT_SIGNAL( settingsChanged() ), m_somWidget, TQT_SLOT( reloadUnits() ) ); + connect( dialog, TQ_SIGNAL( settingsChanged() ), this , TQ_SLOT( slotUpdateSettings() ) ); + connect( dialog, TQ_SIGNAL( settingsChanged() ), m_somWidget, TQ_SLOT( reloadUnits() ) ); dialog->addPage( new setColors( 0, "colors_page"), i18n("Colors"), "colorize"); dialog->addPage( new setupUnits( 0, "units_page"), i18n("Units"), "gear"); dialog->addPage( new setupMisc( 0, "miscpage" ), i18n( "Miscellaneous" ), "misc" ); @@ -440,10 +440,10 @@ void Kalzium::openInformationDialog( int number ) this, "detailedDlg" ); // Remove the selection when this dialog finishes or hides. - connect(m_infoDialog, TQT_SIGNAL(hidden()), - m_PerodicTableView, TQT_SLOT(unSelect())); - connect(m_infoDialog, TQT_SIGNAL(elementChanged(int)), - m_PerodicTableView, TQT_SLOT(selectElement(int))); + connect(m_infoDialog, TQ_SIGNAL(hidden()), + m_PerodicTableView, TQ_SLOT(unSelect())); + connect(m_infoDialog, TQ_SIGNAL(elementChanged(int)), + m_PerodicTableView, TQ_SLOT(selectElement(int))); } m_infoDialog->show(); } diff --git a/kalzium/src/kalziumtip.cpp b/kalzium/src/kalziumtip.cpp index 6c1afe17..1ba5bd20 100644 --- a/kalzium/src/kalziumtip.cpp +++ b/kalzium/src/kalziumtip.cpp @@ -48,7 +48,7 @@ KalziumTip::KalziumTip( TQWidget * parent, const char * name, WFlags f ) : TQWid m_noElemIcon = TDEGlobal::iconLoader()->loadIcon( "orbits", TDEIcon::NoGroup, 64 ); setMouseTracking(true); // receice mouse move events - connect(&m_frameTimer, TQT_SIGNAL(timeout()), TQT_SLOT(internalUpdate())); + connect(&m_frameTimer, TQ_SIGNAL(timeout()), TQ_SLOT(internalUpdate())); } void KalziumTip::showTip( TQPoint mouse, Element* element, int visibleWidth, int visibleHeight ) diff --git a/kalzium/src/periodictableview.cpp b/kalzium/src/periodictableview.cpp index 5cf44d7c..4218c3a2 100644 --- a/kalzium/src/periodictableview.cpp +++ b/kalzium/src/periodictableview.cpp @@ -51,17 +51,17 @@ PerodicTableView::PerodicTableView(TQWidget *parent, const char *name) unSelect(); #if 0 - connect( this, TQT_SIGNAL( tableClicked( TQPoint ) ), - this, TQT_SLOT( selectPoint( TQPoint ) ) ); + connect( this, TQ_SIGNAL( tableClicked( TQPoint ) ), + this, TQ_SLOT( selectPoint( TQPoint ) ) ); #endif - connect( this, TQT_SIGNAL( ToolTip( int ) ), - this, TQT_SLOT( slotToolTip( int ) ) ); + connect( this, TQ_SIGNAL( ToolTip( int ) ), + this, TQ_SLOT( slotToolTip( int ) ) ); - connect( &HoverTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotTransientLabel() ) ); + connect( &HoverTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotTransientLabel() ) ); - connect( &MouseoverTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotMouseover() ) ); + connect( &MouseoverTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotMouseover() ) ); setMouseTracking( true ); diff --git a/kalzium/src/somwidget_impl.cpp b/kalzium/src/somwidget_impl.cpp index 93ae5838..dd6ac6bc 100644 --- a/kalzium/src/somwidget_impl.cpp +++ b/kalzium/src/somwidget_impl.cpp @@ -45,12 +45,12 @@ SOMWidgetIMPL::SOMWidgetIMPL( TQWidget *parent, const char* name ) m_htmlEnd = "</qt>"; m_prevUnit = Prefs::temperature(); - connect( Number1, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( spinValueChanged( double ) ) ); - connect( temp_slider, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( sliderValueChanged( int ) ) ); - connect( Number1, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( setNewTemp( double ) ) ); + connect( Number1, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( spinValueChanged( double ) ) ); + connect( temp_slider, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( sliderValueChanged( int ) ) ); + connect( Number1, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( setNewTemp( double ) ) ); reloadUnits(); } @@ -71,40 +71,40 @@ kdDebug() << "min: " << Number1->minValue() << " - max: " << Number1->maxValue() void SOMWidgetIMPL::sliderValueChanged( int temp ) { // TODO check if in TQt4 the RangeControl emits the signal again - disconnect( Number1, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( spinValueChanged( double ) ) ); - disconnect( temp_slider, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( sliderValueChanged( int ) ) ); - disconnect( Number1, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( setNewTemp( double ) ) ); + disconnect( Number1, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( spinValueChanged( double ) ) ); + disconnect( temp_slider, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( sliderValueChanged( int ) ) ); + disconnect( Number1, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( setNewTemp( double ) ) ); double newvalue = TempUnit::convert( (double)temp, (int)TempUnit::Kelvin, Prefs::temperature() ); Number1->setValue( newvalue ); setNewTemp( newvalue ); - connect( Number1, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( spinValueChanged( double ) ) ); - connect( temp_slider, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( sliderValueChanged( int ) ) ); - connect( Number1, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( setNewTemp( double ) ) ); + connect( Number1, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( spinValueChanged( double ) ) ); + connect( temp_slider, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( sliderValueChanged( int ) ) ); + connect( Number1, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( setNewTemp( double ) ) ); } void SOMWidgetIMPL::spinValueChanged( double temp ) { - disconnect( Number1, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( spinValueChanged( double ) ) ); - disconnect( temp_slider, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( sliderValueChanged( int ) ) ); - disconnect( Number1, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( setNewTemp( double ) ) ); + disconnect( Number1, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( spinValueChanged( double ) ) ); + disconnect( temp_slider, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( sliderValueChanged( int ) ) ); + disconnect( Number1, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( setNewTemp( double ) ) ); int newvalue = (int)TempUnit::convert( temp, Prefs::temperature(), (int)TempUnit::Kelvin ); temp_slider->setValue( newvalue ); setNewTemp( temp ); - connect( Number1, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( spinValueChanged( double ) ) ); - connect( temp_slider, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( sliderValueChanged( int ) ) ); - connect( Number1, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( setNewTemp( double ) ) ); + connect( Number1, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( spinValueChanged( double ) ) ); + connect( temp_slider, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( sliderValueChanged( int ) ) ); + connect( Number1, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( setNewTemp( double ) ) ); } void SOMWidgetIMPL::setNewTemp( double newtemp ) diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp index bf0f0c1f..d6ba31af 100644 --- a/kanagram/src/kanagram.cpp +++ b/kanagram/src/kanagram.cpp @@ -119,9 +119,9 @@ Kanagram::Kanagram() : TQWidget(0, 0, WStaticContents | WNoAutoErase), m_overNex m_inputBox->setGeometry(TQRect(52, 427, 273, 29)); m_inputBox->setFrame(false); - connect(m_inputBox, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(checkWord())); - connect(m_hintTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hideHint())); - connect(m_inputBox, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(update())); + connect(m_inputBox, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(checkWord())); + connect(m_hintTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hideHint())); + connect(m_inputBox, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(update())); TQFont f = TQFont(); f.setPointSize(17); @@ -465,7 +465,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e) { if(m_useSounds) play("right.ogg"); m_inputBox->setPaletteBackgroundColor(TQColor(0, 255, 0)); - TQTimer::singleShot(1000, this, TQT_SLOT(resetInputBox())); + TQTimer::singleShot(1000, this, TQ_SLOT(resetInputBox())); m_inputBox->clear(); hideHint(); m_game->nextAnagram(); @@ -475,7 +475,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e) { if(m_useSounds) play("wrong.ogg"); m_inputBox->setPaletteBackgroundColor(TQColor(255, 0, 0)); - TQTimer::singleShot(1000, this, TQT_SLOT(resetInputBox())); + TQTimer::singleShot(1000, this, TQ_SLOT(resetInputBox())); m_inputBox->clear(); update(); } @@ -744,8 +744,8 @@ void Kanagram::showSettings() m_vocabSettings = new VocabSettings( configDialog ); configDialog->addPage( m_vocabSettings, i18n("Vocabularies"), "edit" ); configDialog->addPage( new NewStuff( configDialog ), i18n("New Stuff"), "knewstuff" ); - connect(configDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(loadSettings())); - connect(configDialog, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(refreshVocabularies())); + connect(configDialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(loadSettings())); + connect(configDialog, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(refreshVocabularies())); configDialog->exec(); delete configDialog; } diff --git a/kanagram/src/keduvocdocument.cpp b/kanagram/src/keduvocdocument.cpp index 046ad56e..47053372 100644 --- a/kanagram/src/keduvocdocument.cpp +++ b/kanagram/src/keduvocdocument.cpp @@ -99,7 +99,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/) if (!url.isEmpty()) doc_url = url; - // TODO EPT connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) ); + // TODO EPT connect( this, TQ_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQ_SLOT(slotProgress(KEduVocDocument*,int)) ); TQString tmpfile; if (TDEIO::NetAccess::download( url, tmpfile, 0 )) @@ -182,7 +182,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/) bool KEduVocDocument::saveAs(TQObject * /*parent*/, const KURL & url, FileType ft, const TQString & generator) { -// connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) ); +// connect( this, TQ_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQ_SLOT(slotProgress(KEduVocDocument*,int)) ); KURL tmp (url); diff --git a/kanagram/src/main.cpp b/kanagram/src/main.cpp index 75481435..34c5288d 100644 --- a/kanagram/src/main.cpp +++ b/kanagram/src/main.cpp @@ -35,7 +35,7 @@ int main(int argc, char *argv[]) about.addCredit("Artemiy Pavlov", I18N_NOOP("Sound effects"), 0, "http://artemiolabs.com"); TDECmdLineArgs::init(argc, argv, &about); TDEApplication app; - app.connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit())); + app.connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit())); KanagramSettings::setJustGotFont(false); TQFont f("squeaky chalk sound"); diff --git a/kanagram/src/mainsettings.cpp b/kanagram/src/mainsettings.cpp index 8307bb1d..ff53034c 100644 --- a/kanagram/src/mainsettings.cpp +++ b/kanagram/src/mainsettings.cpp @@ -39,8 +39,8 @@ MainSettings::MainSettings(TQWidget *parent) : MainSettingsWidget(parent) { m_parent = (TDEConfigDialog*)parent; - connect(parent, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotChangeTranslation())); - connect(cboxTranslation, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotUpdateParent())); + connect(parent, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotChangeTranslation())); + connect(cboxTranslation, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotUpdateParent())); setupTranslations(); @@ -73,7 +73,7 @@ MainSettings::MainSettings(TQWidget *parent) : MainSettingsWidget(parent) if (!TQFontInfo(f).exactMatch()) { kcfg_useStandardFonts->setEnabled(false); - connect(getFontsButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(getAndInstallFont())); + connect(getFontsButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(getAndInstallFont())); } else { diff --git a/kanagram/src/newstuff.cpp b/kanagram/src/newstuff.cpp index 7293775d..c17cbea2 100644 --- a/kanagram/src/newstuff.cpp +++ b/kanagram/src/newstuff.cpp @@ -13,7 +13,7 @@ NewStuff::NewStuff(TQWidget *parent) : NewStuffWidget(parent) { - connect(btnGetNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewVocabs())); + connect(btnGetNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGetNewVocabs())); } NewStuff::~NewStuff() diff --git a/kanagram/src/vocabedit.cpp b/kanagram/src/vocabedit.cpp index 77002048..8035bda2 100644 --- a/kanagram/src/vocabedit.cpp +++ b/kanagram/src/vocabedit.cpp @@ -58,20 +58,20 @@ VocabEdit::VocabEdit(TQWidget *parent, TQString fileName) : VocabEditWidget(pare txtDescription->setText(doc->getDocRemark()); } - connect(btnSave, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSave())); - connect(btnNewWord, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewWord())); - connect(btnRemoveWord, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveWord())); - connect(btnClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose())); + connect(btnSave, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSave())); + connect(btnNewWord, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewWord())); + connect(btnRemoveWord, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveWord())); + connect(btnClose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose())); - connect(txtWord, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotWordTextChanged(const TQString &))); - connect(txtHint, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotHintTextChanged(const TQString &))); + connect(txtWord, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotWordTextChanged(const TQString &))); + connect(txtHint, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotHintTextChanged(const TQString &))); //Connect the name and description boxes to a general textChanged slot, so that we can keep track of //whether they've been changed or not - connect(txtVocabName, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotTextChanged(const TQString &))); - connect(txtDescription, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotTextChanged(const TQString &))); + connect(txtVocabName, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotTextChanged(const TQString &))); + connect(txtDescription, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotTextChanged(const TQString &))); - connect(lboxWords, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); + connect(lboxWords, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); //Has anything in the dialog changed? m_textChanged = false; @@ -140,15 +140,15 @@ void VocabEdit::slotNewWord() void VocabEdit::slotSelectionChanged() { //A little hack to make things work right - disconnect(txtWord, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotWordTextChanged(const TQString &))); - disconnect(txtHint, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotHintTextChanged(const TQString &))); + disconnect(txtWord, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotWordTextChanged(const TQString &))); + disconnect(txtHint, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotHintTextChanged(const TQString &))); if(lboxWords->currentItem() >= 0) { txtWord->setText(m_vocabList[lboxWords->currentItem()].getOriginal()); txtHint->setText(m_vocabList[lboxWords->currentItem()].getRemark(0)); } - connect(txtWord, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotWordTextChanged(const TQString &))); - connect(txtHint, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotHintTextChanged(const TQString &))); + connect(txtWord, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotWordTextChanged(const TQString &))); + connect(txtHint, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotHintTextChanged(const TQString &))); } void VocabEdit::slotWordTextChanged(const TQString &changes) diff --git a/kanagram/src/vocabsettings.cpp b/kanagram/src/vocabsettings.cpp index d965abd5..e439b173 100644 --- a/kanagram/src/vocabsettings.cpp +++ b/kanagram/src/vocabsettings.cpp @@ -18,10 +18,10 @@ VocabSettings::VocabSettings(TQWidget *parent) : VocabSettingsWidget(parent) { - connect(btnCreateNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCreateNew())); - connect(btnEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit())); - connect(btnDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelete())); - connect(lviewVocab, TQT_SIGNAL(selectionChanged(TQListViewItem *)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem *))); + connect(btnCreateNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCreateNew())); + connect(btnEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEdit())); + connect(btnDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelete())); + connect(lviewVocab, TQ_SIGNAL(selectionChanged(TQListViewItem *)), this, TQ_SLOT(slotSelectionChanged(TQListViewItem *))); refreshView(); } diff --git a/kbruch/src/exercisecompare.cpp b/kbruch/src/exercisecompare.cpp index b98d5c78..b5a94b84 100644 --- a/kbruch/src/exercisecompare.cpp +++ b/kbruch/src/exercisecompare.cpp @@ -86,7 +86,7 @@ ExerciseCompare::ExerciseCompare(TQWidget * parent, const char * name): m_signButtonState = lessThen; taskLineHBoxLayout->addWidget(m_signButton); - TQObject::connect(m_signButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSignButtonClicked())); + TQObject::connect(m_signButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSignButtonClicked())); TQToolTip::add(m_signButton, i18n("Click on this button to change the comparison sign.")); // spacer @@ -124,7 +124,7 @@ ExerciseCompare::ExerciseCompare(TQWidget * parent, const char * name): m_checkButton->setDefault(true); // is the default button of the dialog TQToolTip::add(m_checkButton, i18n("Click on this button to check your result.")); lowerHBox->addWidget(m_checkButton, 1, TQt::AlignRight); - TQObject::connect(m_checkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckButtonClicked())); + TQObject::connect(m_checkButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCheckButtonClicked())); // that the user can start typing without moving the focus m_signButton->setFocus(); diff --git a/kbruch/src/exerciseconvert.cpp b/kbruch/src/exerciseconvert.cpp index ec7db1e7..2e3fb808 100644 --- a/kbruch/src/exerciseconvert.cpp +++ b/kbruch/src/exerciseconvert.cpp @@ -158,7 +158,7 @@ ExerciseConvert::ExerciseConvert(TQWidget * parent, const char * name): m_checkButton->setDefault(true); // is the default button of the dialog TQToolTip::add(m_checkButton, i18n("Click on this button to check your result. The button will not work if you have not entered a result yet.")); lowerHBox->addWidget(m_checkButton, 1, TQt::AlignRight); - TQObject::connect(m_checkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckButtonClicked())); + TQObject::connect(m_checkButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCheckButtonClicked())); // that the user can start typing without moving the focus numer_edit->setFocus(); diff --git a/kbruch/src/exercisefactorize.cpp b/kbruch/src/exercisefactorize.cpp index e971e12f..8eb43a9a 100644 --- a/kbruch/src/exercisefactorize.cpp +++ b/kbruch/src/exercisefactorize.cpp @@ -126,14 +126,14 @@ ExerciseFactorize::ExerciseFactorize(TQWidget * parent, const char * name): m_factor13Button->setText( i18n( "13" ) ); m_factor17Button->setText( i18n( "17" ) ); m_factor19Button->setText( i18n( "19" ) ); - TQObject::connect(m_factor2Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor2ButtonClicked())); - TQObject::connect(m_factor3Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor3ButtonClicked())); - TQObject::connect(m_factor5Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor5ButtonClicked())); - TQObject::connect(m_factor7Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor7ButtonClicked())); - TQObject::connect(m_factor11Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor11ButtonClicked())); - TQObject::connect(m_factor13Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor13ButtonClicked())); - TQObject::connect(m_factor17Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor17ButtonClicked())); - TQObject::connect(m_factor19Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor19ButtonClicked())); + TQObject::connect(m_factor2Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor2ButtonClicked())); + TQObject::connect(m_factor3Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor3ButtonClicked())); + TQObject::connect(m_factor5Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor5ButtonClicked())); + TQObject::connect(m_factor7Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor7ButtonClicked())); + TQObject::connect(m_factor11Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor11ButtonClicked())); + TQObject::connect(m_factor13Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor13ButtonClicked())); + TQObject::connect(m_factor17Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor17ButtonClicked())); + TQObject::connect(m_factor19Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor19ButtonClicked())); // add tooltips to the factor buttons TQToolTip::add(m_factor2Button, i18n("Add prime factor 2.")); @@ -148,13 +148,13 @@ ExerciseFactorize::ExerciseFactorize(TQWidget * parent, const char * name): // the remove last factor button m_removeLastFactorButton->setText( i18n( "&Remove Last Factor" ) ); m_removeLastFactorButton->setEnabled(false); - TQObject::connect(m_removeLastFactorButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveLastFactorButtonClicked())); + TQObject::connect(m_removeLastFactorButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveLastFactorButtonClicked())); TQToolTip::add(m_removeLastFactorButton, i18n("Removes the last entered prime factor.")); // the check task button m_checkButton->setText( i18n( "&Check Task" ) ); TQToolTip::add(m_checkButton, i18n("Click on this button to check your result. The button will not work if you have not entered a result yet.")); - TQObject::connect(m_checkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckButtonClicked())); + TQObject::connect(m_checkButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCheckButtonClicked())); m_checkButton->setDefault(true); // is the default button of the dialog // that the user can start choosing the prime factors diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp index fa4fb400..97d73264 100644 --- a/kbruch/src/mainqtwidget.cpp +++ b/kbruch/src/mainqtwidget.cpp @@ -94,18 +94,18 @@ MainQtWidget::MainQtWidget() splitter->setResizeMode(m_statview, TQSplitter::FollowSizeHint); // we must change the status of the menubar before another page is shown - TQObject::connect(m_exercises, TQT_SIGNAL(aboutToShowPage(TQWidget *)), this, TQT_SLOT(slotAboutToShowPage(TQWidget *))); + TQObject::connect(m_exercises, TQ_SIGNAL(aboutToShowPage(TQWidget *)), this, TQ_SLOT(slotAboutToShowPage(TQWidget *))); // connect signals of the exercises and StatisticView, so that StatisticView // gets informed about how the user solved a given task (wrong or correct) - TQObject::connect(m_taskview, TQT_SIGNAL(signalTaskSolvedCorrect()), m_statview, TQT_SLOT(addCorrect())); - TQObject::connect(m_taskview, TQT_SIGNAL(signalTaskSolvedWrong()), m_statview, TQT_SLOT(addWrong())); - TQObject::connect(m_exerciseCompare, TQT_SIGNAL(signalExerciseSolvedCorrect()), m_statview, TQT_SLOT(addCorrect())); - TQObject::connect(m_exerciseCompare, TQT_SIGNAL(signalExerciseSolvedWrong()), m_statview, TQT_SLOT(addWrong())); - TQObject::connect(m_exerciseConvert, TQT_SIGNAL(signalExerciseSolvedCorrect()), m_statview, TQT_SLOT(addCorrect())); - TQObject::connect(m_exerciseConvert, TQT_SIGNAL(signalExerciseSolvedWrong()), m_statview, TQT_SLOT(addWrong())); - TQObject::connect(m_exerciseFactorize, TQT_SIGNAL(signalExerciseSolvedCorrect()), m_statview, TQT_SLOT(addCorrect())); - TQObject::connect(m_exerciseFactorize, TQT_SIGNAL(signalExerciseSolvedWrong()), m_statview, TQT_SLOT(addWrong())); + TQObject::connect(m_taskview, TQ_SIGNAL(signalTaskSolvedCorrect()), m_statview, TQ_SLOT(addCorrect())); + TQObject::connect(m_taskview, TQ_SIGNAL(signalTaskSolvedWrong()), m_statview, TQ_SLOT(addWrong())); + TQObject::connect(m_exerciseCompare, TQ_SIGNAL(signalExerciseSolvedCorrect()), m_statview, TQ_SLOT(addCorrect())); + TQObject::connect(m_exerciseCompare, TQ_SIGNAL(signalExerciseSolvedWrong()), m_statview, TQ_SLOT(addWrong())); + TQObject::connect(m_exerciseConvert, TQ_SIGNAL(signalExerciseSolvedCorrect()), m_statview, TQ_SLOT(addCorrect())); + TQObject::connect(m_exerciseConvert, TQ_SIGNAL(signalExerciseSolvedWrong()), m_statview, TQ_SLOT(addWrong())); + TQObject::connect(m_exerciseFactorize, TQ_SIGNAL(signalExerciseSolvedCorrect()), m_statview, TQ_SLOT(addCorrect())); + TQObject::connect(m_exerciseFactorize, TQ_SIGNAL(signalExerciseSolvedWrong()), m_statview, TQ_SLOT(addWrong())); #if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3) #else @@ -155,19 +155,19 @@ void MainQtWidget::setupActions() { // new task action m_NewTaskAction = new TDEAction(i18n("&New"), "document-new", TDEStdAccel::shortcut(TDEStdAccel::New), - this, TQT_SLOT(NewTask()), + this, TQ_SLOT(NewTask()), actionCollection(), "NewTask"); // quit action - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); // - KStdAction::preferences(this, TQT_SLOT( slotPrefs() ), actionCollection()); + KStdAction::preferences(this, TQ_SLOT( slotPrefs() ), actionCollection()); // a label just describing the Number of terms ComboBox m_NrOfTermsLabel = new TQLabel(i18n("Terms:"), 0, "tde toolbar widget"); m_NrOfTermsLabelAction = new KWidgetAction(m_NrOfTermsLabel, i18n("Terms:"), ALT+Key_E, - this, TQT_SLOT(NrOfTermsBoxSlot()), + this, TQ_SLOT(NrOfTermsBoxSlot()), actionCollection(), "NrOfTermsLabelAction"); // the ComboBox holding possible values for term number @@ -179,15 +179,15 @@ void MainQtWidget::setupActions() m_NrOfTermsBox->setCurrentItem(m_nrRatios - 2); TQToolTip::add( m_NrOfTermsBox, i18n( "The number of terms you want" ) ); TQWhatsThis::add( m_NrOfTermsBox, i18n( "Choose the number of terms (2, 3, 4 or 5) you want for calculating fractions." ) ); - m_NrOfTermsBoxAction = new KWidgetAction(m_NrOfTermsBox, i18n("Number of Terms"), ALT+Key_E, this, TQT_SLOT(NrOfTermsBoxSlot()), actionCollection(), "NrOfTermsBoxAction"); + m_NrOfTermsBoxAction = new KWidgetAction(m_NrOfTermsBox, i18n("Number of Terms"), ALT+Key_E, this, TQ_SLOT(NrOfTermsBoxSlot()), actionCollection(), "NrOfTermsBoxAction"); // now connect the ComboBox's signal textChanged() to the slot function - TQObject::connect(m_NrOfTermsBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(NrOfTermsBoxSlot())); + TQObject::connect(m_NrOfTermsBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(NrOfTermsBoxSlot())); // a label just describing the max. main denominator ComboBox m_MaxMainDenominatorLabel = new TQLabel(i18n("Max. main denominator:"), 0, "tde toolbar widget"); m_MaxMainDenominatorLabelAction = new KWidgetAction(m_MaxMainDenominatorLabel, i18n("Max. main denominator:"), ALT+Key_D, - this, TQT_SLOT(MaxMainDenominatorBoxSlot()), + this, TQ_SLOT(MaxMainDenominatorBoxSlot()), actionCollection(), "MaxMainDenominatorLabelAction"); // the ComboBox holding possible values for the max. main denominator @@ -209,16 +209,16 @@ void MainQtWidget::setupActions() case 50 : m_MaxMainDenominatorBox->setCurrentItem(3); break; } - m_MaxMainDenominatorBoxAction = new KWidgetAction(m_MaxMainDenominatorBox, i18n("Maximal Main Denominator"), ALT+Key_D, this, TQT_SLOT(MaxMainDenominatorBoxSlot()), actionCollection(), "MaxMainDenominatorBoxAction"); + m_MaxMainDenominatorBoxAction = new KWidgetAction(m_MaxMainDenominatorBox, i18n("Maximal Main Denominator"), ALT+Key_D, this, TQ_SLOT(MaxMainDenominatorBoxSlot()), actionCollection(), "MaxMainDenominatorBoxAction"); // now connect the ComboBox's signal textChanged() to the slot function - TQObject::connect(m_MaxMainDenominatorBox, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(MaxMainDenominatorBoxSlot())); + TQObject::connect(m_MaxMainDenominatorBox, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(MaxMainDenominatorBoxSlot())); // a label just describing the operation ComboBox m_OperationLabel = new TQLabel(i18n("Operations:"), 0, "tde toolbar widget"); m_OperationLabelAction = new KWidgetAction(m_OperationLabel, i18n("Operations:"), ALT+Key_O, - this, TQT_SLOT(OperationBoxSlot()), + this, TQ_SLOT(OperationBoxSlot()), actionCollection(), "OperationLabelAction"); // the ComboBox holding possible combinations for operations @@ -236,10 +236,10 @@ void MainQtWidget::setupActions() } TQToolTip::add( m_OperationBox, i18n( "The operations you want" ) ); TQWhatsThis::add( m_OperationBox, i18n( "Choose the type of operations you want for calculating fractions: Addition/Substraction, Multiplication/Division or All Operations Mixed. If you choose All Operations Mixed, the program will randomly choose addition, substraction, multiplication and/or division." ) ); - m_OperationBoxAction = new KWidgetAction(m_OperationBox, i18n("Operations:"), ALT+Key_O, this, TQT_SLOT(OperationBoxSlot()), actionCollection(), "OperationBoxAction"); + m_OperationBoxAction = new KWidgetAction(m_OperationBox, i18n("Operations:"), ALT+Key_O, this, TQ_SLOT(OperationBoxSlot()), actionCollection(), "OperationBoxAction"); // now connect the ComboBox's signal textChanged() to the slot function - TQObject::connect(m_OperationBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(OperationBoxSlot())); + TQObject::connect(m_OperationBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(OperationBoxSlot())); #if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3) if (!initialGeometrySet()) @@ -428,12 +428,12 @@ void MainQtWidget::slotPrefs() // User edited the configuration - update your local copies of the // configuration data - connect(configDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotApplySettings()) ); + connect(configDialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotApplySettings()) ); configDialog->show(); /* SettingsDialog * dlg = new SettingsDialog(this); - connect(dlg, TQT_SIGNAL(configChanged()), this, TQT_SLOT(slotApplySettings())); + connect(dlg, TQ_SIGNAL(configChanged()), this, TQ_SLOT(slotApplySettings())); dlg->exec(); diff --git a/kbruch/src/statisticsview.cpp b/kbruch/src/statisticsview.cpp index f60b0787..6ac23ca5 100644 --- a/kbruch/src/statisticsview.cpp +++ b/kbruch/src/statisticsview.cpp @@ -117,7 +117,7 @@ StatisticsView::StatisticsView(TQWidget * parent, const char * name): /* the Reset button */ buttonLayout = new TQHBoxLayout(layout1); resetBtn = new TQPushButton(i18n("&Reset"), this); - TQObject::connect(resetBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetStatistics())); + TQObject::connect(resetBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(resetStatistics())); buttonLayout->addWidget(resetBtn); TQToolTip::add(resetBtn, i18n("Press the button to reset the statistics.")); TQSpacerItem* spacer = new TQSpacerItem(0,0); diff --git a/kbruch/src/taskview.cpp b/kbruch/src/taskview.cpp index 1c0b1a25..d1b05b01 100644 --- a/kbruch/src/taskview.cpp +++ b/kbruch/src/taskview.cpp @@ -153,7 +153,7 @@ TaskView::TaskView(TQWidget * parent, const char * name, bool padd_sub, m_checkButton->setDefault(true); // is the default button of the dialog TQToolTip::add(m_checkButton, i18n("Click on this button to check your result. The button will not work if you have not entered a result yet.")); lowerHBox->addWidget(m_checkButton, 1, TQt::AlignRight); - TQObject::connect(m_checkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckButtonClicked())); + TQObject::connect(m_checkButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCheckButtonClicked())); // that the user can start typing without moving the focus numer_edit->setFocus(); 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; } } diff --git a/kgeography/src/boxasker.cpp b/kgeography/src/boxasker.cpp index b2ca281a..76535874 100644 --- a/kgeography/src/boxasker.cpp +++ b/kgeography/src/boxasker.cpp @@ -122,7 +122,7 @@ void boxAsker::init() nextQuestion(); p_accept -> disconnect(); - connect(p_accept, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswer())); + connect(p_accept, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswer())); } #include "boxasker.moc" diff --git a/kgeography/src/kgeography.cpp b/kgeography/src/kgeography.cpp index 2aaee1e9..a0dba217 100644 --- a/kgeography/src/kgeography.cpp +++ b/kgeography/src/kgeography.cpp @@ -65,16 +65,16 @@ kgeography::kgeography() : TDEMainWindow(), p_firstShow(true), p_mustShowResults setCentralWidget(p_bigWidget); - connect(p_consult, TQT_SIGNAL(clicked()), this, TQT_SLOT(consult())); - connect(p_askMap, TQT_SIGNAL(clicked()), this, TQT_SLOT(askMap())); - connect(p_askCapitalDivisions, TQT_SIGNAL(clicked()), this, TQT_SLOT(askCapitalDivisions())); - connect(p_askDivisionCapitals, TQT_SIGNAL(clicked()), this, TQT_SLOT(askDivisionCapitals())); - connect(p_askFlagDivisions, TQT_SIGNAL(clicked()), this, TQT_SLOT(askFlagDivisions())); - connect(p_askDivisionFlags, TQT_SIGNAL(clicked()), this, TQT_SLOT(askDivisionFlags())); - - TDEAction *a = KStdAction::open(this, TQT_SLOT(openMap()), actionCollection(), "openMap"); + connect(p_consult, TQ_SIGNAL(clicked()), this, TQ_SLOT(consult())); + connect(p_askMap, TQ_SIGNAL(clicked()), this, TQ_SLOT(askMap())); + connect(p_askCapitalDivisions, TQ_SIGNAL(clicked()), this, TQ_SLOT(askCapitalDivisions())); + connect(p_askDivisionCapitals, TQ_SIGNAL(clicked()), this, TQ_SLOT(askDivisionCapitals())); + connect(p_askFlagDivisions, TQ_SIGNAL(clicked()), this, TQ_SLOT(askFlagDivisions())); + connect(p_askDivisionFlags, TQ_SIGNAL(clicked()), this, TQ_SLOT(askDivisionFlags())); + + TDEAction *a = KStdAction::open(this, TQ_SLOT(openMap()), actionCollection(), "openMap"); a -> setText(i18n("&Open Map...")); - KStdAction::quit(this, TQT_SLOT(close()), actionCollection(), "quit"); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection(), "quit"); p_zoom = new TDEToggleAction(i18n("&Zoom"), "zoom-fit-best", 0, 0, 0, actionCollection(), "zoom_select"); p_zoom -> setEnabled(false); @@ -85,7 +85,7 @@ kgeography::kgeography() : TDEMainWindow(), p_firstShow(true), p_mustShowResults p_move = new TDEToggleAction(i18n("&Move"), "move", 0, 0, 0, actionCollection(), "move"); p_move -> setEnabled(false); - new TDEAction(i18n("Disclaimer"), 0, this, TQT_SLOT(disclaimer()), actionCollection(), "disclaimer"); + new TDEAction(i18n("Disclaimer"), 0, this, TQ_SLOT(disclaimer()), actionCollection(), "disclaimer"); setupGUI(Keys | ToolBar | Save | Create); @@ -132,7 +132,7 @@ void kgeography::showEvent(TQShowEvent *) } // if anyone can explain why with the slot works and now without // i'll be glad to learn - TQTimer::singleShot(0, this, TQT_SLOT(resizeMainWindow())); + TQTimer::singleShot(0, this, TQ_SLOT(resizeMainWindow())); // resizeMainWindow(); p_firstShow = false; @@ -269,13 +269,13 @@ void kgeography::putAskWidget() { p_bigWidget -> setStretchFactor(p_askWidget, 1); p_askWidget -> show(); - connect(p_askWidget, TQT_SIGNAL(setZoomActionChecked(bool)), p_zoom, TQT_SLOT(setChecked(bool))); - connect(p_zoom, TQT_SIGNAL(toggled(bool)), p_askWidget, TQT_SLOT(setZoom(bool))); - connect(p_zoomOriginal, TQT_SIGNAL(activated()), p_askWidget, TQT_SLOT(setOriginalZoom())); - connect(p_askWidget, TQT_SIGNAL(setMoveActionEnabled(bool)), p_move, TQT_SLOT(setEnabled(bool))); - connect(p_askWidget, TQT_SIGNAL(setMoveActionChecked(bool)), p_move, TQT_SLOT(setChecked(bool))); - connect(p_move, TQT_SIGNAL(toggled(bool)), p_askWidget, TQT_SLOT(setMovement(bool))); - connect(p_askWidget, TQT_SIGNAL(questionsEnded()), this, TQT_SLOT(showResultsDialog())); + connect(p_askWidget, TQ_SIGNAL(setZoomActionChecked(bool)), p_zoom, TQ_SLOT(setChecked(bool))); + connect(p_zoom, TQ_SIGNAL(toggled(bool)), p_askWidget, TQ_SLOT(setZoom(bool))); + connect(p_zoomOriginal, TQ_SIGNAL(activated()), p_askWidget, TQ_SLOT(setOriginalZoom())); + connect(p_askWidget, TQ_SIGNAL(setMoveActionEnabled(bool)), p_move, TQ_SLOT(setEnabled(bool))); + connect(p_askWidget, TQ_SIGNAL(setMoveActionChecked(bool)), p_move, TQ_SLOT(setChecked(bool))); + connect(p_move, TQ_SIGNAL(toggled(bool)), p_askWidget, TQ_SLOT(setMovement(bool))); + connect(p_askWidget, TQ_SIGNAL(questionsEnded()), this, TQ_SLOT(showResultsDialog())); } void kgeography::setMap(KGmap *m) diff --git a/kgeography/src/mapasker.cpp b/kgeography/src/mapasker.cpp index c9ea4c78..0422aaea 100644 --- a/kgeography/src/mapasker.cpp +++ b/kgeography/src/mapasker.cpp @@ -37,17 +37,17 @@ mapAsker::mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint cou p_shouldClearPopup = false; - connect(p_mapWidget, TQT_SIGNAL(clicked(TQRgb, const TQPoint&)), this, TQT_SLOT(handleMapClick(TQRgb, const TQPoint&))); - connect(p_mapWidget, TQT_SIGNAL(setMoveActionChecked(bool)), this, TQT_SIGNAL(setMoveActionChecked(bool))); - connect(p_mapWidget, TQT_SIGNAL(setZoomActionChecked(bool)), this, TQT_SIGNAL(setZoomActionChecked(bool))); - connect(p_mapWidget, TQT_SIGNAL(setMoveActionEnabled(bool)), this, TQT_SIGNAL(setMoveActionEnabled(bool))); - connect(p_mapWidget, TQT_SIGNAL(setMoveActionEnabled(bool)), this, TQT_SLOT(showScrollBars(bool))); - connect(p_mapWidget, TQT_SIGNAL(updatePosition(int, int)), this, TQT_SLOT(setScrollBarsPosition(int, int))); - connect(p_mapWidget, TQT_SIGNAL(updateVisibleSize(int, int)), this, TQT_SLOT(setScrollBarsVisibleSize(int, int))); - connect(p_mapWidget, TQT_SIGNAL(updateMaximumSize(int, int)), this, TQT_SLOT(setScrollBarsMaximumSize(int, int))); - - connect(p_hsb, TQT_SIGNAL(valueChanged(int)), p_mapWidget, TQT_SLOT(updateHPosition(int))); - connect(p_vsb, TQT_SIGNAL(valueChanged(int)), p_mapWidget, TQT_SLOT(updateVPosition(int))); + connect(p_mapWidget, TQ_SIGNAL(clicked(TQRgb, const TQPoint&)), this, TQ_SLOT(handleMapClick(TQRgb, const TQPoint&))); + connect(p_mapWidget, TQ_SIGNAL(setMoveActionChecked(bool)), this, TQ_SIGNAL(setMoveActionChecked(bool))); + connect(p_mapWidget, TQ_SIGNAL(setZoomActionChecked(bool)), this, TQ_SIGNAL(setZoomActionChecked(bool))); + connect(p_mapWidget, TQ_SIGNAL(setMoveActionEnabled(bool)), this, TQ_SIGNAL(setMoveActionEnabled(bool))); + connect(p_mapWidget, TQ_SIGNAL(setMoveActionEnabled(bool)), this, TQ_SLOT(showScrollBars(bool))); + connect(p_mapWidget, TQ_SIGNAL(updatePosition(int, int)), this, TQ_SLOT(setScrollBarsPosition(int, int))); + connect(p_mapWidget, TQ_SIGNAL(updateVisibleSize(int, int)), this, TQ_SLOT(setScrollBarsVisibleSize(int, int))); + connect(p_mapWidget, TQ_SIGNAL(updateMaximumSize(int, int)), this, TQ_SLOT(setScrollBarsMaximumSize(int, int))); + + connect(p_hsb, TQ_SIGNAL(valueChanged(int)), p_mapWidget, TQ_SLOT(updateHPosition(int))); + connect(p_vsb, TQ_SIGNAL(valueChanged(int)), p_mapWidget, TQ_SLOT(updateVPosition(int))); if (asker) { diff --git a/kgeography/src/mapchooser.cpp b/kgeography/src/mapchooser.cpp index 5f921501..e2c6a640 100644 --- a/kgeography/src/mapchooser.cpp +++ b/kgeography/src/mapchooser.cpp @@ -56,8 +56,8 @@ mapChooser::mapChooser(TQWidget *parent) : KDialogBase(parent, 0, true, i18n("Ch p_image = new TQWidget(mapArea); mapLay -> addWidget(p_image, 1, 1); - connect(p_listBox, TQT_SIGNAL(highlighted(const TQString&)), this, TQT_SLOT(putImage(const TQString&))); - connect(p_listBox, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotOk())); + connect(p_listBox, TQ_SIGNAL(highlighted(const TQString&)), this, TQ_SLOT(putImage(const TQString&))); + connect(p_listBox, TQ_SIGNAL(selected(int)), this, TQ_SLOT(slotOk())); setMainWidget(mainHB); diff --git a/kgeography/src/popupmanager.cpp b/kgeography/src/popupmanager.cpp index 1a457f81..5c86adeb 100644 --- a/kgeography/src/popupmanager.cpp +++ b/kgeography/src/popupmanager.cpp @@ -61,7 +61,7 @@ void popupManager::init(const TQPoint &p) else y = maxY; p_mp -> move(x, y); p_mp -> show(); - connect(p_mp, TQT_SIGNAL(deleteMe()), this, TQT_SLOT(clear())); + connect(p_mp, TQ_SIGNAL(deleteMe()), this, TQ_SLOT(clear())); } #include "popupmanager.moc" diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp index 371ccb4c..03dabbdf 100644 --- a/khangman/khangman/khangman.cpp +++ b/khangman/khangman/khangman.cpp @@ -74,30 +74,30 @@ KHangMan::~KHangMan() void KHangMan::setupActions() { // Game->New - TDEAction *action = new TDEAction(i18n("&New"), "document-new", CTRL+Key_N , m_view, TQT_SLOT(slotNewGame()), actionCollection(), "file_new"); + TDEAction *action = new TDEAction(i18n("&New"), "document-new", CTRL+Key_N , m_view, TQ_SLOT(slotNewGame()), actionCollection(), "file_new"); action->setToolTip(i18n( "Play with a new word" )); // Game->Get Words in New Language - new TDEAction( i18n("&Get Words in New Language..."), "knewstuff", CTRL+Key_G, this, TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" ); + new TDEAction( i18n("&Get Words in New Language..."), "knewstuff", CTRL+Key_G, this, TQ_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" ); - KStdAction::quit(this, TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(slotQuit()), actionCollection()); m_levelAction = new TDESelectAction(i18n("Le&vel"), 0, actionCollection(), "combo_level"); m_levelAction->setToolTip(i18n( "Choose the level" )); m_levelAction->setWhatsThis(i18n( "Choose the level of difficulty" )); - connect(m_levelAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLevel(int))); + connect(m_levelAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChangeLevel(int))); // Action for selecting language. m_languageAction = new TDESelectAction(i18n("&Language"), 0, actionCollection(), "languages"); m_languageAction->setItems(m_languageNames); m_languageAction->setCurrentItem(m_languages.findIndex(Prefs::selectedLanguage())); - connect(m_languageAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLanguage(int))); + connect(m_languageAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChangeLanguage(int))); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // Mode. Currently hard coded into Sea and Desert themes. TQStringList modes; - m_modeAction = new TDESelectAction(i18n("L&ook"), 0, this, TQT_SLOT(slotChangeMode()), actionCollection(), "combo_mode"); + m_modeAction = new TDESelectAction(i18n("L&ook"), 0, this, TQ_SLOT(slotChangeMode()), actionCollection(), "combo_mode"); modes += i18n("&Sea Theme"); modes += i18n("&Desert Theme"); m_modeAction->setItems(modes); @@ -382,7 +382,7 @@ void KHangMan::optionsPreferences() Timer *m_timer = new Timer(); dialog->addPage(m_timer, i18n("Timers"), "clock"); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(updateSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(updateSettings())); dialog->show(); } @@ -457,8 +457,8 @@ void KHangMan::loadLangToolBar() for (int i=0; i<(int) m_allData.count(); i++) secondToolbar->insertButton (charIcon(m_allData[i].at(0)), i, - TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotPasteChar()), true, + TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotPasteChar()), true, i18n("Inserts the character %1").arg(m_allData[i]), i+1 ); } diff --git a/khangman/khangman/khangmanview.cpp b/khangman/khangman/khangmanview.cpp index 69831919..dc8864c8 100644 --- a/khangman/khangman/khangmanview.cpp +++ b/khangman/khangman/khangmanview.cpp @@ -77,10 +77,10 @@ KHangManView::KHangManView(KHangMan*parent, const char *name) m_accentedLetters = true; m_hintExists = true; // Assume hint exists - connect( m_letterInput, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( slotTry() ) ); - connect( m_guessButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotTry() )); + connect( m_letterInput, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( slotTry() ) ); + connect( m_guessButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotTry() )); } @@ -429,7 +429,7 @@ void KHangManView::slotTry() y = abspos.y() + height()*20/535; point = TQPoint(x, y); popup->show(mapToGlobal(point)); - TQTimer::singleShot( 4*1000, this, TQT_SLOT(slotNewGame()) ); + TQTimer::singleShot( 4*1000, this, TQ_SLOT(slotNewGame()) ); } else if (KMessageBox::questionYesNo(this, i18n("Congratulations! You won! Do you want to play again?"),TQString(),i18n("Play Again"), i18n("Do Not Play")) == 3) slotNewGame(); @@ -475,7 +475,7 @@ void KHangManView::slotTry() int y = abspos.y() + height() * 20 / 535; popup->show(mapToGlobal(TQPoint(x, y))); - TQTimer::singleShot( 4 * 1000, this, TQT_SLOT(slotNewGame()) ); + TQTimer::singleShot( 4 * 1000, this, TQ_SLOT(slotNewGame()) ); } else if (KMessageBox::questionYesNo(this, newGameString, TQString(), i18n("Play Again"), i18n("Do Not Play")) == 3) slotNewGame(); @@ -507,7 +507,7 @@ void KHangManView::slotTry() // Create a 1 second single-shot timer, and reenable user // input after this time. TQTimer::singleShot( Prefs::missedTimer() * 1000, - this, TQT_SLOT(enableUserInput()) ); + this, TQ_SLOT(enableUserInput()) ); // Disable any possible entry m_letterInput->setEnabled(false); @@ -528,7 +528,7 @@ void KHangManView::slotTry() point = TQPoint(x, y); TQTimer::singleShot( Prefs::missedTimer() * 1000, - this, TQT_SLOT(enableUserInput()) ); + this, TQ_SLOT(enableUserInput()) ); // Disable any possible entry m_letterInput->setEnabled(false); diff --git a/khangman/khangman/timer.cpp b/khangman/khangman/timer.cpp index 64fe60a7..21386035 100644 --- a/khangman/khangman/timer.cpp +++ b/khangman/khangman/timer.cpp @@ -32,8 +32,8 @@ Timer::Timer() { timeHintLabel->setText(TQString::number(Prefs::hintTimer()) + " " + i18n("seconds")); timeMissedLabel->setText(TQString::number(Prefs::missedTimer()) + " " + i18n("seconds")); - connect(kcfg_HintTimer, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(sliderValueChanged())); - connect(kcfg_MissedTimer, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(sliderValueChanged())); + connect(kcfg_HintTimer, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(sliderValueChanged())); + connect(kcfg_MissedTimer, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(sliderValueChanged())); } diff --git a/kig/filters/drgeo-filter-chooser.cpp b/kig/filters/drgeo-filter-chooser.cpp index 89250235..4ec6db88 100644 --- a/kig/filters/drgeo-filter-chooser.cpp +++ b/kig/filters/drgeo-filter-chooser.cpp @@ -33,9 +33,9 @@ KigFilterDrgeoChooser::KigFilterDrgeoChooser( const TQStringList& l ) FigureListBox->insertStringList( l ); - connect( OKButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOKPressed() ) ); - connect( CancelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCancelPressed() ) ); - connect( FigureListBox, TQT_SIGNAL( executed( TQListBoxItem* ) ), TQT_SLOT( slotExecuted( TQListBoxItem* ) ) ); + connect( OKButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOKPressed() ) ); + connect( CancelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCancelPressed() ) ); + connect( FigureListBox, TQ_SIGNAL( executed( TQListBoxItem* ) ), TQ_SLOT( slotExecuted( TQListBoxItem* ) ) ); } void KigFilterDrgeoChooser::slotOKPressed() diff --git a/kig/filters/imageexporteroptions.cpp b/kig/filters/imageexporteroptions.cpp index cd68a0af..a72b0ae7 100644 --- a/kig/filters/imageexporteroptions.cpp +++ b/kig/filters/imageexporteroptions.cpp @@ -28,8 +28,8 @@ ImageExporterOptions::ImageExporterOptions( TQWidget* parent, const TQSize& s ) minternallysettingstuff( false ) { keepAspectRatio->setChecked( true ); - connect( WidthInput, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotWidthChanged( int ) ) ); - connect( HeightInput, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotHeightChanged( int ) ) ); + connect( WidthInput, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotWidthChanged( int ) ) ); + connect( HeightInput, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotHeightChanged( int ) ) ); } ImageExporterOptions::~ImageExporterOptions() diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp index 667ddc97..4dd41cc3 100644 --- a/kig/kig/kig.cpp +++ b/kig/kig/kig.cpp @@ -78,7 +78,7 @@ Kig::Kig() // and integrate the part's GUI with the shell's createGUI(m_part); // finally show tip-of-day ( if the user wants it :) ) - TQTimer::singleShot( 0, this, TQT_SLOT( startupTipOfDay() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( startupTipOfDay() ) ); } } else @@ -105,30 +105,30 @@ Kig::~Kig() void Kig::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); #ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES - m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); #else createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); #endif // FIXME: this (recent files) should be app-wide, not specific to each window... - m_recentFilesAction = KStdAction::openRecent(this, TQT_SLOT(openURL(const KURL&)), actionCollection()); + m_recentFilesAction = KStdAction::openRecent(this, TQ_SLOT(openURL(const KURL&)), actionCollection()); m_recentFilesAction->loadEntries(config); #if KDE_IS_VERSION( 3, 2, 90 ) - KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); + KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection() ); #else - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); #endif - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::tipOfDay( this, TQT_SLOT( tipOfDay() ), actionCollection(), "help_tipofday" ); + KStdAction::tipOfDay( this, TQ_SLOT( tipOfDay() ), actionCollection(), "help_tipofday" ); } void Kig::saveProperties(TDEConfig* config) @@ -203,8 +203,8 @@ void Kig::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp index 853f7527..fa7a9f6b 100644 --- a/kig/kig/kig_part.cpp +++ b/kig/kig/kig_part.cpp @@ -193,7 +193,7 @@ KigPart::KigPart( TQWidget *parentWidget, const char *, // construct our command history mhistory = new KCommandHistory(actionCollection()); mhistory->documentSaved(); - connect( mhistory, TQT_SIGNAL( documentRestored() ), this, TQT_SLOT( setUnmodified() ) ); + connect( mhistory, TQ_SIGNAL( documentRestored() ), this, TQ_SLOT( setUnmodified() ) ); // we are read-write by default setReadWrite(true); @@ -206,21 +206,21 @@ KigPart::KigPart( TQWidget *parentWidget, const char *, void KigPart::setupActions() { // save actions.. - (void) KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - (void) KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection()); + (void) KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + (void) KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); // print actions - (void) KStdAction::print( this, TQT_SLOT( filePrint() ), actionCollection() ); - (void) KStdAction::printPreview( this, TQT_SLOT( filePrintPreview() ), actionCollection() ); + (void) KStdAction::print( this, TQ_SLOT( filePrint() ), actionCollection() ); + (void) KStdAction::printPreview( this, TQ_SLOT( filePrintPreview() ), actionCollection() ); // selection actions aSelectAll = KStdAction::selectAll( - this, TQT_SLOT( slotSelectAll() ), actionCollection() ); + this, TQ_SLOT( slotSelectAll() ), actionCollection() ); aDeselectAll = KStdAction::deselect( - this, TQT_SLOT( slotDeselectAll() ), actionCollection() ); + this, TQ_SLOT( slotDeselectAll() ), actionCollection() ); aInvertSelection = new TDEAction( i18n( "Invert Selection" ), "", 0, this, - TQT_SLOT( slotInvertSelection() ), actionCollection(), + TQ_SLOT( slotInvertSelection() ), actionCollection(), "edit_invert_selection" ); // we need icons... @@ -229,46 +229,46 @@ void KigPart::setupActions() aDeleteObjects = new TDEAction( i18n("&Delete Objects"), "edit-delete", Key_Delete, this, - TQT_SLOT(deleteObjects()), actionCollection(), "delete_objects"); + TQ_SLOT(deleteObjects()), actionCollection(), "delete_objects"); aDeleteObjects->setToolTip(i18n("Delete the selected objects")); aCancelConstruction = new TDEAction( i18n("Cancel Construction"), "process-stop", Key_Escape, this, - TQT_SLOT(cancelConstruction()), actionCollection(), "cancel_construction"); + TQ_SLOT(cancelConstruction()), actionCollection(), "cancel_construction"); aCancelConstruction->setToolTip( i18n("Cancel the construction of the object being constructed")); aCancelConstruction->setEnabled(false); aShowHidden = new TDEAction( - i18n("U&nhide All"), 0, this, TQT_SLOT( showHidden() ), + i18n("U&nhide All"), 0, this, TQ_SLOT( showHidden() ), actionCollection(), "edit_unhide_all"); aShowHidden->setToolTip(i18n("Show all hidden objects")); aShowHidden->setEnabled( true ); aNewMacro = new TDEAction( - i18n("&New Macro..."), "gear", 0, this, TQT_SLOT(newMacro()), + i18n("&New Macro..."), "gear", 0, this, TQ_SLOT(newMacro()), actionCollection(), "macro_action"); aNewMacro->setToolTip(i18n("Define a new macro")); aConfigureTypes = new TDEAction( - i18n("Manage &Types..."), 0, this, TQT_SLOT(editTypes()), + i18n("Manage &Types..."), 0, this, TQ_SLOT(editTypes()), actionCollection(), "types_edit"); aConfigureTypes->setToolTip(i18n("Manage macro types.")); KigExportManager::instance()->addMenuAction( this, m_widget->realWidget(), actionCollection() ); - TDEAction* a = KStdAction::zoomIn( m_widget, TQT_SLOT( slotZoomIn() ), + TDEAction* a = KStdAction::zoomIn( m_widget, TQ_SLOT( slotZoomIn() ), actionCollection() ); a->setToolTip( i18n( "Zoom in on the document" ) ); a->setWhatsThis( i18n( "Zoom in on the document" ) ); - a = KStdAction::zoomOut( m_widget, TQT_SLOT( slotZoomOut() ), + a = KStdAction::zoomOut( m_widget, TQ_SLOT( slotZoomOut() ), actionCollection() ); a->setToolTip( i18n( "Zoom out of the document" ) ); a->setWhatsThis( i18n( "Zoom out of the document" ) ); - a = KStdAction::fitToPage( m_widget, TQT_SLOT( slotRecenterScreen() ), + a = KStdAction::fitToPage( m_widget, TQ_SLOT( slotRecenterScreen() ), actionCollection() ); // grr.. why isn't there an icon for this.. a->setIconSet( TQIconSet( l->loadIcon( "view_fit_to_page", TDEIcon::Toolbar ) ) ); @@ -281,12 +281,12 @@ void KigPart::setupActions() #endif #endif #ifdef KIG_PART_CPP_STD_FULLSCREEN_ACTION - a = KStdAction::fullScreen( m_widget, TQT_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->parent()),"fullscreen" ); + a = KStdAction::fullScreen( m_widget, TQ_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->parent()),"fullscreen" ); #else tmp = l->loadIcon( "view-fullscreen", TDEIcon::Toolbar ); a = new TDEAction( i18n( "Full Screen" ), tmp, CTRL+SHIFT+Key_F, - m_widget, TQT_SLOT( toggleFullScreen() ), + m_widget, TQ_SLOT( toggleFullScreen() ), actionCollection(), "fullscreen" ); #endif a->setToolTip( i18n( "View this document full-screen." ) ); @@ -294,31 +294,31 @@ void KigPart::setupActions() // TODO: an icon for this.. a = new TDEAction( - i18n( "&Select Shown Area" ), "zoom-fit-best", 0, m_widget, TQT_SLOT( zoomRect() ), + i18n( "&Select Shown Area" ), "zoom-fit-best", 0, m_widget, TQ_SLOT( zoomRect() ), actionCollection(), "view_select_shown_rect" ); a->setToolTip( i18n( "Select the area that you want to be shown in the window." ) ); a->setWhatsThis( i18n( "Select the area that you want to be shown in the window." ) ); a = new TDEAction( - i18n( "S&elect Zoom Area" ), "viewmag", 0, m_widget, TQT_SLOT( zoomArea() ), + i18n( "S&elect Zoom Area" ), "viewmag", 0, m_widget, TQ_SLOT( zoomArea() ), actionCollection(), "view_zoom_area" ); // a->setToolTip( i18n( "Select the area that you want to be shown in the window." ) ); // a->setWhatsThis( i18n( "Select the area that you want to be shown in the window." ) ); aToggleGrid = new TDEToggleAction( - i18n( "Show &Grid" ), 0, this, TQT_SLOT( toggleGrid() ), + i18n( "Show &Grid" ), 0, this, TQ_SLOT( toggleGrid() ), actionCollection(), "settings_show_grid" ); aToggleGrid->setToolTip( i18n( "Show or hide the grid." ) ); aToggleGrid->setChecked( true ); aToggleAxes = new TDEToggleAction( - i18n( "Show &Axes" ), 0, this, TQT_SLOT( toggleAxes() ), + i18n( "Show &Axes" ), 0, this, TQ_SLOT( toggleAxes() ), actionCollection(), "settings_show_axes" ); aToggleAxes->setToolTip( i18n( "Show or hide the axes." ) ); aToggleAxes->setChecked( true ); aToggleNightVision = new TDEToggleAction( - i18n( "Wear Infrared Glasses" ), 0, this, TQT_SLOT( toggleNightVision() ), + i18n( "Wear Infrared Glasses" ), 0, this, TQ_SLOT( toggleNightVision() ), actionCollection(), "settings_toggle_nightvision" ); aToggleNightVision->setToolTip( i18n( "Enable/Disable hidden objects visibility." ) ); aToggleNightVision->setChecked( false ); @@ -716,7 +716,7 @@ void KigPart::setupMacroTypes() }; // hack: we need to plug the action lists _after_ the gui is // built.. i can't find a better solution than this... - TQTimer::singleShot( 0, this, TQT_SLOT( plugActionLists() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( plugActionLists() ) ); } void KigPart::setupBuiltinMacros() diff --git a/kig/kig/kig_view.cpp b/kig/kig/kig_view.cpp index c642a84f..b9f64590 100644 --- a/kig/kig/kig_view.cpp +++ b/kig/kig/kig_view.cpp @@ -294,21 +294,21 @@ KigView::KigView( KigPart* part, mupdatingscrollbars( false ), mrealwidget( 0 ), mpart( part ) { - connect( part, TQT_SIGNAL( recenterScreen() ), this, TQT_SLOT( slotInternalRecenterScreen() ) ); + connect( part, TQ_SIGNAL( recenterScreen() ), this, TQ_SLOT( slotInternalRecenterScreen() ) ); mlayout = new TQGridLayout( this, 2, 2 ); mrightscroll = new TQScrollBar(TQt::Vertical, this, "Right Scrollbar" ); // TODO: make this configurable... mrightscroll->setTracking( true ); - connect( mrightscroll, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotRightScrollValueChanged( int ) ) ); - connect( mrightscroll, TQT_SIGNAL( sliderReleased() ), - this, TQT_SLOT( updateScrollBars() ) ); + connect( mrightscroll, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotRightScrollValueChanged( int ) ) ); + connect( mrightscroll, TQ_SIGNAL( sliderReleased() ), + this, TQ_SLOT( updateScrollBars() ) ); mbottomscroll = new TQScrollBar(TQt::Horizontal, this, "Bottom Scrollbar" ); - connect( mbottomscroll, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotBottomScrollValueChanged( int ) ) ); - connect( mbottomscroll, TQT_SIGNAL( sliderReleased() ), - this, TQT_SLOT( updateScrollBars() ) ); + connect( mbottomscroll, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotBottomScrollValueChanged( int ) ) ); + connect( mbottomscroll, TQ_SIGNAL( sliderReleased() ), + this, TQ_SLOT( updateScrollBars() ) ); mrealwidget = new KigWidget( part, this, this, "Kig Widget", fullscreen ); mlayout->addWidget( mbottomscroll, 1, 0 ); mlayout->addWidget( mrealwidget, 0, 0 ); diff --git a/kig/misc/kiginputdialog.cpp b/kig/misc/kiginputdialog.cpp index 0462cb10..24c659cf 100644 --- a/kig/misc/kiginputdialog.cpp +++ b/kig/misc/kiginputdialog.cpp @@ -98,8 +98,8 @@ KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label, } mainlay->addWidget( d->m_lineEditFirst ); - connect( d->m_lineEditFirst, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotCoordsChanged(const TQString&)) ); + connect( d->m_lineEditFirst, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotCoordsChanged(const TQString&)) ); if ( d->m_coord2.valid() ) { @@ -108,8 +108,8 @@ KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label, d->m_lineEditSecond->setText( d->m_doc.coordinateSystem().fromScreen( d->m_coord2, d->m_doc ) ); mainlay->addWidget( d->m_lineEditSecond ); - connect( d->m_lineEditSecond, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotCoordsChanged(const TQString&)) ); + connect( d->m_lineEditSecond, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotCoordsChanged(const TQString&)) ); deltay += d->m_lineEditSecond->height() + spacingHint(); } @@ -159,10 +159,10 @@ KigInputDialog::KigInputDialog( TQWidget* parent, const Goniometry& g ) mainlay->addLayout( horlay ); - connect( d->m_lineEditFirst, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotGonioTextChanged(const TQString&)) ); - connect( d->m_comboBox, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotGonioSystemChanged(int)) ); + connect( d->m_lineEditFirst, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotGonioTextChanged(const TQString&)) ); + connect( d->m_comboBox, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotGonioSystemChanged(int)) ); resize( 350, 100 ); diff --git a/kig/modes/linkslabel.cpp b/kig/modes/linkslabel.cpp index 6d9c2f2f..a9d0fa59 100644 --- a/kig/modes/linkslabel.cpp +++ b/kig/modes/linkslabel.cpp @@ -112,7 +112,7 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf ) i->second, this ); p->urllabels.push_back( l ); p->layout->addWidget( l ); - connect( l, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( urlClicked() ) ); + connect( l, TQ_SIGNAL( leftClickedURL() ), TQ_SLOT( urlClicked() ) ); } else { diff --git a/kig/modes/macrowizard.cpp b/kig/modes/macrowizard.cpp index c6b8f36c..e4c02aa0 100644 --- a/kig/modes/macrowizard.cpp +++ b/kig/modes/macrowizard.cpp @@ -27,10 +27,10 @@ MacroWizard::MacroWizard( TQWidget* parent, DefineMacroMode* m ) : MacroWizardBase( parent, "Define Macro Wizard", false ), mmode( m ) { - connect( KLineEdit2, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( nameTextChanged( const TQString& ) ) ); - connect( this, TQT_SIGNAL( helpClicked() ), this, - TQT_SLOT( slotHelpClicked() ) ); + connect( KLineEdit2, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( nameTextChanged( const TQString& ) ) ); + connect( this, TQ_SIGNAL( helpClicked() ), this, + TQ_SLOT( slotHelpClicked() ) ); } MacroWizard::~MacroWizard() diff --git a/kig/modes/popup.cpp b/kig/modes/popup.cpp index a9c74915..0a7e0265 100644 --- a/kig/modes/popup.cpp +++ b/kig/modes/popup.cpp @@ -190,7 +190,7 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part, { bool empty = objs.empty(); bool single = objs.size() == 1; - connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( toplevelMenuSlot( int ) ) ); + connect( this, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( toplevelMenuSlot( int ) ) ); TQString title; if ( empty ) @@ -246,24 +246,24 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part, for ( uint i = 0; i < NumberOfMenus; ++i ) mmenus[i] = new TQPopupMenu( this ); - connect( mmenus[TransformMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( transformMenuSlot( int ) ) ); - connect( mmenus[TestMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( testMenuSlot( int ) ) ); - connect( mmenus[ConstructMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( constructMenuSlot( int ) ) ); - connect( mmenus[StartMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( startMenuSlot( int ) ) ); - connect( mmenus[ShowMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( showMenuSlot( int ) ) ); - connect( mmenus[SetColorMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setColorMenuSlot( int ) ) ); - connect( mmenus[SetSizeMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setSizeMenuSlot( int ) ) ); - connect( mmenus[SetStyleMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setStyleMenuSlot( int ) ) ); - connect( mmenus[SetCoordinateSystemMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setCoordinateSystemMenuSlot( int ) ) ); + connect( mmenus[TransformMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( transformMenuSlot( int ) ) ); + connect( mmenus[TestMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( testMenuSlot( int ) ) ); + connect( mmenus[ConstructMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( constructMenuSlot( int ) ) ); + connect( mmenus[StartMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( startMenuSlot( int ) ) ); + connect( mmenus[ShowMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( showMenuSlot( int ) ) ); + connect( mmenus[SetColorMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setColorMenuSlot( int ) ) ); + connect( mmenus[SetSizeMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setSizeMenuSlot( int ) ) ); + connect( mmenus[SetStyleMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setStyleMenuSlot( int ) ) ); + connect( mmenus[SetCoordinateSystemMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setCoordinateSystemMenuSlot( int ) ) ); for ( int i = 0; i <= NumberOfMenus; ++i ) { @@ -1187,7 +1187,7 @@ ObjectChooserPopup::ObjectChooserPopup( const TQPoint& p, KigWidget& view, i ); } - connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( actionActivatedSlot( int ) ) ); + connect( this, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( actionActivatedSlot( int ) ) ); } ObjectChooserPopup::~ObjectChooserPopup() diff --git a/kig/modes/textlabelwizard.cpp b/kig/modes/textlabelwizard.cpp index c92068de..84d86adb 100644 --- a/kig/modes/textlabelwizard.cpp +++ b/kig/modes/textlabelwizard.cpp @@ -29,12 +29,12 @@ TextLabelWizard::TextLabelWizard( TQWidget* parent, TextLabelModeBase* mode ) : TextLabelWizardBase( parent, "TextLabelWizard", false ), mmode( mode ) { - connect( labelTextInput, TQT_SIGNAL( textChanged() ), - TQT_SLOT( textChanged() ) ); - connect( myCustomWidget1, TQT_SIGNAL( linkClicked( int ) ), - TQT_SLOT( linkClicked( int ) ) ); - connect( this, TQT_SIGNAL( helpClicked() ), - this, TQT_SLOT( slotHelpClicked() ) ); + connect( labelTextInput, TQ_SIGNAL( textChanged() ), + TQ_SLOT( textChanged() ) ); + connect( myCustomWidget1, TQ_SIGNAL( linkClicked( int ) ), + TQ_SLOT( linkClicked( int ) ) ); + connect( this, TQ_SIGNAL( helpClicked() ), + this, TQ_SLOT( slotHelpClicked() ) ); labelTextInput->setFocus(); } diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp index d8219308..2c1235df 100644 --- a/kig/modes/typesdialog.cpp +++ b/kig/modes/typesdialog.cpp @@ -81,10 +81,10 @@ TypesDialog::TypesDialog( TQWidget* parent, KigPart& part ) loadAllMacros(); popup = new TQPopupMenu( this ); - popup->insertItem( SmallIcon( "edit" ), i18n( "&Edit..." ), this, TQT_SLOT( editType() ) ); - popup->insertItem( SmallIcon( "edit-delete" ), i18n( "&Delete" ), this, TQT_SLOT( deleteType() ) ); + popup->insertItem( SmallIcon( "edit" ), i18n( "&Edit..." ), this, TQ_SLOT( editType() ) ); + popup->insertItem( SmallIcon( "edit-delete" ), i18n( "&Delete" ), this, TQ_SLOT( deleteType() ) ); popup->insertSeparator(); - popup->insertItem( SmallIcon( "fileexport" ), i18n( "E&xport..." ), this, TQT_SLOT( exportType() ) ); + popup->insertItem( SmallIcon( "fileexport" ), i18n( "E&xport..." ), this, TQ_SLOT( exportType() ) ); // saving types part.saveTypes(); diff --git a/kig/scripting/newscriptwizard.cpp b/kig/scripting/newscriptwizard.cpp index ecc157ba..12c27e51 100644 --- a/kig/scripting/newscriptwizard.cpp +++ b/kig/scripting/newscriptwizard.cpp @@ -97,11 +97,11 @@ NewScriptWizard::NewScriptWizard( TQWidget* parent, ScriptModeBase* mode ) TDEPopupMenu* pm = new TDEPopupMenu( editor ); // creating the actions for the code editor... TDEActionCollection* ac = new TDEActionCollection( editor ); - TDEAction* undoAction = KStdAction::undo( this, TQT_SLOT( slotUndo() ), ac ); - TDEAction* redoAction = KStdAction::redo( this, TQT_SLOT( slotRedo() ), ac ); - TDEAction* cutAction = KStdAction::cut( this, TQT_SLOT( slotCut() ), ac ); - TDEAction* copyAction = KStdAction::copy( this, TQT_SLOT( slotCopy() ), ac ); - TDEAction* pasteAction = KStdAction::paste( this, TQT_SLOT( slotPaste() ), ac ); + TDEAction* undoAction = KStdAction::undo( this, TQ_SLOT( slotUndo() ), ac ); + TDEAction* redoAction = KStdAction::redo( this, TQ_SLOT( slotRedo() ), ac ); + TDEAction* cutAction = KStdAction::cut( this, TQ_SLOT( slotCut() ), ac ); + TDEAction* copyAction = KStdAction::copy( this, TQ_SLOT( slotCopy() ), ac ); + TDEAction* pasteAction = KStdAction::paste( this, TQ_SLOT( slotPaste() ), ac ); // ... and plugging them into the popup menu (to build it, of course :) ) undoAction->plug( pm ); redoAction->plug( pm ); @@ -114,7 +114,7 @@ NewScriptWizard::NewScriptWizard( TQWidget* parent, ScriptModeBase* mode ) dynamic_cast<KTextEditor::PopupMenuInterface*>( editor )->installPopup( pm ); } - connect( this, TQT_SIGNAL( helpClicked() ), this, TQT_SLOT( slotHelpClicked() ) ); + connect( this, TQ_SIGNAL( helpClicked() ), this, TQ_SLOT( slotHelpClicked() ) ); } void NewScriptWizard::back() diff --git a/kiten/configdictionaries.cpp b/kiten/configdictionaries.cpp index c7edcc80..b1f7fcce 100644 --- a/kiten/configdictionaries.cpp +++ b/kiten/configdictionaries.cpp @@ -31,10 +31,10 @@ ConfigDictionaries::ConfigDictionaries(TQWidget *parent, const char* name, WFlag { changed = false; config = Config::self(); - connect(delSelEdictButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelSelEdict())); - connect(addEdictButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddEdict())); - connect(delSelKanjidicButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelSelKanjidic())); - connect(addKanjidicButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddKanjidic())); + connect(delSelEdictButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDelSelEdict())); + connect(addEdictButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddEdict())); + connect(delSelKanjidicButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDelSelKanjidic())); + connect(addKanjidicButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddKanjidic())); } void ConfigDictionaries::updateWidgets() diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp index daaee931..781f684b 100644 --- a/kiten/kiten.cpp +++ b/kiten/kiten.cpp @@ -55,42 +55,42 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) : TDEMainWindow(parent, n config = Config::self(); config->readConfig(); Accel = new TDEGlobalAccel(this); - (void) Accel->insert("Lookup Kanji (Kanjidic)", i18n("Lookup Kanji (Kanjidic)"), i18n("Gives detailed information about Kanji currently on clipboard."), CTRL + ALT + Key_K, CTRL + ALT + Key_K, this, TQT_SLOT(kanjiSearchAccel())); - (void) Accel->insert("Lookup English/Japanese word", i18n("Lookup English/Japanese Word"), i18n("Looks up current text on clipboard in the same way as if you used Kiten's regular search."), CTRL + ALT + Key_S, CTRL + ALT + Key_S, this, TQT_SLOT(searchAccel())); + (void) Accel->insert("Lookup Kanji (Kanjidic)", i18n("Lookup Kanji (Kanjidic)"), i18n("Gives detailed information about Kanji currently on clipboard."), CTRL + ALT + Key_K, CTRL + ALT + Key_K, this, TQ_SLOT(kanjiSearchAccel())); + (void) Accel->insert("Lookup English/Japanese word", i18n("Lookup English/Japanese Word"), i18n("Looks up current text on clipboard in the same way as if you used Kiten's regular search."), CTRL + ALT + Key_S, CTRL + ALT + Key_S, this, TQ_SLOT(searchAccel())); Accel->readSettings(TDEGlobal::config()); Accel->updateConnections(); _ResultView = new ResultView(true, this, "_ResultView"); setCentralWidget(_ResultView); - (void) KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); - (void) KStdAction::print(this, TQT_SLOT(print()), actionCollection()); - (void) KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); - (void) new TDEAction(i18n("&Learn"), "pencil", CTRL+Key_L, this, TQT_SLOT(createLearn()), actionCollection(), "file_learn"); - (void) new TDEAction(i18n("&Dictionary Editor..."), "edit", 0, this, TQT_SLOT(createEEdit()), actionCollection(), "dict_editor"); - (void) new TDEAction(i18n("Ra&dical Search..."), "gear", CTRL+Key_R, this, TQT_SLOT(radicalSearch()), actionCollection(), "search_radical"); - Edit = new EditAction(i18n("Search Edit"), 0, this, TQT_SLOT(search()), actionCollection(), "search_edit"); - (void) new TDEAction(i18n("&Clear Search Bar"), BarIcon("locationbar_erase", 16), CTRL+Key_N, Edit, TQT_SLOT(clear()), actionCollection(), "clear_search"); - (void) new TDEAction(i18n("S&earch"), "key_enter", 0, this, TQT_SLOT(search()), actionCollection(), "search"); - (void) new TDEAction(i18n("Search with &Beginning of Word"), 0, this, TQT_SLOT(searchBeginning()), actionCollection(), "search_beginning"); - (void) new TDEAction(i18n("Search &Anywhere"), 0, this, TQT_SLOT(searchAnywhere()), actionCollection(), "search_anywhere"); - (void) new TDEAction(i18n("Stro&kes"), "paintbrush", CTRL+Key_S, this, TQT_SLOT(strokeSearch()), actionCollection(), "search_stroke"); - (void) new TDEAction(i18n("&Grade"), "format-justify-left", CTRL+Key_G, this, TQT_SLOT(gradeSearch()), actionCollection(), "search_grade"); - kanjiCB = new TDEToggleAction(i18n("&Kanjidic"), "kanjidic", CTRL+Key_K, this, TQT_SLOT(kanjiDictChange()), actionCollection(), "kanji_toggle"); - deinfCB = new TDEToggleAction(i18n("&Deinflect Verbs in Regular Search"), 0, this, TQT_SLOT(kanjiDictChange()), actionCollection(), "deinf_toggle"); - comCB = new TDEToggleAction(i18n("&Filter Rare"), "filter", CTRL+Key_F, this, TQT_SLOT(toggleCom()), actionCollection(), "common"); - autoSearchToggle = new TDEToggleAction(i18n("&Automatically Search Clipboard Selections"), "edit-find", 0, this, TQT_SLOT(kanjiDictChange()), actionCollection(), "autosearch_toggle"); - irAction = new TDEAction(i18n("Search &in Results"), "edit-find", CTRL+Key_I, this, TQT_SLOT(resultSearch()), actionCollection(), "search_in_results"); - (void) KStdAction::configureToolbars(this, TQT_SLOT(configureToolBars()), actionCollection()); - addAction = new TDEAction(i18n("Add &Kanji to Learning List"), 0, this, TQT_SLOT(addToList()), actionCollection(), "add"); + (void) KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); + (void) KStdAction::print(this, TQ_SLOT(print()), actionCollection()); + (void) KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actionCollection()); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); + (void) new TDEAction(i18n("&Learn"), "pencil", CTRL+Key_L, this, TQ_SLOT(createLearn()), actionCollection(), "file_learn"); + (void) new TDEAction(i18n("&Dictionary Editor..."), "edit", 0, this, TQ_SLOT(createEEdit()), actionCollection(), "dict_editor"); + (void) new TDEAction(i18n("Ra&dical Search..."), "gear", CTRL+Key_R, this, TQ_SLOT(radicalSearch()), actionCollection(), "search_radical"); + Edit = new EditAction(i18n("Search Edit"), 0, this, TQ_SLOT(search()), actionCollection(), "search_edit"); + (void) new TDEAction(i18n("&Clear Search Bar"), BarIcon("locationbar_erase", 16), CTRL+Key_N, Edit, TQ_SLOT(clear()), actionCollection(), "clear_search"); + (void) new TDEAction(i18n("S&earch"), "key_enter", 0, this, TQ_SLOT(search()), actionCollection(), "search"); + (void) new TDEAction(i18n("Search with &Beginning of Word"), 0, this, TQ_SLOT(searchBeginning()), actionCollection(), "search_beginning"); + (void) new TDEAction(i18n("Search &Anywhere"), 0, this, TQ_SLOT(searchAnywhere()), actionCollection(), "search_anywhere"); + (void) new TDEAction(i18n("Stro&kes"), "paintbrush", CTRL+Key_S, this, TQ_SLOT(strokeSearch()), actionCollection(), "search_stroke"); + (void) new TDEAction(i18n("&Grade"), "format-justify-left", CTRL+Key_G, this, TQ_SLOT(gradeSearch()), actionCollection(), "search_grade"); + kanjiCB = new TDEToggleAction(i18n("&Kanjidic"), "kanjidic", CTRL+Key_K, this, TQ_SLOT(kanjiDictChange()), actionCollection(), "kanji_toggle"); + deinfCB = new TDEToggleAction(i18n("&Deinflect Verbs in Regular Search"), 0, this, TQ_SLOT(kanjiDictChange()), actionCollection(), "deinf_toggle"); + comCB = new TDEToggleAction(i18n("&Filter Rare"), "filter", CTRL+Key_F, this, TQ_SLOT(toggleCom()), actionCollection(), "common"); + autoSearchToggle = new TDEToggleAction(i18n("&Automatically Search Clipboard Selections"), "edit-find", 0, this, TQ_SLOT(kanjiDictChange()), actionCollection(), "autosearch_toggle"); + irAction = new TDEAction(i18n("Search &in Results"), "edit-find", CTRL+Key_I, this, TQ_SLOT(resultSearch()), actionCollection(), "search_in_results"); + (void) KStdAction::configureToolbars(this, TQ_SLOT(configureToolBars()), actionCollection()); + addAction = new TDEAction(i18n("Add &Kanji to Learning List"), 0, this, TQ_SLOT(addToList()), actionCollection(), "add"); addAction->setEnabled(false); - (void) new TDEAction(i18n("Configure &Global Shortcuts..."), "configure_shortcuts", 0, this, TQT_SLOT(configureGlobalKeys()), actionCollection(), "options_configure_keybinding"); + (void) new TDEAction(i18n("Configure &Global Shortcuts..."), "configure_shortcuts", 0, this, TQ_SLOT(configureGlobalKeys()), actionCollection(), "options_configure_keybinding"); historyAction = new TDEListAction(i18n("&History"), 0, 0, 0, actionCollection(), "history"); - connect(historyAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(goInHistory(int))); - backAction = KStdAction::back(this, TQT_SLOT(back()), actionCollection()); - forwardAction = KStdAction::forward(this, TQT_SLOT(forward()), actionCollection()); + connect(historyAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(goInHistory(int))); + backAction = KStdAction::back(this, TQ_SLOT(back()), actionCollection()); + forwardAction = KStdAction::forward(this, TQ_SLOT(forward()), actionCollection()); backAction->setEnabled(false); forwardAction->setEnabled(false); currentResult = resultHistory.end(); @@ -114,10 +114,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) : TDEMainWindow(parent, n resize(600, 400); applyMainWindowSettings(TDEGlobal::config(), "TopLevelWindow"); - connect(_ResultView, TQT_SIGNAL(linkClicked(const TQString &)), TQT_SLOT(ressearch(const TQString &))); - connect(kapp->clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(autoSearch())); + connect(_ResultView, TQ_SIGNAL(linkClicked(const TQString &)), TQ_SLOT(ressearch(const TQString &))); + connect(kapp->clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(autoSearch())); - TQTimer::singleShot(10, this, TQT_SLOT(finishInit())); + TQTimer::singleShot(10, this, TQ_SLOT(finishInit())); } TopLevel::~TopLevel() @@ -609,9 +609,9 @@ void TopLevel::slotConfigure() //ConfigureDialog didn't find an instance of this dialog, so lets create it : optionDialog = new ConfigureDialog(this, "settings"); - connect(optionDialog, TQT_SIGNAL(hidden()),this,TQT_SLOT(slotConfigureHide())); - connect(optionDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotConfigurationChanged())); - connect(optionDialog, TQT_SIGNAL(valueChanged()), this, TQT_SIGNAL(quizConfChanged())); + connect(optionDialog, TQ_SIGNAL(hidden()),this,TQ_SLOT(slotConfigureHide())); + connect(optionDialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotConfigurationChanged())); + connect(optionDialog, TQ_SIGNAL(valueChanged()), this, TQ_SIGNAL(quizConfChanged())); optionDialog->show(); return; @@ -625,7 +625,7 @@ void TopLevel::slotLearnConfigure() void TopLevel::slotConfigureHide() { - TQTimer::singleShot(0, this, TQT_SLOT(slotConfigureDestroy())); + TQTimer::singleShot(0, this, TQ_SLOT(slotConfigureDestroy())); } void TopLevel::slotConfigureDestroy() @@ -641,11 +641,11 @@ void TopLevel::createLearn() { Learn *_Learn = new Learn(_Asyndeta.retrieveIndex(), 0); - connect(_Learn, TQT_SIGNAL(destroyed(Learn *)), this, TQT_SLOT(learnDestroyed(Learn *))); - connect(_Learn, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(ressearch(const TQString &))); - connect(_Learn, TQT_SIGNAL(configureLearn()), this, TQT_SLOT(slotLearnConfigure())); - connect(this, TQT_SIGNAL(quizConfChanged()), _Learn, TQT_SLOT(updateQuizConfiguration())); - connect(this, TQT_SIGNAL(add(Dict::Entry)), _Learn, TQT_SLOT(add(Dict::Entry))); + connect(_Learn, TQ_SIGNAL(destroyed(Learn *)), this, TQ_SLOT(learnDestroyed(Learn *))); + connect(_Learn, TQ_SIGNAL(linkClicked(const TQString &)), this, TQ_SLOT(ressearch(const TQString &))); + connect(_Learn, TQ_SIGNAL(configureLearn()), this, TQ_SLOT(slotLearnConfigure())); + connect(this, TQ_SIGNAL(quizConfChanged()), _Learn, TQ_SLOT(updateQuizConfiguration())); + connect(this, TQ_SIGNAL(add(Dict::Entry)), _Learn, TQ_SLOT(add(Dict::Entry))); learnList.append(_Learn); @@ -730,7 +730,7 @@ void TopLevel::configureToolBars() { saveMainWindowSettings(TDEGlobal::config(), "TopLevelWindow"); KEditToolbar dlg(actionCollection(), "kitenui.rc"); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(newToolBarConfig())); dlg.exec(); } @@ -743,7 +743,7 @@ void TopLevel::newToolBarConfig() RadWidget *TopLevel::radicalSearch() { RadWidget *rw = new RadWidget(&_Rad, 0, "rw"); - connect(rw, TQT_SIGNAL(set(const TQStringList &, unsigned int, unsigned int)), this, TQT_SLOT(radSearch(const TQStringList &, unsigned int, unsigned int))); + connect(rw, TQ_SIGNAL(set(const TQStringList &, unsigned int, unsigned int)), this, TQ_SLOT(radSearch(const TQStringList &, unsigned int, unsigned int))); rw->show(); return rw; } diff --git a/kiten/kromajiedit.cpp b/kiten/kromajiedit.cpp index 6eda1d32..ceaa7a23 100644 --- a/kiten/kromajiedit.cpp +++ b/kiten/kromajiedit.cpp @@ -265,7 +265,7 @@ TQPopupMenu *KRomajiEdit::createPopupMenu() else if (kana == "hiragana") popup->setItemChecked(1, true); - connect(popup, TQT_SIGNAL(activated(int)), TQT_SLOT(setKana(int))); + connect(popup, TQ_SIGNAL(activated(int)), TQ_SLOT(setKana(int))); emit aboutToShowContextMenu(popup); return popup; diff --git a/kiten/learn.cpp b/kiten/learn.cpp index 0d42f89d..c9c58435 100644 --- a/kiten/learn.cpp +++ b/kiten/learn.cpp @@ -70,7 +70,7 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name) TQVBoxLayout *veryTop = new TQVBoxLayout(dummy, 0, KDialog::spacingHint()); Tabs = new TQTabWidget(dummy); - connect(Tabs, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SLOT(tabChanged(TQWidget *))); + connect(Tabs, TQ_SIGNAL(currentChanged(TQWidget *)), TQ_SLOT(tabChanged(TQWidget *))); veryTop->addWidget(Tabs); listTop = new TQSplitter(Tabs); @@ -81,7 +81,7 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name) View = new ResultView(true, listTop, "View"); View->setBasicMode(true); - connect(View, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SIGNAL(linkClicked(const TQString &))); + connect(View, TQ_SIGNAL(linkClicked(const TQString &)), this, TQ_SIGNAL(linkClicked(const TQString &))); List = new TDEListView(listTop); @@ -101,8 +101,8 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name) List->setSorting(4); List->setSelectionModeExt(TDEListView::Extended); - connect(List, TQT_SIGNAL(executed(TQListViewItem *)), TQT_SLOT(showKanji(TQListViewItem *))); - connect(List, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(itemSelectionChanged())); + connect(List, TQ_SIGNAL(executed(TQListViewItem *)), TQ_SLOT(showKanji(TQListViewItem *))); + connect(List, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(itemSelectionChanged())); TQStringList grades(i18n("Grade 1")); grades.append(i18n("Grade 2")); @@ -113,25 +113,25 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name) grades.append(i18n("Others in Jouyou")); grades.append(i18n("Jinmeiyou")); - /*TDEAction *closeAction = */(void) KStdAction::close(this, TQT_SLOT(close()), actionCollection()); - printAct = KStdAction::print(this, TQT_SLOT(print()), actionCollection()); - forwardAct = KStdAction::forward(this, TQT_SLOT(next()), actionCollection()); + /*TDEAction *closeAction = */(void) KStdAction::close(this, TQ_SLOT(close()), actionCollection()); + printAct = KStdAction::print(this, TQ_SLOT(print()), actionCollection()); + forwardAct = KStdAction::forward(this, TQ_SLOT(next()), actionCollection()); forwardAct->plug(toolBar()); - backAct = KStdAction::back(this, TQT_SLOT(prev()), actionCollection()); + backAct = KStdAction::back(this, TQ_SLOT(prev()), actionCollection()); backAct->plug(toolBar()); - cheatAct = new TDEAction(i18n("&Cheat"), CTRL + Key_C, this, TQT_SLOT(cheat()), actionCollection(), "cheat"); - randomAct = new TDEAction(i18n("&Random"), "goto", CTRL + Key_R, this, TQT_SLOT(random()), actionCollection(), "random"); + cheatAct = new TDEAction(i18n("&Cheat"), CTRL + Key_C, this, TQ_SLOT(cheat()), actionCollection(), "cheat"); + randomAct = new TDEAction(i18n("&Random"), "goto", CTRL + Key_R, this, TQ_SLOT(random()), actionCollection(), "random"); gradeAct = new TDEListAction(i18n("Grade"), 0, 0, 0, actionCollection(), "grade"); gradeAct->setItems(grades); - connect(gradeAct, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(updateGrade())); - removeAct = new TDEAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, this, TQT_SLOT(del()), actionCollection(), "del"); - addAct = new TDEAction(i18n("&Add"), "edit_add", CTRL + Key_A, this, TQT_SLOT(add()), actionCollection(), "add"); - addAllAct = new TDEAction(i18n("Add A&ll"), 0, this, TQT_SLOT(addAll()), actionCollection(), "addall"); - newAct = KStdAction::openNew(this, TQT_SLOT(openNew()), actionCollection()); - openAct = KStdAction::open(this, TQT_SLOT(open()), actionCollection()); - saveAct = KStdAction::save(this, TQT_SLOT(save()), actionCollection()); - saveAsAct = KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection()); - (void) KStdAction::preferences(this, TQT_SIGNAL(configureLearn()), actionCollection()); + connect(gradeAct, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(updateGrade())); + removeAct = new TDEAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, this, TQ_SLOT(del()), actionCollection(), "del"); + addAct = new TDEAction(i18n("&Add"), "edit_add", CTRL + Key_A, this, TQ_SLOT(add()), actionCollection(), "add"); + addAllAct = new TDEAction(i18n("Add A&ll"), 0, this, TQ_SLOT(addAll()), actionCollection(), "addall"); + newAct = KStdAction::openNew(this, TQ_SLOT(openNew()), actionCollection()); + openAct = KStdAction::open(this, TQ_SLOT(open()), actionCollection()); + saveAct = KStdAction::save(this, TQ_SLOT(save()), actionCollection()); + saveAsAct = KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection()); + (void) KStdAction::preferences(this, TQ_SIGNAL(configureLearn()), actionCollection()); removeAct->setEnabled(false); @@ -140,7 +140,7 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name) quizLayout->addStretch(); TQHBoxLayout *hlayout = new TQHBoxLayout(quizLayout); qKanji = new TQPushButton(quizTop); - connect(qKanji, TQT_SIGNAL(clicked()), this, TQT_SLOT(qKanjiClicked())); + connect(qKanji, TQ_SIGNAL(clicked()), this, TQ_SLOT(qKanjiClicked())); hlayout->addStretch(); hlayout->addWidget(qKanji); hlayout->addStretch(); @@ -151,7 +151,7 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name) answers->insert(new KPushButton(answers), i); quizLayout->addWidget(answers); quizLayout->addStretch(); - connect(answers, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(answerClicked(int))); + connect(answers, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(answerClicked(int))); createGUI("learnui.rc"); //closeAction->plug(toolBar()); @@ -164,7 +164,7 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name) nogood = false; // this is so learn doesn't take so long to show itself - TQTimer::singleShot(200, this, TQT_SLOT(finishCtor())); + TQTimer::singleShot(200, this, TQ_SLOT(finishCtor())); } void Learn::finishCtor() diff --git a/kiten/optiondialog.cpp b/kiten/optiondialog.cpp index 0a3fba44..b9cc258d 100644 --- a/kiten/optiondialog.cpp +++ b/kiten/optiondialog.cpp @@ -43,7 +43,7 @@ ConfigureDialog::ConfigureDialog(TQWidget *parent, const char *name) : TDEConfigDialog(parent, name, Config::self()) { configDic = new ConfigDictionaries(0, "dictionaries_page"); - connect(configDic, TQT_SIGNAL(widgetChanged()), this, TQT_SLOT(updateButtons())); + connect(configDic, TQ_SIGNAL(widgetChanged()), this, TQ_SLOT(updateButtons())); addPage(configDic, i18n("Dictionaries"), "contents"); addPage(new ConfigSearching(0, "searching_page"), i18n("Searching"), "edit-find"); addPage(new ConfigLearn(0, "learn_page"), i18n("Learn"), "pencil"); diff --git a/kiten/rad.cpp b/kiten/rad.cpp index a39ea152..a77afd16 100644 --- a/kiten/rad.cpp +++ b/kiten/rad.cpp @@ -244,12 +244,12 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p hotlistGroup->insert(new KPushButton(*hotlist.at(i), hotlistGroup), i); } - connect(hotlistGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(hotlistClicked(int))); + connect(hotlistGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(hotlistClicked(int))); TQVBoxLayout *layout = new TQVBoxLayout(vlayout, KDialog::spacingHint()); totalStrokes = new TQCheckBox(i18n("Search by total strokes"), this); - connect(totalStrokes, TQT_SIGNAL(clicked()), this, TQT_SLOT(totalClicked())); + connect(totalStrokes, TQ_SIGNAL(clicked()), this, TQ_SLOT(totalClicked())); layout->addWidget(totalStrokes); TQHBoxLayout *strokesLayout = new TQHBoxLayout(layout, KDialog::spacingHint()); @@ -263,11 +263,11 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p ok = new KPushButton(i18n("&Look Up"), this); ok->setEnabled(false); - connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(apply())); + connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(apply())); layout->addWidget(ok); cancel = new KPushButton( KStdGuiItem::cancel(), this ); - connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(close())); + connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(close())); layout->addWidget(cancel); TQVBoxLayout *middlevLayout = new TQVBoxLayout(hlayout, KDialog::spacingHint()); @@ -278,22 +278,22 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p List = new TDEListBox(this); middlevLayout->addWidget(List); - connect(List, TQT_SIGNAL(executed(TQListBoxItem *)), this, TQT_SLOT(executed(TQListBoxItem *))); - connect(strokesSpin, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateList(int))); + connect(List, TQ_SIGNAL(executed(TQListBoxItem *)), this, TQ_SLOT(executed(TQListBoxItem *))); + connect(strokesSpin, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateList(int))); TQVBoxLayout *rightvlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint()); selectedList = new TDEListBox(this); rightvlayout->addWidget(selectedList); - connect(selectedList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); + connect(selectedList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(selectionChanged())); remove = new KPushButton(i18n("&Remove"), this); rightvlayout->addWidget(remove); - connect(remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeSelected())); + connect(remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeSelected())); remove->setEnabled(false); clear = new KPushButton(KStdGuiItem::clear(), this); rightvlayout->addWidget(clear); - connect(clear, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearSelected())); + connect(clear, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearSelected())); clear->setEnabled(false); setCaption(kapp->makeStdCaption(i18n("Radical Selector"))); diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp index 8c1d6ade..bbfbab6f 100644 --- a/kiten/widgets.cpp +++ b/kiten/widgets.cpp @@ -317,11 +317,11 @@ eEdit::eEdit(const TQString &_filename, TQWidget *parent, const char *name) List->setMultiSelection(true); List->setDragEnabled(true); - saveAct = KStdAction::save(this, TQT_SLOT(save()), actionCollection()); - removeAct = new TDEAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, this, TQT_SLOT(del()), actionCollection(), "del"); - (void) new TDEAction(i18n("&Disable Dictionary"), 0, this, TQT_SLOT(disable()), actionCollection(), "disable"); - addAct = new TDEAction(i18n("&Add"), "edit_add", CTRL + Key_A, this, TQT_SLOT(add()), actionCollection(), "add"); - (void) KStdAction::close(this, TQT_SLOT(close()), actionCollection()); + saveAct = KStdAction::save(this, TQ_SLOT(save()), actionCollection()); + removeAct = new TDEAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, this, TQ_SLOT(del()), actionCollection(), "del"); + (void) new TDEAction(i18n("&Disable Dictionary"), 0, this, TQ_SLOT(disable()), actionCollection(), "disable"); + addAct = new TDEAction(i18n("&Add"), "edit_add", CTRL + Key_A, this, TQ_SLOT(add()), actionCollection(), "add"); + (void) KStdAction::close(this, TQ_SLOT(close()), actionCollection()); createGUI("eeditui.rc"); //closeAction->plug(toolBar()); @@ -458,11 +458,11 @@ int EditAction::plug( TQWidget *w, int index ) KRomajiEdit *comboBox = new KRomajiEdit(toolBar, "search edit"); toolBar->insertWidget( id, 70, comboBox, index ); - connect( comboBox, TQT_SIGNAL( returnPressed()), m_receiver, m_member ); + connect( comboBox, TQ_SIGNAL( returnPressed()), m_receiver, m_member ); addContainer(toolBar, id); - connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( toolBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); toolBar->setItemAutoSized( id, true ); diff --git a/klatin/klatin/klatin.cpp b/klatin/klatin/klatin.cpp index f226b69d..3375603d 100644 --- a/klatin/klatin/klatin.cpp +++ b/klatin/klatin/klatin.cpp @@ -53,12 +53,12 @@ KLatin::~KLatin() void KLatin::setupActions() { // Setup various menu actions - KStdAction::preferences(this, TQT_SLOT(loadSettings()), actionCollection()); - m_loadVocab = new TDEAction(i18n("Load &Vocabulary"), 0, this, TQT_SLOT(loadVocab()), actionCollection(), "go_vocab"); - m_loadGrammar = new TDEAction(i18n("Load &Grammar"), 0, this, TQT_SLOT(loadGrammar()), actionCollection(), "go_grammar"); - m_loadVerbs = new TDEAction(i18n("Load V&erbs"), 0, this, TQT_SLOT(loadVerbs()), actionCollection(), "go_verbs"); - m_loadRevision = new TDEAction(i18n("Load &Revision"), 0, this, TQT_SLOT(loadRevision()), actionCollection(), "go_revision"); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(loadSettings()), actionCollection()); + m_loadVocab = new TDEAction(i18n("Load &Vocabulary"), 0, this, TQ_SLOT(loadVocab()), actionCollection(), "go_vocab"); + m_loadGrammar = new TDEAction(i18n("Load &Grammar"), 0, this, TQ_SLOT(loadGrammar()), actionCollection(), "go_grammar"); + m_loadVerbs = new TDEAction(i18n("Load V&erbs"), 0, this, TQ_SLOT(loadVerbs()), actionCollection(), "go_verbs"); + m_loadRevision = new TDEAction(i18n("Load &Revision"), 0, this, TQ_SLOT(loadRevision()), actionCollection(), "go_revision"); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); } void KLatin::startClicked() @@ -91,7 +91,7 @@ void KLatin::loadVocab() // When the child emits the signal exitted(), // then reset the GUI to go back to the menu - connect(klatinvocabsection, TQT_SIGNAL(exited()), this, TQT_SLOT(resetGUI())); + connect(klatinvocabsection, TQ_SIGNAL(exited()), this, TQ_SLOT(resetGUI())); // Set the section variable m_section = 1; @@ -114,8 +114,8 @@ void KLatin::loadGrammar() // When the child emits the signal exited(), // then reset the GUI to go back to the menu - connect(klatingrammarsection, TQT_SIGNAL(exited()), this, TQT_SLOT(resetGUI())); - connect(klatingrammarsection, TQT_SIGNAL(statusMsg(const TQString&)), this, TQT_SLOT(slotWriteMsg(const TQString&))); + connect(klatingrammarsection, TQ_SIGNAL(exited()), this, TQ_SLOT(resetGUI())); + connect(klatingrammarsection, TQ_SIGNAL(statusMsg(const TQString&)), this, TQ_SLOT(slotWriteMsg(const TQString&))); // Set the section variable m_section = 2; } @@ -142,8 +142,8 @@ void KLatin::loadVerbs() // When the child emits the signal exited(), // then reset the GUI to go back to the menu - connect(klatinverbssection, TQT_SIGNAL(exited()), this, TQT_SLOT(resetGUI())); - connect(klatinverbssection, TQT_SIGNAL(statusMsg(const TQString&)), this, TQT_SLOT(slotWriteMsg(const TQString&))); + connect(klatinverbssection, TQ_SIGNAL(exited()), this, TQ_SLOT(resetGUI())); + connect(klatinverbssection, TQ_SIGNAL(statusMsg(const TQString&)), this, TQ_SLOT(slotWriteMsg(const TQString&))); // Set the section variable m_section = 3; @@ -166,7 +166,7 @@ void KLatin::loadSettings() vocabPage->kcfg_DefaultFile->setFilter("*.kvtml"); vocabPage->kcfg_DefaultFile->setCaption(i18n("Load Vocabulary File")); dialog->addPage(vocabPage, i18n("Vocabulary"), "kdict"); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChanged())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(settingsChanged())); dialog->show(); } @@ -189,9 +189,9 @@ void KLatin::resetGUI() setCentralWidget(klatinchoose); // Connect the "Start" button to slot StartPressed() - connect(klatinchoose->StartButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(startClicked())); + connect(klatinchoose->StartButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(startClicked())); // Make the quit button quit the application :) - connect(klatinchoose->QuitButton, TQT_SIGNAL(clicked()), kapp, TQT_SLOT(quit())); + connect(klatinchoose->QuitButton, TQ_SIGNAL(clicked()), kapp, TQ_SLOT(quit())); // Enable all the menu entries under Section/ updateSection(TRUE); diff --git a/klatin/klatin/klatingrammar.cpp b/klatin/klatin/klatingrammar.cpp index e4f3f2a5..c9a67814 100644 --- a/klatin/klatin/klatingrammar.cpp +++ b/klatin/klatin/klatingrammar.cpp @@ -42,10 +42,10 @@ KLatinGrammar::KLatinGrammar(TQWidget* parent, const char *name) BackButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("back", TDEIcon::Small)); // Set connections - connect(BackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(goBack())); - connect(OKButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswer())); - connect(AnswerBox, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(checkAnswer())); - connect(ChooseSection, TQT_SIGNAL(activated(int)), this, TQT_SLOT(loadDatabase())); + connect(BackButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(goBack())); + connect(OKButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswer())); + connect(AnswerBox, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(checkAnswer())); + connect(ChooseSection, TQ_SIGNAL(activated(int)), this, TQ_SLOT(loadDatabase())); // Insert the various declensions ChooseSection->insertItem(i18n("All Declensions")); diff --git a/klatin/klatin/klatinverbs.cpp b/klatin/klatin/klatinverbs.cpp index 64dd13fa..f1a3880d 100644 --- a/klatin/klatin/klatinverbs.cpp +++ b/klatin/klatin/klatinverbs.cpp @@ -81,11 +81,11 @@ KLatinVerbs::KLatinVerbs(TQWidget* parent, const char *name) question.tense.push_back(I18N_NOOP("pluperfect")); question.tense.push_back(I18N_NOOP("future perfect")); - connect(ChooseConjugation, TQT_SIGNAL(activated(int)), this, TQT_SLOT(conjugationActivated(int))); - connect(BackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(goBack())); - connect(ChangeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadDatabase())); - connect(AnswerBox, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(checkAnswer())); - connect(OKButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswer())); + connect(ChooseConjugation, TQ_SIGNAL(activated(int)), this, TQ_SLOT(conjugationActivated(int))); + connect(BackButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(goBack())); + connect(ChangeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(loadDatabase())); + connect(AnswerBox, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(checkAnswer())); + connect(OKButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswer())); loadDatabase(); diff --git a/klatin/klatin/klatinvocab.cpp b/klatin/klatin/klatinvocab.cpp index 6d04bcef..8181d7af 100644 --- a/klatin/klatin/klatinvocab.cpp +++ b/klatin/klatin/klatinvocab.cpp @@ -40,7 +40,7 @@ KLatinVocab::KLatinVocab(TQWidget* parent, const char *name) m_vocabFile = TQString(); // Goes back to the last dialog - connect(BackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(goBack())); + connect(BackButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(goBack())); // Set default settings m_numberOfQuestions = Settings::numOfQuestions(); @@ -53,10 +53,10 @@ KLatinVocab::KLatinVocab(TQWidget* parent, const char *name) parseVocab(); // Connect the multiple choice buttons to the various slots - connect(Answer1, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswerOne())); - connect(Answer2, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswerTwo())); - connect(Answer3, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswerThree())); - connect(Answer4, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswerFour())); + connect(Answer1, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswerOne())); + connect(Answer2, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswerTwo())); + connect(Answer3, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswerThree())); + connect(Answer4, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswerFour())); } KLatinVocab::~KLatinVocab() diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp index fb67b82f..f9c17cb8 100644 --- a/klettres/klettres/klettres.cpp +++ b/klettres/klettres/klettres.cpp @@ -195,16 +195,16 @@ bool KLettres::loadLayout(TQDomDocument &layoutDocument) void KLettres::setupActions() { - TDEAction *m_newAction = new TDEAction(i18n("New Sound"), "file_new", CTRL+Key_N, m_view, TQT_SLOT(game()), actionCollection(), "play_new"); + TDEAction *m_newAction = new TDEAction(i18n("New Sound"), "file_new", CTRL+Key_N, m_view, TQ_SLOT(game()), actionCollection(), "play_new"); m_newAction->setToolTip(i18n("Play a new sound")); m_newAction->setWhatsThis(i18n("You can play a new sound by clicking this button or using the File menu, New Sound.")); - new TDEAction( i18n("Get Alphabet in New Language..."), "knewstuff", 0, this, TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" ); - TDEAction *m_playAgainAction = new TDEAction(i18n("Replay Sound"),"media-playback-start", CTRL+Key_P, m_view, TQT_SLOT(slotPlayAgain()), actionCollection(), "play_again"); + new TDEAction( i18n("Get Alphabet in New Language..."), "knewstuff", 0, this, TQ_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" ); + TDEAction *m_playAgainAction = new TDEAction(i18n("Replay Sound"),"media-playback-start", CTRL+Key_P, m_view, TQ_SLOT(slotPlayAgain()), actionCollection(), "play_again"); m_playAgainAction->setToolTip(i18n("Play the same sound again")); m_playAgainAction->setWhatsThis(i18n("You can replay the same sound again by clicking this button or using the File menu, Replay Sound.")); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); - m_menubarAction = new TDEToggleAction(i18n("Show &Menubar"),"edit-clear", CTRL+Key_M, this, TQT_SLOT(slotMenubar()), actionCollection(), "menubar"); + m_menubarAction = new TDEToggleAction(i18n("Show &Menubar"),"edit-clear", CTRL+Key_M, this, TQ_SLOT(slotMenubar()), actionCollection(), "menubar"); m_menubarAction->setCheckedState(i18n("Hide &Menubar")); m_menubarAction->setChecked(true); m_menubarAction->setWhatsThis(i18n("You can show or hide the menubar as you wish by clicking this button.")); @@ -230,16 +230,16 @@ void KLettres::setupActions() m_themeAction->setToolTip(i18n("Select the theme")); m_themeAction->setWhatsThis(i18n("Here you can change the theme for KLettres. A theme consists in the background picture and the font color for the letter displayed.")); - m_kidAction = new TDEToggleAction(i18n("Mode Kid"), "klettres_kids", CTRL+Key_K, this, TQT_SLOT(slotModeKid()), actionCollection(), "mode_kid"); + m_kidAction = new TDEToggleAction(i18n("Mode Kid"), "klettres_kids", CTRL+Key_K, this, TQ_SLOT(slotModeKid()), actionCollection(), "mode_kid"); m_kidAction->setWhatsThis(i18n("If you are in the Grown-up mode, clicking on this button will set up the Kid mode. The Kid mode has no menubar and the font is bigger in the statusbar.")); - m_grownupAction = new TDEToggleAction(i18n("Mode Grown-up"), "klettres_grownup", CTRL+Key_G, this, TQT_SLOT(slotModeGrownup()), actionCollection(), "mode_grownup"); + m_grownupAction = new TDEToggleAction(i18n("Mode Grown-up"), "klettres_grownup", CTRL+Key_G, this, TQ_SLOT(slotModeGrownup()), actionCollection(), "mode_grownup"); m_grownupAction->setWhatsThis(i18n("The Grown-up mode is the normal mode where you can see the menubar.")); - connect(m_levelAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLevel(int))); - connect(m_languageAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLanguage(int))); - connect(m_themeAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeTheme(int))); + connect(m_levelAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChangeLevel(int))); + connect(m_languageAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChangeLanguage(int))); + connect(m_themeAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChangeTheme(int))); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); setupGUI(); } @@ -273,7 +273,7 @@ void KLettres::optionsPreferences() //fonts is the icon Timer *m_timer = new Timer(); dialog->addPage(m_timer, i18n("Timer"), "clock"); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotUpdateSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotUpdateSettings())); dialog->show(); } @@ -475,7 +475,7 @@ void KLettres::loadLangToolBar() openFileStream.close(); for (int i=0; i<(int) allData.count(); i++) { if (!allData[i].isEmpty()) - m_secondToolbar->insertButton (charIcon(allData[i].at(0)), i, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotPasteChar()), true, i18n("Inserts the character %1").arg(allData[i]), i+1 ); + m_secondToolbar->insertButton (charIcon(allData[i].at(0)), i, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotPasteChar()), true, i18n("Inserts the character %1").arg(allData[i]), i+1 ); } } } diff --git a/klettres/klettres/klettresview.cpp b/klettres/klettres/klettresview.cpp index 69cc6bcc..6cdf78a7 100644 --- a/klettres/klettres/klettresview.cpp +++ b/klettres/klettres/klettresview.cpp @@ -124,24 +124,24 @@ void KLettresView::game() m_cursorPos = 1; //reset everything so when you change language or levels //it all restarts nicely - TQObject::disconnect(m_letterEdit, TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(slotProcess(const TQString&)) ); + TQObject::disconnect(m_letterEdit, TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(slotProcess(const TQString&)) ); m_letterEdit->clear(); m_letterEdit->setCursorPosition(0); m_letterEdit->setMaxLength(1); //fix that's in trunk m_letterEdit->setFocus(); chooseSound(); - TQObject::connect(m_letterEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotProcess(const TQString&)) ); + TQObject::connect(m_letterEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotProcess(const TQString&)) ); } void KLettresView::slotProcess(const TQString &inputLetter) { - TQObject::disconnect(m_letterEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotProcess(const TQString&)) ); + TQObject::disconnect(m_letterEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotProcess(const TQString&)) ); //check if backspace if(inputLetter.length() != m_cursorPos) { m_cursorPos--; m_letterEdit->setMaxLength( m_cursorPos ); - TQObject::connect(m_letterEdit, TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(slotProcess(const TQString&)) ); + TQObject::connect(m_letterEdit, TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(slotProcess(const TQString&)) ); return; } @@ -153,14 +153,14 @@ void KLettresView::slotProcess(const TQString &inputLetter) m_letterEdit->selectAll(); m_letterEdit->cut(); m_letterEdit->setText(m_upperLetter); - TQTimer::singleShot(m_timer*100, this, TQT_SLOT(slotTimerDone())); + TQTimer::singleShot(m_timer*100, this, TQ_SLOT(slotTimerDone())); } else { kdDebug() << "in no char loop" << endl; kdDebug() << "cursor " << m_cursorPos << endl; m_letterEdit->backspace(); - TQObject::connect(m_letterEdit, TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(slotProcess(const TQString&)) ); + TQObject::connect(m_letterEdit, TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(slotProcess(const TQString&)) ); } } @@ -177,7 +177,7 @@ void KLettresView::slotTimerDone() m_letterEdit->setCursorPosition( m_cursorPos ); m_letterEdit->setFocus(); m_cursorPos ++; - TQObject::connect(m_letterEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotProcess(const TQString&)) ); + TQObject::connect(m_letterEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotProcess(const TQString&)) ); } else { @@ -191,7 +191,7 @@ void KLettresView::slotTimerDone() //play sound again m_klettres->soundFactory->playSound(m_random); - TQObject::connect(m_letterEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotProcess(const TQString&)) ); + TQObject::connect(m_letterEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotProcess(const TQString&)) ); } } diff --git a/klettres/klettres/timer.cpp b/klettres/klettres/timer.cpp index d6fa9a4b..6b7e06d6 100644 --- a/klettres/klettres/timer.cpp +++ b/klettres/klettres/timer.cpp @@ -34,8 +34,8 @@ Timer::Timer() { timeGrownLabel->setText(TQString::number(Prefs::grownTimer()) + " " + i18n("tenths of second")); timeKidLabel->setText(TQString::number(Prefs::kidTimer()) + " " + i18n("tenths of second")); - connect(kcfg_GrownTimer, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(sliderValueChanged())); - connect(kcfg_KidTimer, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(sliderValueChanged())); + connect(kcfg_GrownTimer, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(sliderValueChanged())); + connect(kcfg_KidTimer, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(sliderValueChanged())); } diff --git a/kmplot/kmplot/FktDlg.cpp b/kmplot/kmplot/FktDlg.cpp index bf0da759..7597fc9e 100644 --- a/kmplot/kmplot/FktDlg.cpp +++ b/kmplot/kmplot/FktDlg.cpp @@ -51,11 +51,11 @@ FktDlg::FktDlg( TQWidget* parent, View *view ) : FktDlgData( parent, "editPlots" ), m_view(view) { - connect( cmdCopyFunction, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopyFunction()) ); - connect( cmdMoveFunction, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveFunction()) ); - connect( lb_fktliste, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int)), this, TQT_SLOT(lb_fktliste_doubleClicked(TQListViewItem *, const TQPoint &, int)) ); - connect( lb_fktliste, TQT_SIGNAL( clicked(TQListViewItem *)), this, TQT_SLOT(lb_fktliste_clicked(TQListViewItem *))); - connect( lb_fktliste, TQT_SIGNAL( spacePressed(TQListViewItem *)), this, TQT_SLOT(lb_fktliste_spacePressed(TQListViewItem *))); + connect( cmdCopyFunction, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCopyFunction()) ); + connect( cmdMoveFunction, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveFunction()) ); + connect( lb_fktliste, TQ_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int)), this, TQ_SLOT(lb_fktliste_doubleClicked(TQListViewItem *, const TQPoint &, int)) ); + connect( lb_fktliste, TQ_SIGNAL( clicked(TQListViewItem *)), this, TQ_SLOT(lb_fktliste_clicked(TQListViewItem *))); + connect( lb_fktliste, TQ_SIGNAL( spacePressed(TQListViewItem *)), this, TQ_SLOT(lb_fktliste_spacePressed(TQListViewItem *))); lb_fktliste->addColumn( "" ); lb_fktliste->header()->hide(); diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp index f3391ecc..f9cf4ec1 100644 --- a/kmplot/kmplot/MainDlg.cpp +++ b/kmplot/kmplot/MainDlg.cpp @@ -84,7 +84,7 @@ MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const c coordsDialog = 0; m_popupmenu = new TDEPopupMenu(parentWidget); view = new View( m_readonly, m_modified, m_popupmenu, parentWidget ); - connect( view, TQT_SIGNAL( setStatusBarText(const TQString &)), this, TQT_SLOT( setReadOnlyStatusBarText(const TQString &) ) ); + connect( view, TQ_SIGNAL( setStatusBarText(const TQString &)), this, TQ_SLOT( setReadOnlyStatusBarText(const TQString &) ) ); setWidget( view ); view->setFocusPolicy(TQWidget::ClickFocus); minmaxdlg = new KMinMax(view, m_parent); @@ -109,8 +109,8 @@ MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const c m_settingsDialog->addPage( m_constantsSettings, i18n("Constants"), "editconstants", i18n("Constants") ); // User edited the configuration - update your local copies of the // configuration data - connect( m_settingsDialog, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT(updateSettings() ) ); - connect( view, TQT_SIGNAL( resetZoom() ), this, TQT_SLOT(resetZoom() ) ); + connect( m_settingsDialog, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT(updateSettings() ) ); + connect( view, TQ_SIGNAL( resetZoom() ), this, TQ_SLOT(resetZoom() ) ); } MainDlg::~MainDlg() @@ -123,29 +123,29 @@ MainDlg::~MainDlg() void MainDlg::setupActions() { // standard actions - m_recentFiles = KStdAction::openRecent( this, TQT_SLOT( slotOpenRecent( const KURL& ) ), actionCollection(),"file_openrecent"); - KStdAction::print( this, TQT_SLOT( slotPrint() ), actionCollection(),"file_print" ); - KStdAction::save( this, TQT_SLOT( slotSave() ), actionCollection() ); - KStdAction::saveAs( this, TQT_SLOT( slotSaveas() ), actionCollection() ); - connect( kapp, TQT_SIGNAL( lastWindowClosed() ), kapp, TQT_SLOT( quit() ) ); + m_recentFiles = KStdAction::openRecent( this, TQ_SLOT( slotOpenRecent( const KURL& ) ), actionCollection(),"file_openrecent"); + KStdAction::print( this, TQ_SLOT( slotPrint() ), actionCollection(),"file_print" ); + KStdAction::save( this, TQ_SLOT( slotSave() ), actionCollection() ); + KStdAction::saveAs( this, TQ_SLOT( slotSaveas() ), actionCollection() ); + connect( kapp, TQ_SIGNAL( lastWindowClosed() ), kapp, TQ_SLOT( quit() ) ); - TDEAction *prefs = KStdAction::preferences( this, TQT_SLOT( slotSettings() ), actionCollection()); + TDEAction *prefs = KStdAction::preferences( this, TQ_SLOT( slotSettings() ), actionCollection()); prefs->setText( i18n( "Configure KmPlot..." ) ); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); // KmPlot specific actions // file menu - ( void ) new TDEAction( i18n( "E&xport..." ), 0, this, TQT_SLOT( slotExport() ), actionCollection(), "export"); + ( void ) new TDEAction( i18n( "E&xport..." ), 0, this, TQ_SLOT( slotExport() ), actionCollection(), "export"); //zoom menu - m_mnuNoZoom = new TDERadioAction(i18n("&No Zoom") ,"CTRL+0",view, TQT_SLOT( mnuNoZoom_clicked() ),actionCollection(),"no_zoom" ); - TDERadioAction * mnuRectangular = new TDERadioAction(i18n("Zoom &Rectangular"), "zoom-fit-best", "CTRL+1",view, TQT_SLOT( mnuRectangular_clicked() ),actionCollection(),"zoom_rectangular" ); - TDERadioAction * mnuZoomIn = new TDERadioAction(i18n("Zoom &In"), "zoom-in", "CTRL+2",view, TQT_SLOT( mnuZoomIn_clicked() ),actionCollection(),"zoom_in" ); - TDERadioAction * mnuZoomOut = new TDERadioAction(i18n("Zoom &Out"), "zoom-out", "CTRL+3",view, TQT_SLOT( mnuZoomOut_clicked() ),actionCollection(),"zoom_out" ); - TDERadioAction * mnuZoomCenter = new TDERadioAction(i18n("&Center Point") ,"CTRL+4",view, TQT_SLOT( mnuCenter_clicked() ),actionCollection(),"zoom_center" ); - (void ) new TDEAction(i18n("&Fit Widget to Trigonometric Functions") ,0,view, TQT_SLOT( mnuTrig_clicked() ),actionCollection(),"zoom_trig" ); + m_mnuNoZoom = new TDERadioAction(i18n("&No Zoom") ,"CTRL+0",view, TQ_SLOT( mnuNoZoom_clicked() ),actionCollection(),"no_zoom" ); + TDERadioAction * mnuRectangular = new TDERadioAction(i18n("Zoom &Rectangular"), "zoom-fit-best", "CTRL+1",view, TQ_SLOT( mnuRectangular_clicked() ),actionCollection(),"zoom_rectangular" ); + TDERadioAction * mnuZoomIn = new TDERadioAction(i18n("Zoom &In"), "zoom-in", "CTRL+2",view, TQ_SLOT( mnuZoomIn_clicked() ),actionCollection(),"zoom_in" ); + TDERadioAction * mnuZoomOut = new TDERadioAction(i18n("Zoom &Out"), "zoom-out", "CTRL+3",view, TQ_SLOT( mnuZoomOut_clicked() ),actionCollection(),"zoom_out" ); + TDERadioAction * mnuZoomCenter = new TDERadioAction(i18n("&Center Point") ,"CTRL+4",view, TQ_SLOT( mnuCenter_clicked() ),actionCollection(),"zoom_center" ); + (void ) new TDEAction(i18n("&Fit Widget to Trigonometric Functions") ,0,view, TQ_SLOT( mnuTrig_clicked() ),actionCollection(),"zoom_trig" ); m_mnuNoZoom->setExclusiveGroup("zoom_modes"); m_mnuNoZoom->setChecked(true); mnuRectangular->setExclusiveGroup("zoom_modes"); @@ -154,52 +154,52 @@ void MainDlg::setupActions() mnuZoomCenter->setExclusiveGroup("zoom_modes"); // help menu - ( void ) new TDEAction( i18n( "Predefined &Math Functions" ), "functionhelp", 0, this, TQT_SLOT( slotNames() ), actionCollection(), "names" ); + ( void ) new TDEAction( i18n( "Predefined &Math Functions" ), "functionhelp", 0, this, TQ_SLOT( slotNames() ), actionCollection(), "names" ); // edit menu - ( void ) new TDEAction( i18n( "&Colors..." ), "colorize.png", 0, this, TQT_SLOT( editColors() ), actionCollection(), "editcolors" ); - ( void ) new TDEAction( i18n( "&Coordinate System..." ), "coords.png", 0, this, TQT_SLOT( editAxes() ), actionCollection(), "editaxes" ); - // ( void ) new TDEAction( i18n( "&Grid..." ), "coords.png", 0, this, TQT_SLOT( editGrid() ), actionCollection(), "editgrid" ); - ( void ) new TDEAction( i18n( "&Scaling..." ), "scaling", 0, this, TQT_SLOT( editScaling() ), actionCollection(), "editscaling" ); - ( void ) new TDEAction( i18n( "&Fonts..." ), "fonts", 0, this, TQT_SLOT( editFonts() ), actionCollection(), "editfonts" ); + ( void ) new TDEAction( i18n( "&Colors..." ), "colorize.png", 0, this, TQ_SLOT( editColors() ), actionCollection(), "editcolors" ); + ( void ) new TDEAction( i18n( "&Coordinate System..." ), "coords.png", 0, this, TQ_SLOT( editAxes() ), actionCollection(), "editaxes" ); + // ( void ) new TDEAction( i18n( "&Grid..." ), "coords.png", 0, this, TQ_SLOT( editGrid() ), actionCollection(), "editgrid" ); + ( void ) new TDEAction( i18n( "&Scaling..." ), "scaling", 0, this, TQ_SLOT( editScaling() ), actionCollection(), "editscaling" ); + ( void ) new TDEAction( i18n( "&Fonts..." ), "fonts", 0, this, TQ_SLOT( editFonts() ), actionCollection(), "editfonts" ); - ( void ) new TDEAction( i18n( "Coordinate System I" ), "ksys1.png", 0, this, TQT_SLOT( slotCoord1() ), actionCollection(), "coord_i" ); - ( void ) new TDEAction( i18n( "Coordinate System II" ), "ksys2.png", 0, this, TQT_SLOT( slotCoord2() ), actionCollection(), "coord_ii" ); - ( void ) new TDEAction( i18n( "Coordinate System III" ), "ksys3.png", 0, this, TQT_SLOT( slotCoord3() ), actionCollection(), "coord_iii" ); + ( void ) new TDEAction( i18n( "Coordinate System I" ), "ksys1.png", 0, this, TQ_SLOT( slotCoord1() ), actionCollection(), "coord_i" ); + ( void ) new TDEAction( i18n( "Coordinate System II" ), "ksys2.png", 0, this, TQ_SLOT( slotCoord2() ), actionCollection(), "coord_ii" ); + ( void ) new TDEAction( i18n( "Coordinate System III" ), "ksys3.png", 0, this, TQ_SLOT( slotCoord3() ), actionCollection(), "coord_iii" ); // plot menu - ( void ) new TDEAction( i18n( "&New Function Plot..." ), "newfunction", 0, this, TQT_SLOT( newFunction() ), actionCollection(), "newfunction" ); - ( void ) new TDEAction( i18n( "New Parametric Plot..." ), "newparametric", 0, this, TQT_SLOT( newParametric() ), actionCollection(), "newparametric" ); - ( void ) new TDEAction( i18n( "New Polar Plot..." ), "newpolar", 0, this, TQT_SLOT( newPolar() ), actionCollection(), "newpolar" ); - ( void ) new TDEAction( i18n( "Edit Plots..." ), "editplots", 0, this, TQT_SLOT( slotEditPlots() ), actionCollection(), "editplots" ); + ( void ) new TDEAction( i18n( "&New Function Plot..." ), "newfunction", 0, this, TQ_SLOT( newFunction() ), actionCollection(), "newfunction" ); + ( void ) new TDEAction( i18n( "New Parametric Plot..." ), "newparametric", 0, this, TQ_SLOT( newParametric() ), actionCollection(), "newparametric" ); + ( void ) new TDEAction( i18n( "New Polar Plot..." ), "newpolar", 0, this, TQ_SLOT( newPolar() ), actionCollection(), "newpolar" ); + ( void ) new TDEAction( i18n( "Edit Plots..." ), "editplots", 0, this, TQ_SLOT( slotEditPlots() ), actionCollection(), "editplots" ); // tools menu - TDEAction *mnuYValue = new TDEAction( i18n( "&Get y-Value..." ), 0, this, TQT_SLOT( getYValue() ), actionCollection(), "yvalue" ); - TDEAction *mnuMinValue = new TDEAction( i18n( "&Search for Minimum Value..." ), "minimum", 0, this, TQT_SLOT( findMinimumValue() ), actionCollection(), "minimumvalue" ); - TDEAction *mnuMaxValue = new TDEAction( i18n( "&Search for Maximum Value..." ), "maximum", 0, this, TQT_SLOT( findMaximumValue() ), actionCollection(), "maximumvalue" ); - TDEAction *mnuArea = new TDEAction( i18n( "&Calculate Integral" ), 0, this, TQT_SLOT( graphArea() ), actionCollection(), "grapharea" ); + TDEAction *mnuYValue = new TDEAction( i18n( "&Get y-Value..." ), 0, this, TQ_SLOT( getYValue() ), actionCollection(), "yvalue" ); + TDEAction *mnuMinValue = new TDEAction( i18n( "&Search for Minimum Value..." ), "minimum", 0, this, TQ_SLOT( findMinimumValue() ), actionCollection(), "minimumvalue" ); + TDEAction *mnuMaxValue = new TDEAction( i18n( "&Search for Maximum Value..." ), "maximum", 0, this, TQ_SLOT( findMaximumValue() ), actionCollection(), "maximumvalue" ); + TDEAction *mnuArea = new TDEAction( i18n( "&Calculate Integral" ), 0, this, TQ_SLOT( graphArea() ), actionCollection(), "grapharea" ); - connect( m_quickEdit, TQT_SIGNAL( returnPressed( const TQString& ) ), this, TQT_SLOT( slotQuickEdit( const TQString& ) ) ); + connect( m_quickEdit, TQ_SIGNAL( returnPressed( const TQString& ) ), this, TQ_SLOT( slotQuickEdit( const TQString& ) ) ); KWidgetAction* quickEditAction = new KWidgetAction( m_quickEdit, i18n( "Quick Edit" ), 0, this, 0, actionCollection(), "quickedit" ); quickEditAction->setWhatsThis( i18n( "Enter a simple function equation here.\n" "For instance: f(x)=x^2\nFor more options use Functions->Edit Plots... menu." ) ); - view->mnuSliders[0] = new TDEToggleAction( i18n( "Show Slider 1" ), 0, this, TQT_SLOT( toggleShowSlider0() ), actionCollection(), TQString( "options_configure_show_slider_0" ).latin1() ); - view->mnuSliders[1] = new TDEToggleAction( i18n( "Show Slider 2" ), 0, this, TQT_SLOT( toggleShowSlider1() ), actionCollection(), TQString( "options_configure_show_slider_1" ).latin1() ); - view->mnuSliders[2] = new TDEToggleAction( i18n( "Show Slider 3" ), 0, this, TQT_SLOT( toggleShowSlider2() ), actionCollection(), TQString( "options_configure_show_slider_2" ).latin1() ); - view->mnuSliders[3] = new TDEToggleAction( i18n( "Show Slider 4" ), 0, this, TQT_SLOT( toggleShowSlider3() ), actionCollection(), TQString( "options_configure_show_slider_3" ).latin1() ); + view->mnuSliders[0] = new TDEToggleAction( i18n( "Show Slider 1" ), 0, this, TQ_SLOT( toggleShowSlider0() ), actionCollection(), TQString( "options_configure_show_slider_0" ).latin1() ); + view->mnuSliders[1] = new TDEToggleAction( i18n( "Show Slider 2" ), 0, this, TQ_SLOT( toggleShowSlider1() ), actionCollection(), TQString( "options_configure_show_slider_1" ).latin1() ); + view->mnuSliders[2] = new TDEToggleAction( i18n( "Show Slider 3" ), 0, this, TQ_SLOT( toggleShowSlider2() ), actionCollection(), TQString( "options_configure_show_slider_2" ).latin1() ); + view->mnuSliders[3] = new TDEToggleAction( i18n( "Show Slider 4" ), 0, this, TQ_SLOT( toggleShowSlider3() ), actionCollection(), TQString( "options_configure_show_slider_3" ).latin1() ); // Popup menu - TDEAction *mnuHide = new TDEAction(i18n("&Hide") ,0,view, TQT_SLOT( mnuHide_clicked() ),actionCollection(),"mnuhide" ); + TDEAction *mnuHide = new TDEAction(i18n("&Hide") ,0,view, TQ_SLOT( mnuHide_clicked() ),actionCollection(),"mnuhide" ); mnuHide->plug(m_popupmenu); - TDEAction *mnuRemove = new TDEAction(i18n("&Remove"),"edit-delete", 0,view, TQT_SLOT( mnuRemove_clicked() ),actionCollection(),"mnuremove" ); + TDEAction *mnuRemove = new TDEAction(i18n("&Remove"),"edit-delete", 0,view, TQ_SLOT( mnuRemove_clicked() ),actionCollection(),"mnuremove" ); mnuRemove->plug(m_popupmenu); - TDEAction *mnuEdit = new TDEAction(i18n("&Edit"),"editplots", 0,view, TQT_SLOT( mnuEdit_clicked() ),actionCollection(),"mnuedit" ); + TDEAction *mnuEdit = new TDEAction(i18n("&Edit"),"editplots", 0,view, TQ_SLOT( mnuEdit_clicked() ),actionCollection(),"mnuedit" ); mnuEdit->plug(m_popupmenu); m_popupmenu->insertSeparator(); - TDEAction *mnuCopy = new TDEAction(i18n("&Copy"), 0,view, TQT_SLOT( mnuCopy_clicked() ),actionCollection(),"mnucopy" ); + TDEAction *mnuCopy = new TDEAction(i18n("&Copy"), 0,view, TQ_SLOT( mnuCopy_clicked() ),actionCollection(),"mnucopy" ); mnuCopy->plug(m_popupmenu); - TDEAction *mnuMove = new TDEAction(i18n("&Move"), 0,view, TQT_SLOT( mnuMove_clicked() ),actionCollection(),"mnumove" ); + TDEAction *mnuMove = new TDEAction(i18n("&Move"), 0,view, TQ_SLOT( mnuMove_clicked() ),actionCollection(),"mnumove" ); mnuMove->plug(m_popupmenu); m_popupmenu->insertSeparator(); mnuYValue->plug(m_popupmenu); @@ -408,7 +408,7 @@ void MainDlg::editColors() // User edited the configuration - update your local copies of the // configuration data - connect( colorsDialog, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT(updateSettings() ) ); + connect( colorsDialog, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT(updateSettings() ) ); colorsDialog->show(); } @@ -420,7 +420,7 @@ void MainDlg::editAxes() coordsDialog = new CoordsConfigDialog( view->parser(), m_parent); // User edited the configuration - update your local copies of the // configuration data - connect( coordsDialog, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT(updateSettings() ) ); + connect( coordsDialog, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT(updateSettings() ) ); } coordsDialog->show(); } @@ -433,7 +433,7 @@ void MainDlg::editScaling() scalingDialog->addPage( new SettingsPageScaling( 0, "scalingSettings" ), i18n( "Scale" ), "scaling", i18n( "Edit Scaling" ) ); // User edited the configuration - update your local copies of the // configuration data - connect( scalingDialog, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT(updateSettings() ) ); + connect( scalingDialog, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT(updateSettings() ) ); scalingDialog->show(); } @@ -445,7 +445,7 @@ void MainDlg::editFonts() fontsDialog->addPage( new SettingsPageFonts( 0, "fontsSettings" ), i18n( "Fonts" ), "fonts", i18n( "Edit Fonts" ) ); // User edited the configuration - update your local copies of the // configuration data - connect( fontsDialog, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT(updateSettings() ) ); + connect( fontsDialog, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT(updateSettings() ) ); fontsDialog->show(); } @@ -736,8 +736,8 @@ void MainDlg::toggleShowSlider(int const num) if ( view->sliders[ num ] == 0 ) { view->sliders[ num ] = new KSliderWindow( view, num); - connect( view->sliders[num]->slider, TQT_SIGNAL( valueChanged( int ) ), view, TQT_SLOT( drawPlot() ) ); - connect( view->sliders[num], TQT_SIGNAL( windowClosed( int ) ), view, TQT_SLOT( sliderWindowClosed(int) ) ); + connect( view->sliders[num]->slider, TQ_SIGNAL( valueChanged( int ) ), view, TQ_SLOT( drawPlot() ) ); + connect( view->sliders[num], TQ_SIGNAL( windowClosed( int ) ), view, TQ_SLOT( sliderWindowClosed(int) ) ); } if ( !view->sliders[ num ]->isShown() ) view->sliders[ num ]->show(); diff --git a/kmplot/kmplot/View.cpp b/kmplot/kmplot/View.cpp index ce872219..abadabdf 100644 --- a/kmplot/kmplot/View.cpp +++ b/kmplot/kmplot/View.cpp @@ -1841,8 +1841,8 @@ void View::updateSliders() if ( sliders[ it->use_slider ] == 0 ) { sliders[ it->use_slider ] = new KSliderWindow( this, it->use_slider); - connect( sliders[ it->use_slider ]->slider, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( drawPlot() ) ); - connect( sliders[ it->use_slider ], TQT_SIGNAL( windowClosed( int ) ), this , TQT_SLOT( sliderWindowClosed(int) ) ); + connect( sliders[ it->use_slider ]->slider, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( drawPlot() ) ); + connect( sliders[ it->use_slider ], TQ_SIGNAL( windowClosed( int ) ), this , TQ_SLOT( sliderWindowClosed(int) ) ); mnuSliders[ it->use_slider ]->setChecked(true); //set the slider-item in the menu } sliders[ it->use_slider ]->show(); diff --git a/kmplot/kmplot/editfunction.cpp b/kmplot/kmplot/editfunction.cpp index 2d592676..66547508 100644 --- a/kmplot/kmplot/editfunction.cpp +++ b/kmplot/kmplot/editfunction.cpp @@ -69,10 +69,10 @@ EditFunction::EditFunction( XParser* parser, TQWidget* parent, const char* name { editfunctionpage->listOfSliders->insertItem( i18n( "Slider No. %1" ).arg( number +1) ); } - connect( editfunctionpage->cmdParameter, TQT_SIGNAL ( clicked() ), this, TQT_SLOT( cmdParameter_clicked() ) ); - connect( editfunctionpage->useNoParameter, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( noParameter_toggled(bool) ) ); - connect( editfunctionpage->customMinRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMinRange_toggled(bool) ) ); - connect( editfunctionpage->customMaxRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMaxRange_toggled(bool) ) ); + connect( editfunctionpage->cmdParameter, TQ_SIGNAL ( clicked() ), this, TQ_SLOT( cmdParameter_clicked() ) ); + connect( editfunctionpage->useNoParameter, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT( noParameter_toggled(bool) ) ); + connect( editfunctionpage->customMinRange, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT( customMinRange_toggled(bool) ) ); + connect( editfunctionpage->customMaxRange, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT( customMaxRange_toggled(bool) ) ); m_updatedfunction = 0; } diff --git a/kmplot/kmplot/kconstanteditor.cpp b/kmplot/kmplot/kconstanteditor.cpp index d8af85e8..aaf17907 100644 --- a/kmplot/kmplot/kconstanteditor.cpp +++ b/kmplot/kmplot/kconstanteditor.cpp @@ -61,7 +61,7 @@ void KConstantEditor::cmdNew_clicked() { constant = '0'; KEditConstant *dlg = new KEditConstant(m_view->parser(), constant, value); - connect( dlg, TQT_SIGNAL( finished() ), this,TQT_SLOT(newConstantSlot() ) ); + connect( dlg, TQ_SIGNAL( finished() ), this,TQ_SLOT(newConstantSlot() ) ); dlg->show(); } @@ -73,7 +73,7 @@ void KConstantEditor::cmdEdit_clicked() value = varlist->currentItem()->text(1); KEditConstant *dlg = new KEditConstant(m_view->parser(), constant, value); - connect( dlg, TQT_SIGNAL( finished() ), this,TQT_SLOT(editConstantSlot() ) ); + connect( dlg, TQ_SIGNAL( finished() ), this,TQ_SLOT(editConstantSlot() ) ); dlg->show(); } diff --git a/kmplot/kmplot/keditconstant.cpp b/kmplot/kmplot/keditconstant.cpp index 04dfa441..19bd3855 100644 --- a/kmplot/kmplot/keditconstant.cpp +++ b/kmplot/kmplot/keditconstant.cpp @@ -43,8 +43,8 @@ KEditConstant::KEditConstant(XParser *p, char &c, TQString &v, TQWidget *parent, txtValue->setFocus(); txtValue->selectAll(); } - connect( cmdCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteLater() )); - connect( cmdOK, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdOK_clicked() )); + connect( cmdCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deleteLater() )); + connect( cmdOK, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdOK_clicked() )); } diff --git a/kmplot/kmplot/keditparametric.cpp b/kmplot/kmplot/keditparametric.cpp index 0d83b3a7..ae4fbe10 100644 --- a/kmplot/kmplot/keditparametric.cpp +++ b/kmplot/kmplot/keditparametric.cpp @@ -44,8 +44,8 @@ KEditParametric::KEditParametric( XParser* parser, TQWidget* parent, const char* name ) : QEditParametric( parent, name ), m_parser(parser) { - connect( customMinRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMinRange_toggled(bool) ) ); - connect( customMaxRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMaxRange_toggled(bool) ) ); + connect( customMinRange, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT( customMinRange_toggled(bool) ) ); + connect( customMaxRange, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT( customMaxRange_toggled(bool) ) ); m_updatedfunction = 0; } diff --git a/kmplot/kmplot/keditpolar.cpp b/kmplot/kmplot/keditpolar.cpp index 27334bb6..1d730b04 100644 --- a/kmplot/kmplot/keditpolar.cpp +++ b/kmplot/kmplot/keditpolar.cpp @@ -45,8 +45,8 @@ KEditPolar::KEditPolar( XParser* parser, TQWidget* parent, const char* name ) : QEditPolar( parent, name ),m_parser(parser) { - connect( customMinRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMinRange_toggled(bool) ) ); - connect( customMaxRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMaxRange_toggled(bool) ) ); + connect( customMinRange, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT( customMinRange_toggled(bool) ) ); + connect( customMaxRange, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT( customMaxRange_toggled(bool) ) ); m_updatedfunction = 0; } diff --git a/kmplot/kmplot/kminmax.cpp b/kmplot/kmplot/kminmax.cpp index 3b947f97..1a6dffac 100644 --- a/kmplot/kmplot/kminmax.cpp +++ b/kmplot/kmplot/kminmax.cpp @@ -40,11 +40,11 @@ KMinMax::KMinMax(View *v, TQWidget *parent, const char *name) : QMinMax(parent, name), m_view(v) { m_mode=-1; - connect( cmdClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( close() )); - connect( cmdFind, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdFind_clicked() )); - connect( cmdParameter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdParameter_clicked() )); - connect( list, TQT_SIGNAL( highlighted(TQListBoxItem*) ), this, TQT_SLOT( list_highlighted(TQListBoxItem*) )); - connect( list, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( list_doubleClicked(TQListBoxItem *) )); + connect( cmdClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( close() )); + connect( cmdFind, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdFind_clicked() )); + connect( cmdParameter, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdParameter_clicked() )); + connect( list, TQ_SIGNAL( highlighted(TQListBoxItem*) ), this, TQ_SLOT( list_highlighted(TQListBoxItem*) )); + connect( list, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQ_SLOT( list_doubleClicked(TQListBoxItem *) )); parameter=""; } diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp index b39495f7..a6c17053 100644 --- a/kmplot/kmplot/kmplot.cpp +++ b/kmplot/kmplot/kmplot.cpp @@ -135,18 +135,18 @@ bool KmPlot::load(const KURL& url) void KmPlot::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); m_fullScreen = KStdAction::fullScreen( NULL, NULL, actionCollection(), this, "fullscreen"); - connect( m_fullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool ))); + connect( m_fullScreen, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT( slotUpdateFullScreen( bool ))); } void KmPlot::saveProperties(TDEConfig* /*config*/) @@ -210,7 +210,7 @@ void KmPlot::optionsConfigureToolbars() saveMainWindowSettings(TDEGlobal::config() ); // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } @@ -306,7 +306,7 @@ void KmPlot::setupStatusBar() m_progressbar = new KmPlotProgress( statusBar() ); m_progressbar->setMaximumHeight( statusBar()->height()-10 ); - connect( m_progressbar->button, TQT_SIGNAL (clicked() ), this, TQT_SLOT( progressbar_clicked() ) ); + connect( m_progressbar->button, TQ_SIGNAL (clicked() ), this, TQ_SLOT( progressbar_clicked() ) ); statusBar()->addWidget(m_progressbar); } diff --git a/kmplot/kmplot/kparametereditor.cpp b/kmplot/kmplot/kparametereditor.cpp index 972cd9b4..5aa0f810 100644 --- a/kmplot/kmplot/kparametereditor.cpp +++ b/kmplot/kmplot/kparametereditor.cpp @@ -49,14 +49,14 @@ KParameterEditor::KParameterEditor(XParser *m, TQValueList<ParameterValueItem> * list->insertItem( (*it).expression ); list->sort(); - connect( cmdNew, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdNew_clicked() )); - connect( cmdEdit, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdEdit_clicked() )); - connect( cmdDelete, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdDelete_clicked() )); - connect( cmdImport, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdImport_clicked() )); - connect( cmdExport, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdExport_clicked() )); - connect( cmdClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( close() )); - connect( list, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( varlist_doubleClicked( TQListBoxItem *) )); - connect( list, TQT_SIGNAL( clicked ( TQListBoxItem * ) ), this, TQT_SLOT( varlist_clicked(TQListBoxItem * ) )); + connect( cmdNew, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdNew_clicked() )); + connect( cmdEdit, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdEdit_clicked() )); + connect( cmdDelete, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdDelete_clicked() )); + connect( cmdImport, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdImport_clicked() )); + connect( cmdExport, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdExport_clicked() )); + connect( cmdClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( close() )); + connect( list, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQ_SLOT( varlist_doubleClicked( TQListBoxItem *) )); + connect( list, TQ_SIGNAL( clicked ( TQListBoxItem * ) ), this, TQ_SLOT( varlist_clicked(TQListBoxItem * ) )); } diff --git a/kmplot/kmplot/ksliderwindow.cpp b/kmplot/kmplot/ksliderwindow.cpp index 765ec21f..f56e562e 100644 --- a/kmplot/kmplot/ksliderwindow.cpp +++ b/kmplot/kmplot/ksliderwindow.cpp @@ -61,9 +61,9 @@ KSliderWindow::KSliderWindow(TQWidget* parent, int num ) : installEventFilter(this); m_popupmenu = new TDEPopupMenu(this); - TDEAction *mnuMinValue = new TDEAction(i18n("&Change Minimum Value") ,0,this, TQT_SLOT( mnuMinValue_clicked() ),0); + TDEAction *mnuMinValue = new TDEAction(i18n("&Change Minimum Value") ,0,this, TQ_SLOT( mnuMinValue_clicked() ),0); mnuMinValue->plug(m_popupmenu); - TDEAction *mnuMaxValue = new TDEAction(i18n("&Change Maximum Value") ,0,this, TQT_SLOT( mnuMaxValue_clicked() ),0 ); + TDEAction *mnuMaxValue = new TDEAction(i18n("&Change Maximum Value") ,0,this, TQ_SLOT( mnuMaxValue_clicked() ),0 ); mnuMaxValue->plug(m_popupmenu); } diff --git a/kpercentage/kpercentage/kanswer.cpp b/kpercentage/kpercentage/kanswer.cpp index d809b79e..93270322 100644 --- a/kpercentage/kpercentage/kanswer.cpp +++ b/kpercentage/kpercentage/kanswer.cpp @@ -106,7 +106,7 @@ KAnswer::KAnswer( TQWidget *parent ): KDialog( parent, "answer", TRUE ) // end layouting /////// - connect( ButtonOK, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); + connect( ButtonOK, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); loadAnswers(); } diff --git a/kpercentage/kpercentage/kpercentage.cpp b/kpercentage/kpercentage/kpercentage.cpp index 0a61aff8..32b4101a 100644 --- a/kpercentage/kpercentage/kpercentage.cpp +++ b/kpercentage/kpercentage/kpercentage.cpp @@ -100,12 +100,12 @@ KPercentage::KPercentage( const char *name ) : spin_box_number->setValue( 5 ); // connecting all the slots - connect( button_basevalue, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selBasevalue() ) ); - connect( button_percentvalue, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selPercentvalue() ) ); - connect( button_percentage, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selPercentage() ) ); - connect( button_random, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selRandom() ) ); - connect( button_help, TQT_SIGNAL( clicked() ), this, TQT_SLOT( needHelp() ) ); - connect( button_close, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); + connect( button_basevalue, TQ_SIGNAL( clicked() ), this, TQ_SLOT( selBasevalue() ) ); + connect( button_percentvalue, TQ_SIGNAL( clicked() ), this, TQ_SLOT( selPercentvalue() ) ); + connect( button_percentage, TQ_SIGNAL( clicked() ), this, TQ_SLOT( selPercentage() ) ); + connect( button_random, TQ_SIGNAL( clicked() ), this, TQ_SLOT( selRandom() ) ); + connect( button_help, TQ_SIGNAL( clicked() ), this, TQ_SLOT( needHelp() ) ); + connect( button_close, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); //////// // begin layouting diff --git a/kpercentage/kpercentage/kpercentmain.cpp b/kpercentage/kpercentage/kpercentmain.cpp index b686a096..1035381e 100644 --- a/kpercentage/kpercentage/kpercentmain.cpp +++ b/kpercentage/kpercentage/kpercentmain.cpp @@ -181,8 +181,8 @@ KPercentMain::KPercentMain( TQWidget *parent, const char *name ) : TQToolTip::add( push_button_cancel, i18n( "Back to the main window" ) ); // signals and slots connections - connect( push_button_apply, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotApplyInput() ) ); - connect( push_button_cancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); + connect( push_button_apply, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotApplyInput() ) ); + connect( push_button_cancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); // build up the answer window answer = new KAnswer( this ); diff --git a/kpercentage/kpercentage/ksplashscreen.cpp b/kpercentage/kpercentage/ksplashscreen.cpp index 54848104..a97c85e2 100644 --- a/kpercentage/kpercentage/ksplashscreen.cpp +++ b/kpercentage/kpercentage/ksplashscreen.cpp @@ -55,7 +55,7 @@ KSplashScreen::KSplashScreen( KPercentage *percentage, const char *name ) : view->setHScrollBarMode( TQCanvasView::AlwaysOff ); view->setFrameStyle( TQCanvasView::NoFrame ); view->show(); - TQTimer::singleShot( 2000, this, TQT_SLOT( showPercentage() ) ); + TQTimer::singleShot( 2000, this, TQ_SLOT( showPercentage() ) ); } /* show the main window and close the splah window */ diff --git a/kstars/kstars/addcatdialog.cpp b/kstars/kstars/addcatdialog.cpp index 2487a6f3..75810808 100644 --- a/kstars/kstars/addcatdialog.cpp +++ b/kstars/kstars/addcatdialog.cpp @@ -41,11 +41,11 @@ AddCatDialog::AddCatDialog( TQWidget *parent ) acd = new AddCatDialogUI(page); vlay->addWidget( acd ); - connect( acd->DataURL->lineEdit(), TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotShowDataFile() ) ); - connect( acd->DataURL, TQT_SIGNAL( urlSelected( const TQString & ) ), - this, TQT_SLOT( slotShowDataFile() ) ); - connect( acd->PreviewButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotPreviewCatalog() ) ); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotCreateCatalog() ) ); + connect( acd->DataURL->lineEdit(), TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotShowDataFile() ) ); + connect( acd->DataURL, TQ_SIGNAL( urlSelected( const TQString & ) ), + this, TQ_SLOT( slotShowDataFile() ) ); + connect( acd->PreviewButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotPreviewCatalog() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotCreateCatalog() ) ); acd->FieldList->insertItem( i18n( "ID Number" ) ); acd->FieldList->insertItem( i18n( "Right Ascension" ) ); diff --git a/kstars/kstars/addlinkdialog.cpp b/kstars/kstars/addlinkdialog.cpp index a52b6fc5..40ef152d 100644 --- a/kstars/kstars/addlinkdialog.cpp +++ b/kstars/kstars/addlinkdialog.cpp @@ -38,8 +38,8 @@ AddLinkDialog::AddLinkDialog( TQWidget *parent, const TQString &oname ) vlay->activate(); //connect signals to slots - connect( ald->URLButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( checkURL() ) ); - connect( ald->TypeBox, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( changeDefaultDescription( int ) ) ); + connect( ald->URLButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( checkURL() ) ); + connect( ald->TypeBox, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( changeDefaultDescription( int ) ) ); ald->ImageRadio->setChecked(true); ald->DescBox->setText( i18n( "Show image of " ) + ObjectName ); diff --git a/kstars/kstars/ccdpreviewwg.cpp b/kstars/kstars/ccdpreviewwg.cpp index 6d86c413..fc953a61 100644 --- a/kstars/kstars/ccdpreviewwg.cpp +++ b/kstars/kstars/ccdpreviewwg.cpp @@ -76,12 +76,12 @@ FILE *CCDwfp; imgFormatCombo->insertStrList(TQImage::outputFormats()); - connect(playB, TQT_SIGNAL(clicked()), this, TQT_SLOT(playPressed())); - connect(captureB, TQT_SIGNAL(clicked()), this, TQT_SLOT(captureImage())); - connect(brightnessBar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(brightnessChanged(int))); - connect(contrastBar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(contrastChanged(int))); - connect(gammaBar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(gammaChanged(int))); - connect(focalEdit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(updateFWHM())); + connect(playB, TQ_SIGNAL(clicked()), this, TQ_SLOT(playPressed())); + connect(captureB, TQ_SIGNAL(clicked()), this, TQ_SLOT(captureImage())); + connect(brightnessBar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(brightnessChanged(int))); + connect(contrastBar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(contrastChanged(int))); + connect(gammaBar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(gammaChanged(int))); + connect(focalEdit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(updateFWHM())); } CCDPreviewWG::~CCDPreviewWG() @@ -128,7 +128,7 @@ void CCDPreviewWG::setColorFrame(bool color) // callback notified sNotifier = new TQSocketNotifier( streamFD, TQSocketNotifier::Read, this); - TQObject::connect( sNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(streamReceived())); + TQObject::connect( sNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(streamReceived())); }*/ void CCDPreviewWG::enableStream(bool enable) diff --git a/kstars/kstars/conbridlg.cpp b/kstars/kstars/conbridlg.cpp index 2334d6f1..0a60d4c6 100644 --- a/kstars/kstars/conbridlg.cpp +++ b/kstars/kstars/conbridlg.cpp @@ -68,8 +68,8 @@ ContrastBrightnessDlg::ContrastBrightnessDlg(TQWidget *parent) : setMainWidget(ConBriDlg); show(); - connect(ConBriDlg->conSlider, TQT_SIGNAL( valueChanged(int)), this, TQT_SLOT (setContrast(int ))); - connect(ConBriDlg->briSlider, TQT_SIGNAL( valueChanged(int)), this, TQT_SLOT (setBrightness(int))); + connect(ConBriDlg->conSlider, TQ_SIGNAL( valueChanged(int)), this, TQ_SLOT (setContrast(int ))); + connect(ConBriDlg->briSlider, TQ_SIGNAL( valueChanged(int)), this, TQ_SLOT (setBrightness(int))); } diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp index d90131a3..af7f38e8 100644 --- a/kstars/kstars/detaildialog.cpp +++ b/kstars/kstars/detaildialog.cpp @@ -91,10 +91,10 @@ DetailDialog::DetailDialog(SkyObject *o, const KStarsDateTime &ut, GeoLocation * createLogTab(); //Connections - connect( Data->ObsListButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addToObservingList() ) ); - connect( Data->CenterButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( centerMap() ) ); - connect( Data->ScopeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( centerTelescope() ) ); - connect( Data->Image, TQT_SIGNAL( clicked() ), this, TQT_SLOT( updateThumbnail() ) ); + connect( Data->ObsListButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addToObservingList() ) ); + connect( Data->CenterButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( centerMap() ) ); + connect( Data->ScopeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( centerTelescope() ) ); + connect( Data->Image, TQ_SIGNAL( clicked() ), this, TQ_SLOT( updateThumbnail() ) ); } void DetailDialog::createGeneralTab() @@ -434,13 +434,13 @@ void DetailDialog::createLinksTab() } // Signals/Slots - connect( Links->ViewButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( viewLink() ) ); - connect( Links->AddLinkButton, TQT_SIGNAL(clicked()), ksw->map(), TQT_SLOT( addLink() ) ); - connect( Links->EditLinkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( editLinkDialog() ) ); - connect( Links->RemoveLinkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( removeLinkDialog() ) ); - connect( Links->InfoList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT( unselectImagesList() ) ); - connect( Links->ImagesList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT( unselectInfoList() ) ); - connect( ksw->map(), TQT_SIGNAL(linkAdded()), this, TQT_SLOT( updateLists() ) ); + connect( Links->ViewButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( viewLink() ) ); + connect( Links->AddLinkButton, TQ_SIGNAL(clicked()), ksw->map(), TQ_SLOT( addLink() ) ); + connect( Links->EditLinkButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( editLinkDialog() ) ); + connect( Links->RemoveLinkButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( removeLinkDialog() ) ); + connect( Links->InfoList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT( unselectImagesList() ) ); + connect( Links->ImagesList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT( unselectInfoList() ) ); + connect( ksw->map(), TQ_SIGNAL(linkAdded()), this, TQ_SLOT( updateLists() ) ); } void DetailDialog::createAdvancedTab() @@ -461,7 +461,7 @@ void DetailDialog::createAdvancedTab() vlay->addWidget( Adv ); treeIt = new TQPtrListIterator<ADVTreeData> (ksw->data()->ADVtreeList); - connect( Adv->ADVTree, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(viewADVData())); + connect( Adv->ADVTree, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, TQ_SLOT(viewADVData())); populateADVTree(NULL); } @@ -489,7 +489,7 @@ void DetailDialog::createLogTab() Log->UserLog->setText(selectedObject->userLog); //Automatically save the log contents when the widget loses focus - connect( Log->UserLog, TQT_SIGNAL( focusOut() ), this, TQT_SLOT( saveLogData() ) ); + connect( Log->UserLog, TQ_SIGNAL( focusOut() ), this, TQ_SLOT( saveLogData() ) ); } diff --git a/kstars/kstars/devicemanager.cpp b/kstars/kstars/devicemanager.cpp index c88e645d..df3380d5 100644 --- a/kstars/kstars/devicemanager.cpp +++ b/kstars/kstars/devicemanager.cpp @@ -109,7 +109,7 @@ bool DeviceManager::indiConnect(TQString inHost, TQString inPort) // callback notified sNotifier = new TQSocketNotifier( serverFD, TQSocketNotifier::Read, this); - TQObject::connect( sNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(dataReceived())); + TQObject::connect( sNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(dataReceived())); if (XMLParser) delLilXML(XMLParser); diff --git a/kstars/kstars/dmsbox.cpp b/kstars/kstars/dmsbox.cpp index 32fd2fd2..a0e1981d 100644 --- a/kstars/kstars/dmsbox.cpp +++ b/kstars/kstars/dmsbox.cpp @@ -33,7 +33,7 @@ dmsBox::dmsBox(TQWidget *parent, const char *name, bool dg) setDegType( dg ); - connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotTextChanged( const TQString & ) ) ); } void dmsBox::setEmptyText() { diff --git a/kstars/kstars/finddialog.cpp b/kstars/kstars/finddialog.cpp index f73c3b08..25f0683c 100644 --- a/kstars/kstars/finddialog.cpp +++ b/kstars/kstars/finddialog.cpp @@ -91,16 +91,16 @@ FindDialog::FindDialog( TQWidget* parent ) : Filter = 0; //Connect signals to slots -// connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() ) ) ; - connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( reject() ) ); - connect( SearchBox, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( filter() ) ); - connect( SearchBox, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotOk() ) ); - connect( filterType, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( setFilter( int ) ) ); - connect( SearchList, TQT_SIGNAL (selectionChanged (TQListBoxItem *)), TQT_SLOT (updateSelection (TQListBoxItem *))); - connect( SearchList, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ), TQT_SLOT( slotOk() ) ); +// connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( accept() ) ) ; + connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( reject() ) ); + connect( SearchBox, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( filter() ) ); + connect( SearchBox, TQ_SIGNAL( returnPressed() ), TQ_SLOT( slotOk() ) ); + connect( filterType, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( setFilter( int ) ) ); + connect( SearchList, TQ_SIGNAL (selectionChanged (TQListBoxItem *)), TQ_SLOT (updateSelection (TQListBoxItem *))); + connect( SearchList, TQ_SIGNAL( doubleClicked ( TQListBoxItem * ) ), TQ_SLOT( slotOk() ) ); // first create and paint dialog and then load list - TQTimer::singleShot(0, this, TQT_SLOT( init() )); + TQTimer::singleShot(0, this, TQ_SLOT( init() )); } FindDialog::~FindDialog() { @@ -182,14 +182,14 @@ void FindDialog::setFilter( int f ) { Filter = f2; if ( Filter == 0 ) { // any type will shown // delete old connections and create new connections - disconnect( SearchBox, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( filterByType() ) ); - connect( SearchBox, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( filter() ) ); + disconnect( SearchBox, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( filterByType() ) ); + connect( SearchBox, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( filter() ) ); filter(); } else { // delete old connections and create new connections - disconnect( SearchBox, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( filter() ) ); - connect( SearchBox, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( filterByType() ) ); + disconnect( SearchBox, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( filter() ) ); + connect( SearchBox, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( filterByType() ) ); filterByType(); } } diff --git a/kstars/kstars/fitshistogram.cpp b/kstars/kstars/fitshistogram.cpp index 55f634a1..aea3730e 100644 --- a/kstars/kstars/fitshistogram.cpp +++ b/kstars/kstars/fitshistogram.cpp @@ -58,11 +58,11 @@ histFrame->setMouseTracking(true); setMouseTracking(true); - connect(minSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateBoxes())); - connect(minSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateIntenFreq(int ))); - connect(maxSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateBoxes())); - connect(maxSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateIntenFreq(int ))); - connect(applyB, TQT_SIGNAL(clicked()), this, TQT_SLOT(applyScale())); + connect(minSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateBoxes())); + connect(minSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateIntenFreq(int ))); + connect(maxSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateBoxes())); + connect(maxSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateIntenFreq(int ))); + connect(applyB, TQ_SIGNAL(clicked()), this, TQ_SLOT(applyScale())); constructHistogram(viewer->imgBuffer); diff --git a/kstars/kstars/fitsviewer.cpp b/kstars/kstars/fitsviewer.cpp index 0289a430..9a9b3f62 100644 --- a/kstars/kstars/fitsviewer.cpp +++ b/kstars/kstars/fitsviewer.cpp @@ -105,7 +105,7 @@ FITSViewer::FITSViewer (const KURL *url, TQWidget *parent, const char *name) history->setUndoLimit(10); history->setRedoLimit(10); history->documentSaved(); - connect(history, TQT_SIGNAL(documentRestored()), this, TQT_SLOT(fitsRestore())); + connect(history, TQ_SIGNAL(documentRestored()), this, TQ_SLOT(fitsRestore())); /* Setup image widget */ image = new FITSImage(this); @@ -131,39 +131,39 @@ FITSViewer::FITSViewer (const KURL *url, TQWidget *parent, const char *name) if (KSUtils::openDataFile( tempFile, "imgreduction.png" ) ) { - new TDEAction( i18n("Image Reduction"), tempFile.name(), TDEShortcut( "Ctrl+R" ), this, TQT_SLOT( imageReduction()), actionCollection(), "image_reduce"); + new TDEAction( i18n("Image Reduction"), tempFile.name(), TDEShortcut( "Ctrl+R" ), this, TQ_SLOT( imageReduction()), actionCollection(), "image_reduce"); tempFile.close(); } else - new TDEAction( i18n("Image Reduction"), "blend", TDEShortcut( "Ctrl+R" ), this, TQT_SLOT( imageReduction()), actionCollection(), "image_reduce"); + new TDEAction( i18n("Image Reduction"), "blend", TDEShortcut( "Ctrl+R" ), this, TQ_SLOT( imageReduction()), actionCollection(), "image_reduce"); /*if (KSUtils::openDataFile( tempFile, "bricon.png" ) ) { - new TDEAction( i18n("Brightness/Contrast"), tempFile.name(), TDEShortcut( "Ctrl+T" ), this, TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); + new TDEAction( i18n("Brightness/Contrast"), tempFile.name(), TDEShortcut( "Ctrl+T" ), this, TQ_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); tempFile.close(); } else*/ - new TDEAction( i18n("Brightness/Contrast"), "contrast+", TDEShortcut( "Ctrl+T" ), this, TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); + new TDEAction( i18n("Brightness/Contrast"), "contrast+", TDEShortcut( "Ctrl+T" ), this, TQ_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); if (KSUtils::openDataFile( tempFile, "histogram.png" ) ) { - new TDEAction ( i18n("Histogram"), tempFile.name(), TDEShortcut("Ctrl+H"), this, TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram"); + new TDEAction ( i18n("Histogram"), tempFile.name(), TDEShortcut("Ctrl+H"), this, TQ_SLOT (imageHistogram()), actionCollection(), "image_histogram"); tempFile.close(); } else - new TDEAction ( i18n("Histogram"), "wizard", TDEShortcut("Ctrl+H"), this, TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram"); + new TDEAction ( i18n("Histogram"), "wizard", TDEShortcut("Ctrl+H"), this, TQ_SLOT (imageHistogram()), actionCollection(), "image_histogram"); - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::close(this, TQT_SLOT(slotClose()), actionCollection()); - KStdAction::copy(this, TQT_SLOT(fitsCOPY()), actionCollection()); - KStdAction::zoomIn(image, TQT_SLOT(fitsZoomIn()), actionCollection()); - KStdAction::zoomOut(image, TQT_SLOT(fitsZoomOut()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + KStdAction::close(this, TQ_SLOT(slotClose()), actionCollection()); + KStdAction::copy(this, TQ_SLOT(fitsCOPY()), actionCollection()); + KStdAction::zoomIn(image, TQ_SLOT(fitsZoomIn()), actionCollection()); + KStdAction::zoomOut(image, TQ_SLOT(fitsZoomOut()), actionCollection()); new TDEAction( i18n( "&Default Zoom" ), "viewmagfit.png", TDEShortcut( "Ctrl+D" ), - image, TQT_SLOT(fitsZoomDefault()), actionCollection(), "zoom_default" ); - new TDEAction( i18n( "Statistics"), "sum", 0, this, TQT_SLOT(fitsStatistics()), actionCollection(), "image_stats"); - new TDEAction( i18n( "FITS Header"), "frame_spreadsheet.png", 0, this, TQT_SLOT(fitsHeader()), actionCollection(), "fits_editor"); + image, TQ_SLOT(fitsZoomDefault()), actionCollection(), "zoom_default" ); + new TDEAction( i18n( "Statistics"), "sum", 0, this, TQ_SLOT(fitsStatistics()), actionCollection(), "image_stats"); + new TDEAction( i18n( "FITS Header"), "frame_spreadsheet.png", 0, this, TQ_SLOT(fitsHeader()), actionCollection(), "fits_editor"); /* Create GUI */ createGUI("fitsviewer.rc"); diff --git a/kstars/kstars/focusdialog.cpp b/kstars/kstars/focusdialog.cpp index fcd468eb..3dcfbf3a 100644 --- a/kstars/kstars/focusdialog.cpp +++ b/kstars/kstars/focusdialog.cpp @@ -45,11 +45,11 @@ FocusDialog::FocusDialog( TQWidget *parent ) fdlg->epochName->setValidator( new KDoubleValidator( fdlg->epochName ) ); vlay->addWidget( fdlg ); - connect( fdlg->raBox, TQT_SIGNAL(textChanged( const TQString & ) ), this, TQT_SLOT( checkLineEdits() ) ); - connect( fdlg->decBox, TQT_SIGNAL(textChanged( const TQString & ) ), this, TQT_SLOT( checkLineEdits() ) ); - connect( fdlg->azBox, TQT_SIGNAL(textChanged( const TQString & ) ), this, TQT_SLOT( checkLineEdits() ) ); - connect( fdlg->altBox, TQT_SIGNAL(textChanged( const TQString & ) ), this, TQT_SLOT( checkLineEdits() ) ); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( validatePoint() ) ); + connect( fdlg->raBox, TQ_SIGNAL(textChanged( const TQString & ) ), this, TQ_SLOT( checkLineEdits() ) ); + connect( fdlg->decBox, TQ_SIGNAL(textChanged( const TQString & ) ), this, TQ_SLOT( checkLineEdits() ) ); + connect( fdlg->azBox, TQ_SIGNAL(textChanged( const TQString & ) ), this, TQ_SLOT( checkLineEdits() ) ); + connect( fdlg->altBox, TQ_SIGNAL(textChanged( const TQString & ) ), this, TQ_SLOT( checkLineEdits() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( validatePoint() ) ); fdlg->raBox->setDegType(false); //RA box should be HMS-style fdlg->raBox->setFocus(); //set input focus diff --git a/kstars/kstars/fovdialog.cpp b/kstars/kstars/fovdialog.cpp index de6afaba..2f3cf842 100644 --- a/kstars/kstars/fovdialog.cpp +++ b/kstars/kstars/fovdialog.cpp @@ -49,10 +49,10 @@ FOVDialog::FOVDialog( TQWidget *parent ) fov = new FOVDialogUI( page ); vlay->addWidget( fov ); - connect( fov->FOVListBox, TQT_SIGNAL( currentChanged( TQListBoxItem* ) ), TQT_SLOT( slotSelect( TQListBoxItem* ) ) ); - connect( fov->NewButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotNewFOV() ) ); - connect( fov->EditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditFOV() ) ); - connect( fov->RemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemoveFOV() ) ); + connect( fov->FOVListBox, TQ_SIGNAL( currentChanged( TQListBoxItem* ) ), TQ_SLOT( slotSelect( TQListBoxItem* ) ) ); + connect( fov->NewButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotNewFOV() ) ); + connect( fov->EditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditFOV() ) ); + connect( fov->RemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemoveFOV() ) ); FOVList.setAutoDelete( true ); initList(); @@ -199,13 +199,13 @@ NewFOV::NewFOV( TQWidget *parent ) ui = new NewFOVUI( page ); vlay->addWidget( ui ); - connect( ui->FOVName, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotUpdateFOV() ) ); - connect( ui->FOVEdit, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotUpdateFOV() ) ); - connect( ui->ColorButton, TQT_SIGNAL( changed( const TQColor & ) ), TQT_SLOT( slotUpdateFOV() ) ); - connect( ui->ShapeBox, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotUpdateFOV() ) ); - connect( ui->ComputeEyeFOV, TQT_SIGNAL( clicked() ), TQT_SLOT( slotComputeFOV() ) ); - connect( ui->ComputeCameraFOV, TQT_SIGNAL( clicked() ), TQT_SLOT( slotComputeFOV() ) ); - connect( ui->ComputeHPBW, TQT_SIGNAL( clicked() ), TQT_SLOT( slotComputeFOV() ) ); + connect( ui->FOVName, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotUpdateFOV() ) ); + connect( ui->FOVEdit, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotUpdateFOV() ) ); + connect( ui->ColorButton, TQ_SIGNAL( changed( const TQColor & ) ), TQ_SLOT( slotUpdateFOV() ) ); + connect( ui->ShapeBox, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotUpdateFOV() ) ); + connect( ui->ComputeEyeFOV, TQ_SIGNAL( clicked() ), TQ_SLOT( slotComputeFOV() ) ); + connect( ui->ComputeCameraFOV, TQ_SIGNAL( clicked() ), TQ_SLOT( slotComputeFOV() ) ); + connect( ui->ComputeHPBW, TQ_SIGNAL( clicked() ), TQ_SLOT( slotComputeFOV() ) ); slotUpdateFOV(); } diff --git a/kstars/kstars/imagereductiondlg.cpp b/kstars/kstars/imagereductiondlg.cpp index f5776c8c..08e28f39 100644 --- a/kstars/kstars/imagereductiondlg.cpp +++ b/kstars/kstars/imagereductiondlg.cpp @@ -26,15 +26,15 @@ ImageReductionDlg::ImageReductionDlg(TQWidget * parent, const char * name) : imageReductionUI(parent, name) { - connect(darkAddB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addDarkFile())); - connect(flatAddB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addFlatFile())); - connect(darkRemoveB, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeDarkFile())); - connect(flatRemoveB, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeFlatFile())); - connect(darkDetailsB, TQT_SIGNAL(clicked()), this, TQT_SLOT(detailsDarkFile())); - connect(flatDetailsB, TQT_SIGNAL(clicked()), this, TQT_SLOT(detailsFlatFile())); - connect(darkflatAddB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addDarkFlatFile())); - connect(darkflatRemoveB, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeDarkFlatFile())); - connect(darkflatDetailsB, TQT_SIGNAL(clicked()), this, TQT_SLOT(detailsDarkFlatFile())); + connect(darkAddB, TQ_SIGNAL(clicked()), this, TQ_SLOT(addDarkFile())); + connect(flatAddB, TQ_SIGNAL(clicked()), this, TQ_SLOT(addFlatFile())); + connect(darkRemoveB, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeDarkFile())); + connect(flatRemoveB, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeFlatFile())); + connect(darkDetailsB, TQ_SIGNAL(clicked()), this, TQ_SLOT(detailsDarkFile())); + connect(flatDetailsB, TQ_SIGNAL(clicked()), this, TQ_SLOT(detailsFlatFile())); + connect(darkflatAddB, TQ_SIGNAL(clicked()), this, TQ_SLOT(addDarkFlatFile())); + connect(darkflatRemoveB, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeDarkFlatFile())); + connect(darkflatDetailsB, TQ_SIGNAL(clicked()), this, TQ_SLOT(detailsDarkFlatFile())); darkListView->setSorting(-1); flatListView->setSorting(-1); diff --git a/kstars/kstars/imagesequence.cpp b/kstars/kstars/imagesequence.cpp index a05b65ad..6e98b10f 100644 --- a/kstars/kstars/imagesequence.cpp +++ b/kstars/kstars/imagesequence.cpp @@ -46,8 +46,8 @@ imagesequence::imagesequence(TQWidget* parent, const char* name, bool modal, WFl if (devMenu) { - connect (devMenu, TQT_SIGNAL(newDevice()), this, TQT_SLOT(newCCD())); - connect (devMenu, TQT_SIGNAL(newDevice()), this, TQT_SLOT(newFilter())); + connect (devMenu, TQ_SIGNAL(newDevice()), this, TQ_SLOT(newCCD())); + connect (devMenu, TQ_SIGNAL(newDevice()), this, TQ_SLOT(newFilter())); } seqTimer = new TQTimer(this); @@ -55,12 +55,12 @@ imagesequence::imagesequence(TQWidget* parent, const char* name, bool modal, WFl setModal(false); // Connect signals and slots - connect(startB, TQT_SIGNAL(clicked()), this, TQT_SLOT(startSequence())); - connect(stopB, TQT_SIGNAL(clicked()), this, TQT_SLOT(stopSequence())); - connect(closeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(close())); - connect(seqTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(prepareCapture())); - connect(CCDCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(checkCCD(int))); - connect(filterCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateFilterCombo(int))); + connect(startB, TQ_SIGNAL(clicked()), this, TQ_SLOT(startSequence())); + connect(stopB, TQ_SIGNAL(clicked()), this, TQ_SLOT(stopSequence())); + connect(closeB, TQ_SIGNAL(clicked()), this, TQ_SLOT(close())); + connect(seqTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(prepareCapture())); + connect(CCDCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(checkCCD(int))); + connect(filterCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateFilterCombo(int))); active = false; ISOStamp = false; @@ -253,7 +253,7 @@ void imagesequence::startSequence() currentImgCountOUT->setText(TQString("%1").arg(seqCurrentCount)); // Ok, now let's connect signals and slots for this device - connect(stdDevCCD, TQT_SIGNAL(FITSReceived(TQString)), this, TQT_SLOT(newFITS(TQString))); + connect(stdDevCCD, TQ_SIGNAL(FITSReceived(TQString)), this, TQ_SLOT(newFITS(TQString))); // set the progress info imgProgress->setEnabled(true); @@ -294,7 +294,7 @@ void imagesequence::stopSequence() stdDevCCD->batchMode = false; stdDevCCD->ISOMode = false; - stdDevCCD->disconnect( TQT_SIGNAL(FITSReceived(TQString))); + stdDevCCD->disconnect( TQ_SIGNAL(FITSReceived(TQString))); } } @@ -358,7 +358,7 @@ void imagesequence::newFITS(TQString deviceLabel) seqTimer->stop(); if (stdDevCCD) - stdDevCCD->disconnect( TQT_SIGNAL(FITSReceived(TQString))); + stdDevCCD->disconnect( TQ_SIGNAL(FITSReceived(TQString))); resetButtons(); } @@ -469,7 +469,7 @@ bool imagesequence::verifyFilterIntegrity() return false; } - // #3 Make sure it has FILTER_SLOT std property by searching for its TQT_SLOT element + // #3 Make sure it has FILTER_SLOT std property by searching for its SLOT element filterElem = filterDevice->findElem("SLOT"); if (filterElem == NULL) { @@ -507,7 +507,7 @@ void imagesequence::prepareCapture() if ( stdDevFilter && ((tempProp = stdDevFilter->dp->findProp("FILTER_SLOT")) != NULL)) { - connect (tempProp, TQT_SIGNAL(okState()), this, TQT_SLOT(captureImage())); + connect (tempProp, TQ_SIGNAL(okState()), this, TQ_SLOT(captureImage())); selectFilter(); } else @@ -531,7 +531,7 @@ void imagesequence::captureImage() // D. The property has been lost. if ( stdDevFilter && ((tempProp = stdDevFilter->dp->findProp("FILTER_SLOT")) != NULL)) - tempProp->disconnect( TQT_SIGNAL (okState())); + tempProp->disconnect( TQ_SIGNAL (okState())); if (!verifyCCDIntegrity()) { diff --git a/kstars/kstars/imageviewer.cpp b/kstars/kstars/imageviewer.cpp index 265d8021..fa6194c2 100644 --- a/kstars/kstars/imageviewer.cpp +++ b/kstars/kstars/imageviewer.cpp @@ -37,9 +37,9 @@ ImageViewer::ImageViewer (const KURL *url, const TQString &capText, TQWidget *pa // JH: easier to just disable its mobility toolBar()->setMovingEnabled( false ); - TDEAction *action = new TDEAction (i18n ("Close Window"), "window-close", CTRL+Key_Q, this, TQT_SLOT (close()), actionCollection()); + TDEAction *action = new TDEAction (i18n ("Close Window"), "window-close", CTRL+Key_Q, this, TQ_SLOT (close()), actionCollection()); action->plug (toolBar()); - action = new TDEAction (i18n ("Save Image"), "document-save", CTRL+Key_S, this, TQT_SLOT (saveFileToDisc()), actionCollection()); + action = new TDEAction (i18n ("Save Image"), "document-save", CTRL+Key_S, this, TQ_SLOT (saveFileToDisc()), actionCollection()); action->plug (toolBar()); statusBar()->insertItem( capText, 0, 1, true ); @@ -132,7 +132,7 @@ void ImageViewer::loadImageFromURL() kdDebug()<<"tempfile-URL is malformed\n"; downloadJob = TDEIO::copy (imageURL, saveURL); // starts the download asynchron - connect (downloadJob, TQT_SIGNAL (result (TDEIO::Job *)), TQT_SLOT (downloadReady (TDEIO::Job *))); + connect (downloadJob, TQ_SIGNAL (result (TDEIO::Job *)), TQ_SLOT (downloadReady (TDEIO::Job *))); } void ImageViewer::downloadReady (TDEIO::Job *job) diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp index ae5997f1..9729ae76 100644 --- a/kstars/kstars/indidriver.cpp +++ b/kstars/kstars/indidriver.cpp @@ -96,28 +96,28 @@ INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent ) lastGroup = NULL; - TQObject::connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addINDIHost())); - TQObject::connect(modifyB, TQT_SIGNAL(clicked()), this, TQT_SLOT(modifyINDIHost())); - TQObject::connect(removeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeINDIHost())); + TQObject::connect(addB, TQ_SIGNAL(clicked()), this, TQ_SLOT(addINDIHost())); + TQObject::connect(modifyB, TQ_SIGNAL(clicked()), this, TQ_SLOT(modifyINDIHost())); + TQObject::connect(removeB, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeINDIHost())); - TQObject::connect(clientListView, TQT_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(ClientprocessRightButton( TQListViewItem *, const TQPoint &, int ))); + TQObject::connect(clientListView, TQ_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQ_SLOT(ClientprocessRightButton( TQListViewItem *, const TQPoint &, int ))); -TQObject::connect(ClientpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processHostStatus(int))); +TQObject::connect(ClientpopMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(processHostStatus(int))); -TQObject::connect(localListView, TQT_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(LocalprocessRightButton( TQListViewItem *, const TQPoint &, int ))); +TQObject::connect(localListView, TQ_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQ_SLOT(LocalprocessRightButton( TQListViewItem *, const TQPoint &, int ))); -TQObject::connect(LocalpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processDeviceStatus(int))); +TQObject::connect(LocalpopMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(processDeviceStatus(int))); -TQObject::connect(ksw->getINDIMenu(), TQT_SIGNAL(driverDisconnected(int)), this, TQT_SLOT(shutdownHost(int))); +TQObject::connect(ksw->getINDIMenu(), TQ_SIGNAL(driverDisconnected(int)), this, TQ_SLOT(shutdownHost(int))); -TQObject::connect(connectHostB, TQT_SIGNAL(clicked()), this, TQT_SLOT(activateHostConnection())); -TQObject::connect(disconnectHostB, TQT_SIGNAL(clicked()), this, TQT_SLOT(activateHostDisconnection())); +TQObject::connect(connectHostB, TQ_SIGNAL(clicked()), this, TQ_SLOT(activateHostConnection())); +TQObject::connect(disconnectHostB, TQ_SIGNAL(clicked()), this, TQ_SLOT(activateHostDisconnection())); -TQObject::connect(runServiceB, TQT_SIGNAL(clicked()), this, TQT_SLOT(activateRunService())); -TQObject::connect(stopServiceB, TQT_SIGNAL(clicked()), this, TQT_SLOT(activateStopService())); +TQObject::connect(runServiceB, TQ_SIGNAL(clicked()), this, TQ_SLOT(activateRunService())); +TQObject::connect(stopServiceB, TQ_SIGNAL(clicked()), this, TQ_SLOT(activateStopService())); -TQObject::connect(localListView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateLocalButtons())); -TQObject::connect(clientListView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateClientButtons())); +TQObject::connect(localListView, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(updateLocalButtons())); +TQObject::connect(clientListView, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(updateClientButtons())); readXMLDriver(); resize( 500, 300); @@ -415,7 +415,7 @@ bool INDIDriver::runDevice(IDevice *dev) else localListView->selectedItem()->setPixmap(2, serverMode); - connect(dev->proc, TQT_SIGNAL(receivedStderr (TDEProcess *, char *, int)), dev, TQT_SLOT(processstd(TDEProcess *, char*, int))); + connect(dev->proc, TQ_SIGNAL(receivedStderr (TDEProcess *, char *, int)), dev, TQ_SLOT(processstd(TDEProcess *, char*, int))); dev->proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr); //dev->proc->start(); @@ -724,7 +724,7 @@ bool INDIDriver::buildDriverElement(XMLEle *root, TQListViewItem *DGroup, int gr dv = new IDevice(label, driver, version); dv->deviceType = groupType; - connect(dv, TQT_SIGNAL(newServerInput()), this, TQT_SLOT(updateLocalButtons())); + connect(dv, TQ_SIGNAL(newServerInput()), this, TQ_SLOT(updateLocalButtons())); if (focal_length > 0) dv->focal_length = focal_length; if (aperture > 0) @@ -732,7 +732,7 @@ bool INDIDriver::buildDriverElement(XMLEle *root, TQListViewItem *DGroup, int gr devices.push_back(dv); - // SLOTS/SIGNAL, pop menu, indi server logic + // SLOTS/TQ_SIGNAL, pop menu, indi server logic return true; } diff --git a/kstars/kstars/indielement.cpp b/kstars/kstars/indielement.cpp index 83ca370b..a69fa2cc 100644 --- a/kstars/kstars/indielement.cpp +++ b/kstars/kstars/indielement.cpp @@ -289,8 +289,8 @@ int steps = (int) ((max - min) / step); spin_w = new KDoubleSpinBox(min, max, step, value, 2, pp->pg->propertyContainer ); slider_w = new TQSlider(0, steps, 1, (int) ((value - min) / step), TQt::Horizontal, pp->pg->propertyContainer ); -connect(spin_w, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(spinChanged(double ))); -connect(slider_w, TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(sliderChanged(int ))); +connect(spin_w, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(spinChanged(double ))); +connect(slider_w, TQ_SIGNAL(sliderMoved(int)), this, TQ_SLOT(sliderChanged(int ))); //kdDebug() << "For element " << label << " we have step of " << step << endl; @@ -363,7 +363,7 @@ void INDI_E::setupElementWrite(int length) write_w->setMinimumWidth( length ); write_w->setMaximumWidth( length); - TQObject::connect(write_w, TQT_SIGNAL(returnPressed()), pp, TQT_SLOT(newText())); + TQObject::connect(write_w, TQ_SIGNAL(returnPressed()), pp, TQ_SLOT(newText())); EHBox->addWidget(write_w); } @@ -393,7 +393,7 @@ void INDI_E::setupBrowseButton() browse_w->setMaximumWidth( MAX_SET_WIDTH ); EHBox->addWidget(browse_w); - TQObject::connect(browse_w, TQT_SIGNAL(clicked()), this, TQT_SLOT(browseBlob())); + TQObject::connect(browse_w, TQ_SIGNAL(clicked()), this, TQ_SLOT(browseBlob())); } diff --git a/kstars/kstars/indifitsconf.cpp b/kstars/kstars/indifitsconf.cpp index 83779bb1..e362d805 100644 --- a/kstars/kstars/indifitsconf.cpp +++ b/kstars/kstars/indifitsconf.cpp @@ -29,8 +29,8 @@ INDIFITSConf::INDIFITSConf(TQWidget* parent, const char* name, bool modal, WFlag TDEIconLoader *icons = TDEGlobal::iconLoader(); selectDirB->setPixmap( icons->loadIcon( "document-open", TDEIcon::Toolbar ) ); - connect(selectDirB, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveFITSDirectory())); - connect(filterCombo, TQT_SIGNAL(activated (int)), this, TQT_SLOT(comboUpdate(int))); + connect(selectDirB, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveFITSDirectory())); + connect(filterCombo, TQ_SIGNAL(activated (int)), this, TQ_SLOT(comboUpdate(int))); } diff --git a/kstars/kstars/indimenu.cpp b/kstars/kstars/indimenu.cpp index 8a4df6d2..b1a59593 100644 --- a/kstars/kstars/indimenu.cpp +++ b/kstars/kstars/indimenu.cpp @@ -127,8 +127,8 @@ DeviceManager *dev; drivers->devices[i]->mgrID = mgrCounter; drivers->devices[i]->managed = true; mgr.append(dev); - connect(dev, TQT_SIGNAL(newDevice()), drivers, TQT_SLOT(updateMenuActions())); - connect(dev, TQT_SIGNAL(newDevice()), this, TQT_SLOT(discoverDevice())); + connect(dev, TQ_SIGNAL(newDevice()), drivers, TQ_SLOT(updateMenuActions())); + connect(dev, TQ_SIGNAL(newDevice()), this, TQ_SLOT(discoverDevice())); mgrCounter++; @@ -165,8 +165,8 @@ int INDIMenu::processClient(TQString hostname, TQString portnumber) mgr.append(dev); if (drivers) { - connect(dev, TQT_SIGNAL(newDevice()), drivers, TQT_SLOT(updateMenuActions())); - connect(dev, TQT_SIGNAL(newDevice()), this, TQT_SLOT(discoverDevice())); + connect(dev, TQ_SIGNAL(newDevice()), drivers, TQ_SLOT(updateMenuActions())); + connect(dev, TQ_SIGNAL(newDevice()), this, TQ_SLOT(discoverDevice())); } } else @@ -234,7 +234,7 @@ else void INDIMenu::discoverDevice() { - TQTimer::singleShot( 1000, this, TQT_SLOT(announceDevice()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(announceDevice()) ); } void INDIMenu::announceDevice() diff --git a/kstars/kstars/indiproperty.cpp b/kstars/kstars/indiproperty.cpp index 85899ce3..9603e201 100644 --- a/kstars/kstars/indiproperty.cpp +++ b/kstars/kstars/indiproperty.cpp @@ -126,7 +126,7 @@ void INDI_P::drawLt(PState lstate) case PS_OK: light->setColor(TQt::green); emit okState(); - disconnect( this, TQT_SIGNAL(okState()), 0, 0 ); + disconnect( this, TQ_SIGNAL(okState()), 0, 0 ); break; case PS_BUSY: @@ -508,12 +508,12 @@ int INDI_P::buildTextGUI(XMLEle *root, char errmsg[]) if (name == "TIME") { setupSetButton("Time"); - TQObject::connect(set_w, TQT_SIGNAL(clicked()), indistd, TQT_SLOT(newTime())); + TQObject::connect(set_w, TQ_SIGNAL(clicked()), indistd, TQ_SLOT(newTime())); } else { setupSetButton("Set"); - TQObject::connect(set_w, TQT_SIGNAL(clicked()), this, TQT_SLOT(newText())); + TQObject::connect(set_w, TQ_SIGNAL(clicked()), this, TQ_SLOT(newText())); } return 0; @@ -591,7 +591,7 @@ int INDI_P::buildNumberGUI (XMLEle *root, char errmsg[]) else setupSetButton("Set"); - TQObject::connect(set_w, TQT_SIGNAL(clicked()), this, TQT_SLOT(newText())); + TQObject::connect(set_w, TQ_SIGNAL(clicked()), this, TQ_SLOT(newText())); return (0); } @@ -682,7 +682,7 @@ int INDI_P::buildMenuGUI(XMLEle *root, char errmsg[]) PHBox->addWidget(om_w); PHBox->addItem(HorSpacer); - TQObject::connect(om_w, TQT_SIGNAL(activated(int)), this, TQT_SLOT(newSwitch(int))); + TQObject::connect(om_w, TQ_SIGNAL(activated(int)), this, TQ_SLOT(newSwitch(int))); return (0); } @@ -703,7 +703,7 @@ int INDI_P::buildSwitchesGUI(XMLEle *root, char errmsg[]) if (guitype == PG_BUTTONS) groupB->setExclusive(true); - TQObject::connect(groupB, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(newSwitch(int))); + TQObject::connect(groupB, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(newSwitch(int))); for (sep = nextXMLEle (root, 1), j=-1; sep != NULL; sep = nextXMLEle (root, 0)) { @@ -900,7 +900,7 @@ int INDI_P::buildBLOBGUI(XMLEle *root, char errmsg[]) return 0; setupSetButton(i18n("Upload")); - TQObject::connect(set_w, TQT_SIGNAL(clicked()), this, TQT_SLOT(newBlob())); + TQObject::connect(set_w, TQ_SIGNAL(clicked()), this, TQ_SLOT(newBlob())); return 0; diff --git a/kstars/kstars/indistd.cpp b/kstars/kstars/indistd.cpp index 6bfe8ef9..cc009405 100644 --- a/kstars/kstars/indistd.cpp +++ b/kstars/kstars/indistd.cpp @@ -77,8 +77,8 @@ telescopeSkyObject = new SkyObject(0, 0, 0, 0, i18n("Telescope")); ksw->data()->appendTelescopeObject(telescopeSkyObject); - connect( devTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerDone()) ); - connect( seqLister, TQT_SIGNAL(newItems (const KFileItemList & )), this, TQT_SLOT(checkSeqBoundary(const KFileItemList &))); + connect( devTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerDone()) ); + connect( seqLister, TQ_SIGNAL(newItems (const KFileItemList & )), this, TQ_SLOT(checkSeqBoundary(const KFileItemList &))); downloadDialog = new KProgressDialog(NULL, 0, i18n("INDI"), i18n("Downloading Data...")); downloadDialog->cancel(); diff --git a/kstars/kstars/ksnewstuff.cpp b/kstars/kstars/ksnewstuff.cpp index eaf455df..9a028f05 100644 --- a/kstars/kstars/ksnewstuff.cpp +++ b/kstars/kstars/ksnewstuff.cpp @@ -58,7 +58,7 @@ bool KSNewStuff::install( const TQString &fileName ) TDEStandardDirs::makeDir( destDir ); //monitor destDir for changes; inform updateData when files are created. - connect( kdw, TQT_SIGNAL( dirty( const TQString & ) ), this, TQT_SLOT( updateData( const TQString & ) ) ); + connect( kdw, TQ_SIGNAL( dirty( const TQString & ) ), this, TQ_SLOT( updateData( const TQString & ) ) ); archiveDir->copyTo(destDir); archive.close(); @@ -105,8 +105,8 @@ void KSNewStuff::updateData( const TQString &path ) { ks->data()->deepSkyList.clear(); //Send progress messages to the console - connect( ks->data(), TQT_SIGNAL( progressText(TQString) ), ks->data(), TQT_SLOT( slotConsoleMessage(TQString) ) ); - connect( ks->data(), TQT_SIGNAL( progressText(TQString) ), ks->data(), TQT_SLOT( slotProcessEvents() ) ); + connect( ks->data(), TQ_SIGNAL( progressText(TQString) ), ks->data(), TQ_SLOT( slotConsoleMessage(TQString) ) ); + connect( ks->data(), TQ_SIGNAL( progressText(TQString) ), ks->data(), TQ_SLOT( slotProcessEvents() ) ); //We are now ready to read the new NGC/IC catalog ks->data()->readDeepSkyData(); @@ -150,7 +150,7 @@ void KSNewStuff::updateData( const TQString &path ) { ks->data()->cometList.clear(); //Send progress messages to the console - connect( ks->data(), TQT_SIGNAL( progressText(TQString) ), ks->data(), TQT_SLOT( slotConsoleMessage(TQString) ) ); + connect( ks->data(), TQ_SIGNAL( progressText(TQString) ), ks->data(), TQ_SLOT( slotConsoleMessage(TQString) ) ); //add new asteroids and comets ks->data()->readAsteroidData(); diff --git a/kstars/kstars/kspopupmenu.cpp b/kstars/kstars/kspopupmenu.cpp index 80125fbe..0d7872bb 100644 --- a/kstars/kstars/kspopupmenu.cpp +++ b/kstars/kstars/kspopupmenu.cpp @@ -45,8 +45,8 @@ KSPopupMenu::~KSPopupMenu() void KSPopupMenu::createEmptyMenu( SkyObject *nullObj ) { initPopupMenu( nullObj, i18n( "Empty sky" ), TQString(), TQString(), true, true, false, false, false, true, false ); - insertItem( i18n( "First Generation Digitized Sky Survey", "Show 1st-Gen DSS Image" ), ksw->map(), TQT_SLOT( slotDSS() ) ); - insertItem( i18n( "Second Generation Digitized Sky Survey", "Show 2nd-Gen DSS Image" ), ksw->map(), TQT_SLOT( slotDSS2() ) ); + insertItem( i18n( "First Generation Digitized Sky Survey", "Show 1st-Gen DSS Image" ), ksw->map(), TQ_SLOT( slotDSS() ) ); + insertItem( i18n( "Second Generation Digitized Sky Survey", "Show 2nd-Gen DSS Image" ), ksw->map(), TQ_SLOT( slotDSS2() ) ); } void KSPopupMenu::createStarMenu( StarObject *star ) { @@ -58,8 +58,8 @@ void KSPopupMenu::createStarMenu( StarObject *star ) { if ( star->name() != "star" ) { addLinksToMenu( star ); } else { - insertItem( i18n( "First Generation Digitized Sky Survey", "Show 1st-Gen DSS Image" ), ksw->map(), TQT_SLOT( slotDSS() ) ); - insertItem( i18n( "Second Generation Digitized Sky Survey", "Show 2nd-Gen DSS Image" ), ksw->map(), TQT_SLOT( slotDSS2() ) ); + insertItem( i18n( "First Generation Digitized Sky Survey", "Show 1st-Gen DSS Image" ), ksw->map(), TQ_SLOT( slotDSS() ) ); + insertItem( i18n( "Second Generation Digitized Sky Survey", "Show 2nd-Gen DSS Image" ), ksw->map(), TQ_SLOT( slotDSS2() ) ); } } @@ -104,13 +104,13 @@ void KSPopupMenu::addLinksToMenu( SkyObject *obj, bool showDSS, bool allowCustom for ( ; itList != itListEnd; ++itList ) { TQString t = TQString(*itTitle); sURL = TQString(*itList); - insertItem( i18n( "Image/info menu item (should be translated)", t.local8Bit() ), ksw->map(), TQT_SLOT( slotImage( int ) ), 0, id++ ); + insertItem( i18n( "Image/info menu item (should be translated)", t.local8Bit() ), ksw->map(), TQ_SLOT( slotImage( int ) ), 0, id++ ); ++itTitle; } if ( showDSS ) { - insertItem( i18n( "First Generation Digitized Sky Survey", "Show 1st-Gen DSS Image" ), ksw->map(), TQT_SLOT( slotDSS() ) ); - insertItem( i18n( "Second Generation Digitized Sky Survey", "Show 2nd-Gen DSS Image" ), ksw->map(), TQT_SLOT( slotDSS2() ) ); + insertItem( i18n( "First Generation Digitized Sky Survey", "Show 1st-Gen DSS Image" ), ksw->map(), TQ_SLOT( slotDSS() ) ); + insertItem( i18n( "Second Generation Digitized Sky Survey", "Show 2nd-Gen DSS Image" ), ksw->map(), TQ_SLOT( slotDSS2() ) ); insertSeparator(); } else if ( obj->ImageList.count() ) insertSeparator(); @@ -123,13 +123,13 @@ void KSPopupMenu::addLinksToMenu( SkyObject *obj, bool showDSS, bool allowCustom for ( ; itList != itListEnd; ++itList ) { TQString t = TQString(*itTitle); sURL = TQString(*itList); - insertItem( i18n( "Image/info menu item (should be translated)", t.local8Bit() ), ksw->map(), TQT_SLOT( slotInfo( int ) ), 0, id++ ); + insertItem( i18n( "Image/info menu item (should be translated)", t.local8Bit() ), ksw->map(), TQ_SLOT( slotInfo( int ) ), 0, id++ ); ++itTitle; } if ( allowCustom ) { insertSeparator(); - insertItem( i18n( "Add Link..." ), ksw->map(), TQT_SLOT( addLink() ), 0, id++ ); + insertItem( i18n( "Add Link..." ), ksw->map(), TQ_SLOT( addLink() ), 0, id++ ); } } @@ -201,7 +201,7 @@ bool KSPopupMenu::addINDI(void) } } - TQObject::connect(menuDevice, TQT_SIGNAL(activated(int)), prop, TQT_SLOT (convertSwitch(int))); + TQObject::connect(menuDevice, TQ_SIGNAL(activated(int)), prop, TQ_SLOT (convertSwitch(int))); } // end property } // end group @@ -217,7 +217,7 @@ bool KSPopupMenu::addINDI(void) prop = dev->findElem("ALT")->pp; prop->assosiatedPopup = menuDevice; - TQObject::connect(menuDevice, TQT_SIGNAL(activated(int)), prop, TQT_SLOT(convertSwitch(int))); + TQObject::connect(menuDevice, TQ_SIGNAL(activated(int)), prop, TQ_SLOT(convertSwitch(int))); } } // end device @@ -291,15 +291,15 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr //Insert item for centering on object if ( showCenterTrack && obj ) { insertSeparator(); - insertItem( i18n( "Center && Track" ), ksw->map(), TQT_SLOT( slotCenter() ) ); + insertItem( i18n( "Center && Track" ), ksw->map(), TQ_SLOT( slotCenter() ) ); } //Insert item for measuring distances if ( showAngularDistance && obj ) { if (! (ksw->map()->isAngleMode()) ) { - insertItem( i18n( "Angular Distance To... [" ), ksw->map(), TQT_SLOT( slotBeginAngularDistance() ) ); + insertItem( i18n( "Angular Distance To... [" ), ksw->map(), TQ_SLOT( slotBeginAngularDistance() ) ); } else { - insertItem( i18n( "Compute Angular Distance ]" ), ksw->map(), TQT_SLOT( slotEndAngularDistance() ) ); + insertItem( i18n( "Compute Angular Distance ]" ), ksw->map(), TQ_SLOT( slotEndAngularDistance() ) ); } } @@ -307,30 +307,30 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr //Insert item for Showing details dialog if ( showDetails && obj ) { - insertItem( i18n( "Show Detailed Information Dialog", "Details" ), ksw->map(), TQT_SLOT( slotDetail() ) ); + insertItem( i18n( "Show Detailed Information Dialog", "Details" ), ksw->map(), TQ_SLOT( slotDetail() ) ); } //Insert "Add/Remove Label" item if ( showLabel && obj ) { if ( ksw->map()->isObjectLabeled( obj ) ) { - insertItem( i18n( "Remove Label" ), ksw->map(), TQT_SLOT( slotRemoveObjectLabel() ) ); + insertItem( i18n( "Remove Label" ), ksw->map(), TQ_SLOT( slotRemoveObjectLabel() ) ); } else { - insertItem( i18n( "Attach Label" ), ksw->map(), TQT_SLOT( slotAddObjectLabel() ) ); + insertItem( i18n( "Attach Label" ), ksw->map(), TQ_SLOT( slotAddObjectLabel() ) ); } } if ( showObsList && obj ) { if ( ksw->observingList()->contains( obj ) ) - insertItem( i18n("Remove From List"), ksw->observingList(), TQT_SLOT( slotRemoveObject() ) ); + insertItem( i18n("Remove From List"), ksw->observingList(), TQ_SLOT( slotRemoveObject() ) ); else - insertItem( i18n("Add to List"), ksw->observingList(), TQT_SLOT( slotAddObject() ) ); + insertItem( i18n("Add to List"), ksw->observingList(), TQ_SLOT( slotAddObject() ) ); } if ( showTrail && obj && obj->isSolarSystem() ) { if ( addTrail ) { - insertItem( i18n( "Add Trail" ), ksw->map(), TQT_SLOT( slotAddPlanetTrail() ) ); + insertItem( i18n( "Add Trail" ), ksw->map(), TQ_SLOT( slotAddPlanetTrail() ) ); } else { - insertItem( i18n( "Remove Trail" ), ksw->map(), TQT_SLOT( slotRemovePlanetTrail() ) ); + insertItem( i18n( "Remove Trail" ), ksw->map(), TQ_SLOT( slotRemovePlanetTrail() ) ); } } diff --git a/kstars/kstars/kstars.cpp b/kstars/kstars/kstars.cpp index e75199d4..8fa249e7 100644 --- a/kstars/kstars/kstars.cpp +++ b/kstars/kstars/kstars.cpp @@ -61,13 +61,13 @@ KStars::KStars( bool doSplash, bool clockrun, const TQString &startdate ) : if ( doSplash ) { pd->kstarsData = new KStarsData(); - TQObject::connect(pd->kstarsData, TQT_SIGNAL( initFinished(bool) ), - this, TQT_SLOT( datainitFinished(bool) ) ); + TQObject::connect(pd->kstarsData, TQ_SIGNAL( initFinished(bool) ), + this, TQ_SLOT( datainitFinished(bool) ) ); pd->splash = new KStarsSplash(0, "Splash"); - TQObject::connect(pd->splash, TQT_SIGNAL( closeWindow() ), kapp, TQT_SLOT( quit() ) ); - TQObject::connect(pd->kstarsData, TQT_SIGNAL( progressText(TQString) ), - pd->splash, TQT_SLOT( setMessage(TQString) )); + TQObject::connect(pd->splash, TQ_SIGNAL( closeWindow() ), kapp, TQ_SLOT( quit() ) ); + TQObject::connect(pd->kstarsData, TQ_SIGNAL( progressText(TQString) ), + pd->splash, TQ_SLOT( setMessage(TQString) )); pd->splash->show(); } @@ -243,7 +243,7 @@ void KStars::updateTime( const bool automaticDSTchange ) { //Wrap the call to manualTick() in a singleshot timer so that it doesn't get called until //the skymap has been completely updated. if ( Data->clock()->isManualMode() && Data->clock()->isActive() ) { - TQTimer::singleShot( 0, Data->clock(), TQT_SLOT( manualTick() ) ); + TQTimer::singleShot( 0, Data->clock(), TQ_SLOT( manualTick() ) ); } } diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp index 5ab8daeb..981cd0bb 100644 --- a/kstars/kstars/kstarsactions.cpp +++ b/kstars/kstars/kstarsactions.cpp @@ -356,8 +356,8 @@ void KStars::slotViewOps() { TDEConfigDialog* dialog = new TDEConfigDialog( this, "settings", Options::self() ); - connect( dialog, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApplySettings() ) ); - connect( dialog, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotApplySettings() ) ); + connect( dialog, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( slotApplySettings() ) ); + connect( dialog, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotApplySettings() ) ); OpsCatalog *opcatalog = new OpsCatalog( this, "catalogs" ); OpsGuides *opguides = new OpsGuides( this, "guides" ); @@ -873,7 +873,7 @@ void KStars::slotFOVEdit() { if ( fields.count() == 4 ) { TQString nm = fields[0].stripWhiteSpace(); - TDEToggleAction *kta = new TDEToggleAction( nm, 0, this, TQT_SLOT( slotTargetSymbol() ), + TDEToggleAction *kta = new TDEToggleAction( nm, 0, this, TQ_SLOT( slotTargetSymbol() ), actionCollection(), nm.utf8() ); kta->setExclusiveGroup( "fovsymbol" ); fovActionMenu->insert( kta ); @@ -885,7 +885,7 @@ void KStars::slotFOVEdit() { fovActionMenu->popupMenu()->insertSeparator(); fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, this, - TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); + TQ_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); //set FOV to whatever was highlighted in FOV dialog if ( fovdlg.FOVList.count() > 0 ) { @@ -1020,7 +1020,7 @@ void KStars::slotShowGUIItem( bool show ) { void KStars::addColorMenuItem( TQString name, TQString actionName ) { colorActionMenu->insert( new TDEAction( name, 0, - this, TQT_SLOT( slotColorScheme() ), actionCollection(), actionName.local8Bit() ) ); + this, TQ_SLOT( slotColorScheme() ), actionCollection(), actionName.local8Bit() ) ); } void KStars::removeColorMenuItem( TQString actionName ) { diff --git a/kstars/kstars/kstarsdata.cpp b/kstars/kstars/kstarsdata.cpp index 95ca0d50..598e4028 100644 --- a/kstars/kstars/kstarsdata.cpp +++ b/kstars/kstars/kstarsdata.cpp @@ -1698,9 +1698,9 @@ void KStarsData::setMagnitude( float newMagnitude, bool forceReload ) { if (reloadingData() == false) { // if not already reloading data source = new FileSource(this, newMagnitude); loader = new StarDataSink(this); - connect(loader, TQT_SIGNAL(done()), this, TQT_SLOT(checkDataPumpAction())); - connect(loader, TQT_SIGNAL(updateSkymap()), this, TQT_SLOT(updateSkymap())); - connect(loader, TQT_SIGNAL(clearCache()), this, TQT_SLOT(sendClearCache())); + connect(loader, TQ_SIGNAL(done()), this, TQ_SLOT(checkDataPumpAction())); + connect(loader, TQ_SIGNAL(updateSkymap()), this, TQ_SLOT(updateSkymap())); + connect(loader, TQ_SIGNAL(clearCache()), this, TQ_SLOT(sendClearCache())); // start reloading pump = new TQDataPump (source, (TQDataSink*) loader); } @@ -1762,7 +1762,7 @@ void KStarsData::initialize() { if (startupComplete) return; initTimer = new TQTimer; - TQObject::connect(initTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( slotInitialize() ) ); + TQObject::connect(initTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT( slotInitialize() ) ); initCounter = 0; initTimer->start(1); } @@ -2219,7 +2219,7 @@ void KStarsData::updateTime( GeoLocation *geo, SkyMap *skymap, const bool automa skymap->updateFocus(); if ( clock()->isManualMode() ) - TQTimer::singleShot( 0, skymap, TQT_SLOT( forceUpdateNow() ) ); + TQTimer::singleShot( 0, skymap, TQ_SLOT( forceUpdateNow() ) ); else skymap->forceUpdate(); } } diff --git a/kstars/kstars/kstarsdcop.cpp b/kstars/kstars/kstarsdcop.cpp index ce1e7c50..bada6d1d 100644 --- a/kstars/kstars/kstarsdcop.cpp +++ b/kstars/kstars/kstarsdcop.cpp @@ -106,7 +106,7 @@ void KStars::setLocalTime(int yr, int mth, int day, int hr, int min, int sec) { void KStars::waitFor( double t ) { kapp->dcopClient()->suspend(); - TQTimer::singleShot( int( 1000.*t ), this, TQT_SLOT( resumeDCOP() ) ); + TQTimer::singleShot( int( 1000.*t ), this, TQ_SLOT( resumeDCOP() ) ); } void KStars::waitForKey( const TQString k ) { @@ -775,10 +775,10 @@ void KStars::waitForINDIAction(TQString deviceName, TQString action) el = dev->findElem(action); if (!el) return; - TQObject::connect(el->pp, TQT_SIGNAL(okState()), this, TQT_SLOT(resumeDCOP(void ))); + TQObject::connect(el->pp, TQ_SIGNAL(okState()), this, TQ_SLOT(resumeDCOP(void ))); } else - TQObject::connect(prop, TQT_SIGNAL(okState()), this, TQT_SLOT(resumeDCOP(void ))); + TQObject::connect(prop, TQ_SIGNAL(okState()), this, TQ_SLOT(resumeDCOP(void ))); kapp->dcopClient()->suspend(); @@ -977,7 +977,7 @@ void KStars::setINDIFilterNum(TQString deviceName, int filter_num) prop = dev->findProp("FILTER_SLOT"); if (!prop) return; - el = prop->findElement("SLOT"); + el = prop->findElement("TQ_SLOT"); if (!el) return; if (el->write_w) diff --git a/kstars/kstars/kstarsinit.cpp b/kstars/kstars/kstarsinit.cpp index b4890a43..7e64e27f 100644 --- a/kstars/kstars/kstarsinit.cpp +++ b/kstars/kstars/kstarsinit.cpp @@ -49,66 +49,66 @@ void KStars::initActions() { //File Menu: new TDEAction(i18n("&New Window"), "window-new", TDEShortcut( "Ctrl+N" ), - this, TQT_SLOT( newWindow() ), actionCollection(), "new_window"); + this, TQ_SLOT( newWindow() ), actionCollection(), "new_window"); new TDEAction(i18n("&Close Window"), "window-close", TDEShortcut( "Ctrl+W" ), - this, TQT_SLOT( closeWindow() ), actionCollection(), "close_window"); + this, TQ_SLOT( closeWindow() ), actionCollection(), "close_window"); new TDEAction( i18n( "&Download Data..." ), "knewstuff", TDEShortcut( "Ctrl+D" ), - this, TQT_SLOT( slotDownload() ), actionCollection(), "get_data" ); - new TDEAction( i18n( "Open FITS..."), "document-open", TDEShortcut( "Ctrl+O"), this, TQT_SLOT( slotOpenFITS()), actionCollection(), "open_file"); + this, TQ_SLOT( slotDownload() ), actionCollection(), "get_data" ); + new TDEAction( i18n( "Open FITS..."), "document-open", TDEShortcut( "Ctrl+O"), this, TQ_SLOT( slotOpenFITS()), actionCollection(), "open_file"); new TDEAction( i18n( "&Save Sky Image..." ), "fileexport", TDEShortcut( "Ctrl+I" ), - this, TQT_SLOT( slotExportImage() ), actionCollection(), "export_image" ); + this, TQ_SLOT( slotExportImage() ), actionCollection(), "export_image" ); new TDEAction( i18n( "&Run Script..." ), "launch", TDEShortcut( "Ctrl+R" ), - this, TQT_SLOT( slotRunScript() ), actionCollection(), "run_script" ); - KStdAction::print(this, TQT_SLOT( slotPrint() ), actionCollection(), "print" ); - KStdAction::quit(this, TQT_SLOT( close() ), actionCollection(), "quit" ); + this, TQ_SLOT( slotRunScript() ), actionCollection(), "run_script" ); + KStdAction::print(this, TQ_SLOT( slotPrint() ), actionCollection(), "print" ); + KStdAction::quit(this, TQ_SLOT( close() ), actionCollection(), "quit" ); //Time Menu: new TDEAction( i18n( "Set Time to &Now" ), TDEShortcut( "Ctrl+E" ), - this, TQT_SLOT( slotSetTimeToNow() ), actionCollection(), "time_to_now" ); + this, TQ_SLOT( slotSetTimeToNow() ), actionCollection(), "time_to_now" ); new TDEAction( i18n( "set Clock to New Time", "&Set Time..." ), "clock", TDEShortcut( "Ctrl+S" ), - this, TQT_SLOT( slotSetTime() ), actionCollection(), "time_dialog" ); + this, TQ_SLOT( slotSetTime() ), actionCollection(), "time_dialog" ); ToggleAction *actTimeRun = new ToggleAction( i18n( "Stop &Clock" ), BarIcon("media-playback-pause"), i18n("Start &Clock"), BarIcon("1rightarrow"), - 0, this, TQT_SLOT( slotToggleTimer() ), actionCollection(), "timer_control" ); + 0, this, TQ_SLOT( slotToggleTimer() ), actionCollection(), "timer_control" ); actTimeRun->setOffToolTip( i18n( "Start Clock" ) ); actTimeRun->setOnToolTip( i18n( "Stop Clock" ) ); - TQObject::connect(data()->clock(), TQT_SIGNAL(clockStarted()), actTimeRun, TQT_SLOT(turnOn()) ); - TQObject::connect(data()->clock(), TQT_SIGNAL(clockStopped()), actTimeRun, TQT_SLOT(turnOff()) ); + TQObject::connect(data()->clock(), TQ_SIGNAL(clockStarted()), actTimeRun, TQ_SLOT(turnOn()) ); + TQObject::connect(data()->clock(), TQ_SIGNAL(clockStopped()), actTimeRun, TQ_SLOT(turnOff()) ); //UpdateTime() if clock is stopped (so hidden objects get drawn) - TQObject::connect(data()->clock(), TQT_SIGNAL(clockStopped()), this, TQT_SLOT(updateTime()) ); + TQObject::connect(data()->clock(), TQ_SIGNAL(clockStopped()), this, TQ_SLOT(updateTime()) ); //Focus Menu: new TDEAction(i18n( "&Zenith" ), TDEShortcut( "Z" ), - this, TQT_SLOT( slotPointFocus() ), actionCollection(), "zenith"); + this, TQ_SLOT( slotPointFocus() ), actionCollection(), "zenith"); new TDEAction(i18n( "&North" ), TDEShortcut( "N" ), - this, TQT_SLOT( slotPointFocus() ), actionCollection(), "north"); + this, TQ_SLOT( slotPointFocus() ), actionCollection(), "north"); new TDEAction(i18n( "&East" ), TDEShortcut( "E" ), - this, TQT_SLOT( slotPointFocus() ), actionCollection(), "east"); + this, TQ_SLOT( slotPointFocus() ), actionCollection(), "east"); new TDEAction(i18n( "&South" ), TDEShortcut( "S" ), - this, TQT_SLOT( slotPointFocus() ), actionCollection(), "south"); + this, TQ_SLOT( slotPointFocus() ), actionCollection(), "south"); new TDEAction(i18n( "&West" ), TDEShortcut( "W" ), - this, TQT_SLOT( slotPointFocus() ), actionCollection(), "west"); - TDEAction *tmpAction = KStdAction::find( this, TQT_SLOT( slotFind() ), + this, TQ_SLOT( slotPointFocus() ), actionCollection(), "west"); + TDEAction *tmpAction = KStdAction::find( this, TQ_SLOT( slotFind() ), actionCollection(), "find_object" ); tmpAction->setText( i18n( "&Find Object..." ) ); tmpAction->setToolTip( i18n( "Find object" ) ); new TDEAction( i18n( "Engage &Tracking" ), "decrypted", TDEShortcut( "Ctrl+T" ), - this, TQT_SLOT( slotTrack() ), actionCollection(), "track_object" ); + this, TQ_SLOT( slotTrack() ), actionCollection(), "track_object" ); new TDEAction( i18n( "Set Focus &Manually..." ), TDEShortcut( "Ctrl+M" ), - this, TQT_SLOT( slotManualFocus() ), actionCollection(), "manual_focus" ); + this, TQ_SLOT( slotManualFocus() ), actionCollection(), "manual_focus" ); //View Menu: - KStdAction::zoomIn(this, TQT_SLOT( slotZoomIn() ), actionCollection(), "zoom_in" ); - KStdAction::zoomOut(this, TQT_SLOT( slotZoomOut() ), actionCollection(), "zoom_out" ); + KStdAction::zoomIn(this, TQ_SLOT( slotZoomIn() ), actionCollection(), "zoom_in" ); + KStdAction::zoomOut(this, TQ_SLOT( slotZoomOut() ), actionCollection(), "zoom_out" ); new TDEAction( i18n( "&Default Zoom" ), "viewmagfit.png", TDEShortcut( "Ctrl+Z" ), - this, TQT_SLOT( slotDefaultZoom() ), actionCollection(), "zoom_default" ); + this, TQ_SLOT( slotDefaultZoom() ), actionCollection(), "zoom_default" ); new TDEAction( i18n( "&Zoom to Angular Size..." ), "viewmag.png", TDEShortcut( "Ctrl+Shift+Z" ), - this, TQT_SLOT( slotSetZoom() ), actionCollection(), "zoom_set" ); + this, TQ_SLOT( slotSetZoom() ), actionCollection(), "zoom_set" ); actCoordSys = new ToggleAction( i18n("Horizontal &Coordinates"), i18n( "Equatorial &Coordinates" ), - Key_Space, this, TQT_SLOT( slotCoordSys() ), actionCollection(), "coordsys" ); - KStdAction::fullScreen( this, TQT_SLOT( slotFullScreen() ), actionCollection(), 0 ); + Key_Space, this, TQ_SLOT( slotCoordSys() ), actionCollection(), "coordsys" ); + KStdAction::fullScreen( this, TQ_SLOT( slotFullScreen() ), actionCollection(), 0 ); //Settings Menu: @@ -122,45 +122,45 @@ void KStars::initActions() { TDEToggleAction *a = new TDEToggleAction(i18n( "Show the information boxes", "Show &Info Boxes"), 0, 0, 0, actionCollection(), "show_boxes"); a->setChecked( Options::showInfoBoxes() ); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), infoBoxes(), TQT_SLOT(setVisible(bool))); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), infoBoxes(), TQ_SLOT(setVisible(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); a = new TDEToggleAction(i18n( "Show time-related info box", "Show &Time Box"), 0, 0, 0, actionCollection(), "show_time_box"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), infoBoxes(), TQT_SLOT(showTimeBox(bool))); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), infoBoxes(), TQ_SLOT(showTimeBox(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); a = new TDEToggleAction(i18n( "Show focus-related info box", "Show &Focus Box"), 0, 0, 0, actionCollection(), "show_focus_box"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), infoBoxes(), TQT_SLOT(showFocusBox(bool))); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), infoBoxes(), TQ_SLOT(showFocusBox(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); a = new TDEToggleAction(i18n( "Show location-related info box", "Show &Location Box"), 0, 0, 0, actionCollection(), "show_location_box"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), infoBoxes(), TQT_SLOT(showGeoBox(bool))); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), infoBoxes(), TQ_SLOT(showGeoBox(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); //Toolbar view options a = new TDEToggleAction(i18n( "Show Main Toolbar" ), 0, 0, 0, actionCollection(), "show_mainToolBar"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); a = new TDEToggleAction(i18n( "Show View Toolbar" ), 0, 0, 0, actionCollection(), "show_viewToolBar"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); //Statusbar view options a = new TDEToggleAction(i18n( "Show Statusbar" ), 0, 0, 0, actionCollection(), "show_statusBar"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); a = new TDEToggleAction(i18n( "Show Az/Alt Field" ), 0, 0, 0, actionCollection(), "show_sbAzAlt"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); a = new TDEToggleAction(i18n( "Show RA/Dec Field" ), 0, 0, 0, actionCollection(), "show_sbRADec"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); //Color scheme actions. These are added to the "colorschemes" TDEActionMenu. colorActionMenu = new TDEActionMenu( i18n( "C&olor Schemes" ), actionCollection(), "colorschemes" ); @@ -192,61 +192,61 @@ void KStars::initActions() { new TDEAction( i18n( "Location on Earth", "&Geographic..." ), "kstars_geo", TDEShortcut( "Ctrl+G" ), this, - TQT_SLOT( slotGeoLocator() ), actionCollection(), "geolocation" ); + TQ_SLOT( slotGeoLocator() ), actionCollection(), "geolocation" ); - KStdAction::preferences( this, TQT_SLOT( slotViewOps() ), actionCollection(), "configure" ); + KStdAction::preferences( this, TQ_SLOT( slotViewOps() ), actionCollection(), "configure" ); new TDEAction(i18n( "Startup Wizard..." ), "wizard", TDEShortcut(), - this, TQT_SLOT( slotWizard() ), actionCollection(), "startwizard" ); + this, TQ_SLOT( slotWizard() ), actionCollection(), "startwizard" ); //Tools Menu: new TDEAction(i18n( "Calculator..."), TDEShortcut( "Ctrl+C"), - this, TQT_SLOT( slotCalculator() ), actionCollection(), "astrocalculator"); + this, TQ_SLOT( slotCalculator() ), actionCollection(), "astrocalculator"); new TDEAction(i18n( "Observing List..."), TDEShortcut( "Ctrl+L"), - this, TQT_SLOT( slotObsList() ), actionCollection(), "obslist"); + this, TQ_SLOT( slotObsList() ), actionCollection(), "obslist"); // enable action only if file was loaded and processed successfully. if (!data()->VariableStarsList.isEmpty()) new TDEAction(i18n( "AAVSO Light Curves..."), TDEShortcut( "Ctrl+V"), - this, TQT_SLOT( slotLCGenerator() ), actionCollection(), "lightcurvegenerator"); + this, TQ_SLOT( slotLCGenerator() ), actionCollection(), "lightcurvegenerator"); new TDEAction(i18n( "Altitude vs. Time..."), TDEShortcut( "Ctrl+A"), - this, TQT_SLOT( slotAVT() ), actionCollection(), "altitude_vs_time"); + this, TQ_SLOT( slotAVT() ), actionCollection(), "altitude_vs_time"); new TDEAction(i18n( "What's up Tonight..."), TDEShortcut("Ctrl+U"), - this, TQT_SLOT(slotWUT()), actionCollection(), "whats_up_tonight"); + this, TQ_SLOT(slotWUT()), actionCollection(), "whats_up_tonight"); //FIXME GLOSSARY // new TDEAction(i18n( "Glossary..."), TDEShortcut("Ctrl+K"), -// this, TQT_SLOT(slotGlossary()), actionCollection(), "glossary"); +// this, TQ_SLOT(slotGlossary()), actionCollection(), "glossary"); new TDEAction(i18n( "Script Builder..."), TDEShortcut("Ctrl+B"), - this, TQT_SLOT(slotScriptBuilder()), actionCollection(), "scriptbuilder"); + this, TQ_SLOT(slotScriptBuilder()), actionCollection(), "scriptbuilder"); new TDEAction(i18n( "Solar System..."), TDEShortcut("Ctrl+Y"), - this, TQT_SLOT(slotSolarSystem()), actionCollection(), "solarsystem"); + this, TQ_SLOT(slotSolarSystem()), actionCollection(), "solarsystem"); new TDEAction(i18n( "Jupiter's Moons..."), TDEShortcut("Ctrl+J"), - this, TQT_SLOT(slotJMoonTool()), actionCollection(), "jmoontool"); + this, TQ_SLOT(slotJMoonTool()), actionCollection(), "jmoontool"); // devices Menu - new TDEAction(i18n("Telescope Wizard..."), 0, this, TQT_SLOT(slotTelescopeWizard()), actionCollection(), "telescope_wizard"); - new TDEAction(i18n("Telescope Properties..."), 0, this, TQT_SLOT(slotTelescopeProperties()), actionCollection(), "telescope_properties"); - new TDEAction(i18n("Device Manager..."), 0, this, TQT_SLOT(slotINDIDriver()), actionCollection(), "device_manager"); + new TDEAction(i18n("Telescope Wizard..."), 0, this, TQ_SLOT(slotTelescopeWizard()), actionCollection(), "telescope_wizard"); + new TDEAction(i18n("Telescope Properties..."), 0, this, TQ_SLOT(slotTelescopeProperties()), actionCollection(), "telescope_properties"); + new TDEAction(i18n("Device Manager..."), 0, this, TQ_SLOT(slotINDIDriver()), actionCollection(), "device_manager"); - tmpAction = new TDEAction(i18n("Capture Image Sequence..."), 0, this, TQT_SLOT(slotImageSequence()), actionCollection(), "capture_sequence"); + tmpAction = new TDEAction(i18n("Capture Image Sequence..."), 0, this, TQ_SLOT(slotImageSequence()), actionCollection(), "capture_sequence"); tmpAction->setEnabled(false); - tmpAction = new TDEAction(i18n("INDI Control Panel..."), 0, this, TQT_SLOT(slotINDIPanel()), actionCollection(), "indi_control_panel"); + tmpAction = new TDEAction(i18n("INDI Control Panel..."), 0, this, TQ_SLOT(slotINDIPanel()), actionCollection(), "indi_control_panel"); tmpAction->setEnabled(false); - new TDEAction(i18n("Configure INDI..."), 0, this, TQT_SLOT(slotINDIConf()), actionCollection(), "configure_indi"); + new TDEAction(i18n("Configure INDI..."), 0, this, TQ_SLOT(slotINDIConf()), actionCollection(), "configure_indi"); //Help Menu: new TDEAction( i18n( "Tip of the Day" ), "idea", 0, - this, TQT_SLOT( slotTipOfDay() ), actionCollection(), "help_tipofday" ); + this, TQ_SLOT( slotTipOfDay() ), actionCollection(), "help_tipofday" ); //Handbook toolBar item: new TDEAction( i18n( "&Handbook" ), "contents", TDEShortcut( "F1" ), - this, TQT_SLOT( appHelpActivated() ), actionCollection(), "handbook" ); + this, TQ_SLOT( appHelpActivated() ), actionCollection(), "handbook" ); // //viewToolBar actions: @@ -254,39 +254,39 @@ void KStars::initActions() { //show_stars: a = new TDEToggleAction( i18n( "Toggle Stars" ), "kstars_stars", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_stars" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_stars" ); //show_deepsky: a = new TDEToggleAction( i18n( "Toggle Deep Sky Objects" ), "kstars_deepsky", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_deepsky" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_deepsky" ); //show_planets: a = new TDEToggleAction( i18n( "Toggle Solar System" ), "kstars_planets", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_planets" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_planets" ); //show_clines: a = new TDEToggleAction( i18n( "Toggle Constellation Lines" ), "kstars_clines", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_clines" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_clines" ); //show_cnames: a = new TDEToggleAction( i18n( "Toggle Constellation Names" ), "kstars_cnames", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cnames" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_cnames" ); //show_cbound: a = new TDEToggleAction( i18n( "Toggle Constellation Boundaries" ), "kstars_cbound", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cbounds" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_cbounds" ); //show_mw: a = new TDEToggleAction( i18n( "Toggle Milky Way" ), "kstars_mw", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_mw" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_mw" ); //show_grid: a = new TDEToggleAction( i18n( "Toggle Coordinate Grid" ), "kstars_grid", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_grid" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_grid" ); //show_horizon: a = new TDEToggleAction( i18n( "Toggle Ground" ), "kstars_horizon", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_horizon" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_horizon" ); if (Options::fitsSaveDirectory().isEmpty()) Options::setFitsSaveDirectory(TQDir:: homeDirPath()); @@ -327,7 +327,7 @@ void KStars::initFOV() { if ( fields.count() == 4 ) { nm = fields[0].stripWhiteSpace(); - TDEToggleAction *kta = new TDEToggleAction( nm, 0, this, TQT_SLOT( slotTargetSymbol() ), + TDEToggleAction *kta = new TDEToggleAction( nm, 0, this, TQ_SLOT( slotTargetSymbol() ), actionCollection(), nm.utf8() ); kta->setExclusiveGroup( "fovsymbol" ); if ( nm == Options::fOVName() ) kta->setChecked( true ); @@ -339,7 +339,7 @@ void KStars::initFOV() { } fovActionMenu->popupMenu()->insertSeparator(); - fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, this, TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); + fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, this, TQ_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); } void KStars::initStatusBar() { @@ -459,7 +459,7 @@ void KStars::privatedata::buildGUI() { ks->skymap = new SkyMap( ks->data(), ks->centralWidget ); // update skymap if KStarsData send update signal - TQObject::connect(kstarsData, TQT_SIGNAL( update() ), ks->skymap, TQT_SLOT( forceUpdateNow() ) ); + TQObject::connect(kstarsData, TQ_SIGNAL( update() ), ks->skymap, TQ_SLOT( forceUpdateNow() ) ); // get focus of keyboard and mouse actions (for example zoom in with +) ks->map()->TQWidget::setFocus(); @@ -484,11 +484,11 @@ void KStars::privatedata::buildGUI() { //Changing the timestep needs to propagate to the clock, check if slew mode should be //(dis)engaged, and return input focus to the skymap. - connect( ks->TimeStep, TQT_SIGNAL( scaleChanged( float ) ), ks->data(), TQT_SLOT( setTimeDirection( float ) ) ); - connect( ks->TimeStep, TQT_SIGNAL( scaleChanged( float ) ), ks->data()->clock(), TQT_SLOT( setScale( float )) ); -// connect( ks->TimeStep, TQT_SIGNAL( scaleChanged( float ) ), ks->skymap, TQT_SLOT( slotClockSlewing() ) ); - connect( ks->data()->clock(), TQT_SIGNAL( scaleChanged( float ) ), ks->map(), TQT_SLOT( slotClockSlewing() ) ); - connect( ks->TimeStep, TQT_SIGNAL( scaleChanged( float ) ), ks, TQT_SLOT( mapGetsFocus() ) ); + connect( ks->TimeStep, TQ_SIGNAL( scaleChanged( float ) ), ks->data(), TQ_SLOT( setTimeDirection( float ) ) ); + connect( ks->TimeStep, TQ_SIGNAL( scaleChanged( float ) ), ks->data()->clock(), TQ_SLOT( setScale( float )) ); +// connect( ks->TimeStep, TQ_SIGNAL( scaleChanged( float ) ), ks->skymap, TQ_SLOT( slotClockSlewing() ) ); + connect( ks->data()->clock(), TQ_SIGNAL( scaleChanged( float ) ), ks->map(), TQ_SLOT( slotClockSlewing() ) ); + connect( ks->TimeStep, TQ_SIGNAL( scaleChanged( float ) ), ks, TQ_SLOT( mapGetsFocus() ) ); ks->resize( Options::windowWidth(), Options::windowHeight() ); @@ -507,11 +507,11 @@ void KStars::privatedata::buildGUI() { ks->data()->initGuides(&tempnum); //Connect the clock. - TQObject::connect( ks->data()->clock(), TQT_SIGNAL( timeAdvanced() ), ks, TQT_SLOT( updateTime() ) ); - TQObject::connect( ks->data()->clock(), TQT_SIGNAL( timeChanged() ), ks, TQT_SLOT( updateTime() ) ); + TQObject::connect( ks->data()->clock(), TQ_SIGNAL( timeAdvanced() ), ks, TQ_SLOT( updateTime() ) ); + TQObject::connect( ks->data()->clock(), TQ_SIGNAL( timeChanged() ), ks, TQ_SLOT( updateTime() ) ); // Connect cache function - TQObject::connect( kstarsData, TQT_SIGNAL( clearCache() ), ks, TQT_SLOT( clearCachedFindDialog() ) ); + TQObject::connect( kstarsData, TQ_SIGNAL( clearCache() ), ks, TQ_SLOT( clearCachedFindDialog() ) ); SkyPoint newPoint; if ( ks->data()->useDefaultOptions ) { diff --git a/kstars/kstars/kswizard.cpp b/kstars/kstars/kswizard.cpp index 1c4ed73d..ff8015dc 100644 --- a/kstars/kstars/kswizard.cpp +++ b/kstars/kstars/kswizard.cpp @@ -86,14 +86,14 @@ KSWizard::KSWizard( TQWidget *parent, const char *name ) #endif //connect signals/slots - connect( CityListBox, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotChangeCity() ) ); - connect( CityFilter, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotFilterCities() ) ); - connect( ProvinceFilter, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotFilterCities() ) ); - connect( CountryFilter, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotFilterCities() ) ); + connect( CityListBox, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotChangeCity() ) ); + connect( CityFilter, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotFilterCities() ) ); + connect( ProvinceFilter, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotFilterCities() ) ); + connect( CountryFilter, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotFilterCities() ) ); //Uncomment if we ever need the telescope page... -// connect( TelescopeWizardButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTelescopeSetup() ) ); +// connect( TelescopeWizardButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotTelescopeSetup() ) ); #if ( KDE_IS_VERSION( 3, 2, 90 ) ) - connect( DownloadButton, TQT_SIGNAL( clicked() ), ksw, TQT_SLOT( slotDownload() ) ); + connect( DownloadButton, TQ_SIGNAL( clicked() ), ksw, TQ_SLOT( slotDownload() ) ); #endif //Initialize Geographic Location page diff --git a/kstars/kstars/locationdialog.cpp b/kstars/kstars/locationdialog.cpp index 0ac2a751..e7baed52 100644 --- a/kstars/kstars/locationdialog.cpp +++ b/kstars/kstars/locationdialog.cpp @@ -180,21 +180,21 @@ LocationDialog::LocationDialog( TQWidget* parent ) CoordLay->activate(); RootLay->activate(); - connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( reject() ) ); - connect( CityFilter, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( filterCity() ) ); - connect( ProvinceFilter, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( filterCity() ) ); - connect( CountryFilter, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( filterCity() ) ); - connect( NewCityName, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( nameChanged() ) ); - connect( NewProvinceName, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( nameChanged() ) ); - connect( NewCountryName, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( nameChanged() ) ); - connect( NewLong, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( dataChanged() ) ); - connect( NewLat, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( dataChanged() ) ); - connect( TZBox, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( dataChanged() ) ); - connect( TZRuleBox, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( dataChanged() ) ); - connect( GeoBox, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( changeCity() ) ); - connect( AddCityButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addCity() ) ); - connect( ClearFields, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clearFields() ) ); - connect( ShowTZRules, TQT_SIGNAL( clicked() ), this, TQT_SLOT( showTZRules() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( reject() ) ); + connect( CityFilter, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( filterCity() ) ); + connect( ProvinceFilter, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( filterCity() ) ); + connect( CountryFilter, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( filterCity() ) ); + connect( NewCityName, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( nameChanged() ) ); + connect( NewProvinceName, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( nameChanged() ) ); + connect( NewCountryName, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( nameChanged() ) ); + connect( NewLong, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( dataChanged() ) ); + connect( NewLat, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( dataChanged() ) ); + connect( TZBox, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( dataChanged() ) ); + connect( TZRuleBox, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( dataChanged() ) ); + connect( GeoBox, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( changeCity() ) ); + connect( AddCityButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addCity() ) ); + connect( ClearFields, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clearFields() ) ); + connect( ShowTZRules, TQ_SIGNAL( clicked() ), this, TQ_SLOT( showTZRules() ) ); dataModified = false; nameModified = false; diff --git a/kstars/kstars/main.cpp b/kstars/kstars/main.cpp index 021964e9..93b73ad7 100644 --- a/kstars/kstars/main.cpp +++ b/kstars/kstars/main.cpp @@ -94,7 +94,7 @@ int main(int argc, char *argv[]) } KStarsData *dat = new KStarsData(); - TQObject::connect( dat, TQT_SIGNAL( progressText(TQString) ), dat, TQT_SLOT( slotConsoleMessage(TQString) ) ); + TQObject::connect( dat, TQ_SIGNAL( progressText(TQString) ), dat, TQ_SLOT( slotConsoleMessage(TQString) ) ); dat->initialize(); while (!dat->startupComplete) { kapp->processEvents(50); } @@ -185,7 +185,7 @@ int main(int argc, char *argv[]) new KStars( true, ! args->isSet( "paused" ), datestring ); args->clear(); - TQObject::connect(kapp, TQT_SIGNAL(lastWindowClosed()), kapp, TQT_SLOT(quit())); + TQObject::connect(kapp, TQ_SIGNAL(lastWindowClosed()), kapp, TQ_SLOT(quit())); return a.exec(); } diff --git a/kstars/kstars/opsadvanced.cpp b/kstars/kstars/opsadvanced.cpp index 83cad040..50086e69 100644 --- a/kstars/kstars/opsadvanced.cpp +++ b/kstars/kstars/opsadvanced.cpp @@ -32,9 +32,9 @@ OpsAdvanced::OpsAdvanced( TQWidget *p, const char *name, WFlags fl ) //Initialize the timestep value SlewTimeScale->tsbox()->changeScale( Options::slewTimeScale() ); - connect( SlewTimeScale, TQT_SIGNAL( scaleChanged( float ) ), this, TQT_SLOT( slotChangeTimeScale( float ) ) ); + connect( SlewTimeScale, TQ_SIGNAL( scaleChanged( float ) ), this, TQ_SLOT( slotChangeTimeScale( float ) ) ); - connect( kcfg_HideOnSlew, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotToggleHideOptions() ) ); + connect( kcfg_HideOnSlew, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotToggleHideOptions() ) ); } OpsAdvanced::~OpsAdvanced() {} diff --git a/kstars/kstars/opscatalog.cpp b/kstars/kstars/opscatalog.cpp index a9fda7ac..07282cbf 100644 --- a/kstars/kstars/opscatalog.cpp +++ b/kstars/kstars/opscatalog.cpp @@ -64,17 +64,17 @@ OpsCatalog::OpsCatalog( TQWidget *p, const char *name, WFlags fl ) newItem->setOn( Options::showCatalog()[i] ); } - connect( CatalogList, TQT_SIGNAL( clicked( TQListViewItem* ) ), this, TQT_SLOT( updateDisplay() ) ); - connect( CatalogList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( selectCatalog() ) ); - connect( AddCatalog, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddCatalog() ) ); - connect( LoadCatalog, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotLoadCatalog() ) ); - connect( RemoveCatalog, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveCatalog() ) ); - - connect( kcfg_MagLimitDrawStar, TQT_SIGNAL( valueChanged(double) ), - TQT_SLOT( slotSetDrawStarMagnitude(double) ) ); - connect( kcfg_MagLimitDrawStarZoomOut, TQT_SIGNAL( valueChanged(double) ), - TQT_SLOT( slotSetDrawStarZoomOutMagnitude(double) ) ); - connect( kcfg_ShowStars, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotStarWidgets(bool) ) ); + connect( CatalogList, TQ_SIGNAL( clicked( TQListViewItem* ) ), this, TQ_SLOT( updateDisplay() ) ); + connect( CatalogList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( selectCatalog() ) ); + connect( AddCatalog, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddCatalog() ) ); + connect( LoadCatalog, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotLoadCatalog() ) ); + connect( RemoveCatalog, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveCatalog() ) ); + + connect( kcfg_MagLimitDrawStar, TQ_SIGNAL( valueChanged(double) ), + TQ_SLOT( slotSetDrawStarMagnitude(double) ) ); + connect( kcfg_MagLimitDrawStarZoomOut, TQ_SIGNAL( valueChanged(double) ), + TQ_SLOT( slotSetDrawStarZoomOutMagnitude(double) ) ); + connect( kcfg_ShowStars, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotStarWidgets(bool) ) ); } //empty destructor diff --git a/kstars/kstars/opscolors.cpp b/kstars/kstars/opscolors.cpp index 1b7bcbb7..b7eb837d 100644 --- a/kstars/kstars/opscolors.cpp +++ b/kstars/kstars/opscolors.cpp @@ -82,12 +82,12 @@ OpsColors::OpsColors( TQWidget *p, const char *name, WFlags fl ) else kcfg_StarColorIntensity->setEnabled( true ); - connect( ColorPalette, TQT_SIGNAL( clicked( TQListBoxItem* ) ), this, TQT_SLOT( newColor( TQListBoxItem* ) ) ); - connect( kcfg_StarColorIntensity, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotStarColorIntensity( int ) ) ); - connect( kcfg_StarColorMode, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotStarColorMode( int ) ) ); - connect( PresetBox, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( slotPreset( int ) ) ); - connect( AddPreset, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddPreset() ) ); - connect( RemovePreset, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemovePreset() ) ); + connect( ColorPalette, TQ_SIGNAL( clicked( TQListBoxItem* ) ), this, TQ_SLOT( newColor( TQListBoxItem* ) ) ); + connect( kcfg_StarColorIntensity, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotStarColorIntensity( int ) ) ); + connect( kcfg_StarColorMode, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotStarColorMode( int ) ) ); + connect( PresetBox, TQ_SIGNAL( highlighted( int ) ), this, TQ_SLOT( slotPreset( int ) ) ); + connect( AddPreset, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddPreset() ) ); + connect( RemovePreset, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemovePreset() ) ); RemovePreset->setEnabled( false ); } @@ -190,13 +190,13 @@ void OpsColors::slotRemovePreset() { //Remove entry from the ListBox and from the TQStringList holding filenames. //We don't want another color scheme to be selected, so first //temporarily disconnect the "highlighted" signal. - disconnect( PresetBox, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( slotPreset( int ) ) ); + disconnect( PresetBox, TQ_SIGNAL( highlighted( int ) ), this, TQ_SLOT( slotPreset( int ) ) ); PresetBox->removeItem( PresetBox->currentItem() ); PresetBox->setCurrentItem( -1 ); RemovePreset->setEnabled( false ); //Reconnect the "highlighted" signal - connect( PresetBox, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( slotPreset( int ) ) ); + connect( PresetBox, TQ_SIGNAL( highlighted( int ) ), this, TQ_SLOT( slotPreset( int ) ) ); //Read the contents of colors.dat into a TQStringList, except for the entry to be removed. TQTextStream stream( &cdatFile ); diff --git a/kstars/kstars/opsguides.cpp b/kstars/kstars/opsguides.cpp index 7b554280..48a9bee0 100644 --- a/kstars/kstars/opsguides.cpp +++ b/kstars/kstars/opsguides.cpp @@ -21,10 +21,10 @@ OpsGuides::OpsGuides( TQWidget* parent, const char* name, WFlags fl ) : OpsGuidesUI( parent, name, fl ) { - connect( kcfg_ShowCNames, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotToggleConstellOptions() ) ); - connect( kcfg_ShowMilkyWay, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotToggleMilkyWayOptions() ) ); + connect( kcfg_ShowCNames, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotToggleConstellOptions() ) ); + connect( kcfg_ShowMilkyWay, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotToggleMilkyWayOptions() ) ); } OpsGuides::~OpsGuides() diff --git a/kstars/kstars/opssolarsystem.cpp b/kstars/kstars/opssolarsystem.cpp index 688a53c7..e9426c46 100644 --- a/kstars/kstars/opssolarsystem.cpp +++ b/kstars/kstars/opssolarsystem.cpp @@ -26,11 +26,11 @@ OpsSolarSystem::OpsSolarSystem( TQWidget *parent, const char *name, WFlags fl ) { ksw = (KStars *)parent; - connect( kcfg_ShowAsteroids, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotAsteroidWidgets(bool) ) ); - connect( kcfg_ShowComets, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotCometWidgets(bool) ) ); - connect( ClearAllTrails, TQT_SIGNAL( clicked() ), ksw, TQT_SLOT( slotClearAllTrails() ) ); - connect( showAllPlanets, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSelectPlanets() ) ); - connect( showNonePlanets, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSelectPlanets() ) ); + connect( kcfg_ShowAsteroids, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotAsteroidWidgets(bool) ) ); + connect( kcfg_ShowComets, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotCometWidgets(bool) ) ); + connect( ClearAllTrails, TQ_SIGNAL( clicked() ), ksw, TQ_SLOT( slotClearAllTrails() ) ); + connect( showAllPlanets, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSelectPlanets() ) ); + connect( showNonePlanets, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSelectPlanets() ) ); slotAsteroidWidgets( kcfg_ShowAsteroids->isChecked() ); slotCometWidgets( kcfg_ShowComets->isChecked() ); diff --git a/kstars/kstars/simclock.cpp b/kstars/kstars/simclock.cpp index 25fe72d9..2bb5ae3b 100644 --- a/kstars/kstars/simclock.cpp +++ b/kstars/kstars/simclock.cpp @@ -38,7 +38,7 @@ SimClock::SimClock(TQObject *parent, const KStarsDateTime &when) : ManualMode = false; ManualActive = false; - TQObject::connect(&tmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(tick())); + TQObject::connect(&tmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(tick())); } SimClock::SimClock (const SimClock &old) : @@ -54,7 +54,7 @@ SimClock::SimClock (const SimClock &old) : ManualMode = old.ManualMode; ManualActive = old.ManualActive; - TQObject::connect(&tmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(tick())); + TQObject::connect(&tmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(tick())); } void SimClock::tick() { diff --git a/kstars/kstars/skymap.cpp b/kstars/kstars/skymap.cpp index 290540f2..0e7a929d 100644 --- a/kstars/kstars/skymap.cpp +++ b/kstars/kstars/skymap.cpp @@ -91,8 +91,8 @@ SkyMap::SkyMap(KStarsData *d, TQWidget *parent, const char *name ) //Initialize Transient label stuff TransientTimeout = 100; //fade label color every 0.2 sec - connect( &HoverTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTransientLabel() ) ); - connect( &TransientTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTransientTimeout() ) ); + connect( &HoverTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTransientLabel() ) ); + connect( &TransientTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTransientTimeout() ) ); IBoxes = new InfoBoxes( Options::windowWidth(), Options::windowHeight(), Options::positionTimeBox(), Options::shadeTimeBox(), @@ -111,14 +111,14 @@ SkyMap::SkyMap(KStarsData *d, TQWidget *parent, const char *name ) IBoxes->geoChanged( data->geo() ); - connect( IBoxes->timeBox(), TQT_SIGNAL( shaded(bool) ), data, TQT_SLOT( saveTimeBoxShaded(bool) ) ); - connect( IBoxes->geoBox(), TQT_SIGNAL( shaded(bool) ), data, TQT_SLOT( saveGeoBoxShaded(bool) ) ); - connect( IBoxes->focusBox(), TQT_SIGNAL( shaded(bool) ), data, TQT_SLOT( saveFocusBoxShaded(bool) ) ); - connect( IBoxes->timeBox(), TQT_SIGNAL( moved(TQPoint) ), data, TQT_SLOT( saveTimeBoxPos(TQPoint) ) ); - connect( IBoxes->geoBox(), TQT_SIGNAL( moved(TQPoint) ), data, TQT_SLOT( saveGeoBoxPos(TQPoint) ) ); - connect( IBoxes->focusBox(), TQT_SIGNAL( moved(TQPoint) ), data, TQT_SLOT( saveFocusBoxPos(TQPoint) ) ); + connect( IBoxes->timeBox(), TQ_SIGNAL( shaded(bool) ), data, TQ_SLOT( saveTimeBoxShaded(bool) ) ); + connect( IBoxes->geoBox(), TQ_SIGNAL( shaded(bool) ), data, TQ_SLOT( saveGeoBoxShaded(bool) ) ); + connect( IBoxes->focusBox(), TQ_SIGNAL( shaded(bool) ), data, TQ_SLOT( saveFocusBoxShaded(bool) ) ); + connect( IBoxes->timeBox(), TQ_SIGNAL( moved(TQPoint) ), data, TQ_SLOT( saveTimeBoxPos(TQPoint) ) ); + connect( IBoxes->geoBox(), TQ_SIGNAL( moved(TQPoint) ), data, TQ_SLOT( saveGeoBoxPos(TQPoint) ) ); + connect( IBoxes->focusBox(), TQ_SIGNAL( moved(TQPoint) ), data, TQ_SLOT( saveFocusBoxPos(TQPoint) ) ); - connect( this, TQT_SIGNAL( destinationChanged() ), this, TQT_SLOT( slewFocus() ) ); + connect( this, TQ_SIGNAL( destinationChanged() ), this, TQ_SLOT( slewFocus() ) ); //Initialize Refraction correction lookup table arrays. RefractCorr1 is for calculating //the apparent altitude from the true altitude, and RefractCorr2 is for the reverse. diff --git a/kstars/kstars/skymap.h b/kstars/kstars/skymap.h index 9e49a23e..cdc52fdc 100644 --- a/kstars/kstars/skymap.h +++ b/kstars/kstars/skymap.h @@ -161,8 +161,8 @@ public: void setFocusAltAz(double alt, double az); /**@short sets the destination point of the sky map. - *@note setDestination() emits the destinationChanged() SIGNAL, - *which triggers the TQT_SLOT function SkyMap::slewFocus(). This + *@note setDestination() emits the destinationChanged() signal, + *which triggers the slot function SkyMap::slewFocus(). This *function iteratively steps the Focus point toward Destination, *repainting the sky at each step (if Options::useAnimatedSlewing()==true). *@param f a pointer to the SkyPoint the map should slew to @@ -445,7 +445,7 @@ public slots: /**@short Center the display at the point ClickedPoint. * *The essential part of the function is to simply set the Destination point, which will emit - *the destinationChanged() SIGNAL, which triggers the slewFocus() SLOT. Additionally, this + *the destinationChanged() signal, which triggers the slewFocus() slot. Additionally, this *function performs some bookkeeping tasks, such updating whether we are tracking the new *object/position, adding a Planet Trail if required, etc. * @@ -885,8 +885,8 @@ private: *NULL pointer, and the TransientTimer is not already active. These conditions *are met when the mouse did not move for HOVER_INTERVAL msec (triggering a *TransientLabel), but the mouse has since been moved, thus ending the Hover event. - *This function merely starts the TransientTimer, whose timeout TQT_SIGNAL is - *connected to the slotTransientTimeout() SLOT, which handles the actual fading + *This function merely starts the TransientTimer, whose timeout signal is + *connected to the slotTransientTimeout() slot, which handles the actual fading *of the transient label, and eventually resets TransientObject to NULL. *@sa SkyMap::slotTransientLabel(), SkyMap::slotTransientTimeout() */ diff --git a/kstars/kstars/skymapevents.cpp b/kstars/kstars/skymapevents.cpp index 9205ab0e..2750f355 100644 --- a/kstars/kstars/skymapevents.cpp +++ b/kstars/kstars/skymapevents.cpp @@ -643,7 +643,7 @@ void SkyMap::mousePressEvent( TQMouseEvent *e ) { // if button is down and cursor is not moved set the move cursor after 500 ms TQTimer t; - t.singleShot (500, this, TQT_SLOT (setMouseMoveCursor())); + t.singleShot (500, this, TQ_SLOT (setMouseMoveCursor())); double dx = ( 0.5*width() - e->x() )/Options::zoomFactor(); double dy = ( 0.5*height() - e->y() )/Options::zoomFactor(); diff --git a/kstars/kstars/streamwg.cpp b/kstars/kstars/streamwg.cpp index 696f3468..a8a2a9fb 100644 --- a/kstars/kstars/streamwg.cpp +++ b/kstars/kstars/streamwg.cpp @@ -63,8 +63,8 @@ FILE *wfp; imgFormatCombo->insertStrList(TQImage::outputFormats()); - connect(playB, TQT_SIGNAL(clicked()), this, TQT_SLOT(playPressed())); - connect(captureB, TQT_SIGNAL(clicked()), this, TQT_SLOT(captureImage())); + connect(playB, TQ_SIGNAL(clicked()), this, TQ_SLOT(playPressed())); + connect(captureB, TQ_SIGNAL(clicked()), this, TQ_SLOT(captureImage())); } @@ -112,7 +112,7 @@ void StreamWG::setColorFrame(bool color) // callback notified sNotifier = new TQSocketNotifier( streamFD, TQSocketNotifier::Read, this); - TQObject::connect( sNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(streamReceived())); + TQObject::connect( sNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(streamReceived())); }*/ void StreamWG::enableStream(bool enable) diff --git a/kstars/kstars/telescopeprop.cpp b/kstars/kstars/telescopeprop.cpp index 93d15861..28cd1313 100644 --- a/kstars/kstars/telescopeprop.cpp +++ b/kstars/kstars/telescopeprop.cpp @@ -39,11 +39,11 @@ telescopeProp::telescopeProp(TQWidget* parent, const char* name, bool modal, WFl indi_driver = ksw->getINDIDriver(); newScopePending = false; - connect (newB, TQT_SIGNAL(clicked()), this, TQT_SLOT(newScope())); - connect (saveB, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveScope())); - connect (removeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeScope())); - connect (telescopeListBox, TQT_SIGNAL(highlighted(int)),this, TQT_SLOT(updateScopeDetails(int))); - connect(closeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(close())); + connect (newB, TQ_SIGNAL(clicked()), this, TQ_SLOT(newScope())); + connect (saveB, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveScope())); + connect (removeB, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeScope())); + connect (telescopeListBox, TQ_SIGNAL(highlighted(int)),this, TQ_SLOT(updateScopeDetails(int))); + connect(closeB, TQ_SIGNAL(clicked()), this, TQ_SLOT(close())); // Fill the combo box with drivers driverCombo->insertStringList(indi_driver->driversList); diff --git a/kstars/kstars/telescopewizardprocess.cpp b/kstars/kstars/telescopewizardprocess.cpp index d7eb6bd5..becd8ade 100644 --- a/kstars/kstars/telescopewizardprocess.cpp +++ b/kstars/kstars/telescopewizardprocess.cpp @@ -91,14 +91,14 @@ telescopeWizardProcess::telescopeWizardProcess( TQWidget* parent, const char* na portList << "/dev/ttyS0" << "/dev/ttyS1" << "/dev/ttyS2" << "/dev/ttyS3" << "/dev/ttyS4" << "/dev/ttyUSB0" << "/dev/ttyUSB1" << "/dev/ttyUSB2" << "/dev/ttyUSB3";// << "/dev/ttyUSB4"; - connect(helpB, TQT_SIGNAL(clicked()), parent, TQT_SLOT(appHelpActivated())); - connect(nextB, TQT_SIGNAL(clicked()), this, TQT_SLOT(processNext())); - connect(backB, TQT_SIGNAL(clicked()), this, TQT_SLOT(processBack())); - connect(setTimeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(newTime())); - connect(setLocationB, TQT_SIGNAL(clicked()), this, TQT_SLOT(newLocation())); + connect(helpB, TQ_SIGNAL(clicked()), parent, TQ_SLOT(appHelpActivated())); + connect(nextB, TQ_SIGNAL(clicked()), this, TQ_SLOT(processNext())); + connect(backB, TQ_SIGNAL(clicked()), this, TQ_SLOT(processBack())); + connect(setTimeB, TQ_SIGNAL(clicked()), this, TQ_SLOT(newTime())); + connect(setLocationB, TQ_SIGNAL(clicked()), this, TQ_SLOT(newLocation())); newDeviceTimer = new TQTimer(this); - TQObject::connect( newDeviceTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processPort()) ); + TQObject::connect( newDeviceTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processPort()) ); } @@ -289,8 +289,8 @@ void telescopeWizardProcess::processPort() { newDeviceTimer->stop(); linkRejected = false; - connect(indiDev->stdDev, TQT_SIGNAL(linkRejected()), this, TQT_SLOT(scanPorts())); - connect(indiDev->stdDev, TQT_SIGNAL(linkAccepted()), this, TQT_SLOT(linkSuccess())); + connect(indiDev->stdDev, TQ_SIGNAL(linkRejected()), this, TQ_SLOT(scanPorts())); + connect(indiDev->stdDev, TQ_SIGNAL(linkAccepted()), this, TQ_SLOT(linkSuccess())); scanPorts(); return; } diff --git a/kstars/kstars/thumbnaileditor.cpp b/kstars/kstars/thumbnaileditor.cpp index 00564495..f5049e92 100644 --- a/kstars/kstars/thumbnaileditor.cpp +++ b/kstars/kstars/thumbnaileditor.cpp @@ -43,7 +43,7 @@ ThumbnailEditor::ThumbnailEditor( TQWidget *parent, const char *name ) tp->imageRect()->width(), tp->imageRect()->height() ); ui->ImageCanvas->setImage( tp->currentListImage() ); - connect( ui->ImageCanvas, TQT_SIGNAL(cropRegionModified()), TQT_SLOT( slotUpdateCropLabel() ) ); + connect( ui->ImageCanvas, TQ_SIGNAL(cropRegionModified()), TQ_SLOT( slotUpdateCropLabel() ) ); slotUpdateCropLabel(); update(); diff --git a/kstars/kstars/thumbnailpicker.cpp b/kstars/kstars/thumbnailpicker.cpp index 08fd3328..c68e6bc6 100644 --- a/kstars/kstars/thumbnailpicker.cpp +++ b/kstars/kstars/thumbnailpicker.cpp @@ -59,14 +59,14 @@ ThumbnailPicker::ThumbnailPicker( SkyObject *o, const TQPixmap ¤t, TQWidge PixList.setAutoDelete( true ); - connect( ui->EditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditImage() ) ); - connect( ui->UnsetButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUnsetImage() ) ); - connect( ui->ImageList, TQT_SIGNAL( highlighted( int ) ), - this, TQT_SLOT( slotSetFromList( int ) ) ); - connect( ui->ImageURLBox, TQT_SIGNAL( urlSelected( const TQString& ) ), - this, TQT_SLOT( slotSetFromURL() ) ); - connect( ui->ImageURLBox, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( slotSetFromURL() ) ); + connect( ui->EditButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditImage() ) ); + connect( ui->UnsetButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUnsetImage() ) ); + connect( ui->ImageList, TQ_SIGNAL( highlighted( int ) ), + this, TQ_SLOT( slotSetFromList( int ) ) ); + connect( ui->ImageURLBox, TQ_SIGNAL( urlSelected( const TQString& ) ), + this, TQ_SLOT( slotSetFromURL() ) ); + connect( ui->ImageURLBox, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( slotSetFromURL() ) ); ui->ImageURLBox->lineEdit()->setTrapReturnKey( true ); ui->EditButton->setEnabled( false ); @@ -115,7 +115,7 @@ void ThumbnailPicker::slotFillList() { #if KDE_IS_VERSION( 3, 3, 90 ) ((TDEIO::CopyJob*)JobList.current())->setInteractive( false ); // suppress error dialogs #endif - connect (JobList.current(), TQT_SIGNAL (result(TDEIO::Job *)), TQT_SLOT (downloadReady (TDEIO::Job *))); + connect (JobList.current(), TQ_SIGNAL (result(TDEIO::Job *)), TQ_SLOT (downloadReady (TDEIO::Job *))); } } @@ -343,7 +343,7 @@ void ThumbnailPicker::slotSetFromURL() { #if KDE_IS_VERSION( 3, 3, 90 ) ((TDEIO::CopyJob*)JobList.current())->setInteractive( false ); // suppress error dialogs #endif - connect (JobList.current(), TQT_SIGNAL (result(TDEIO::Job *)), TQT_SLOT (downloadReady (TDEIO::Job *))); + connect (JobList.current(), TQ_SIGNAL (result(TDEIO::Job *)), TQ_SLOT (downloadReady (TDEIO::Job *))); // } diff --git a/kstars/kstars/timedialog.cpp b/kstars/kstars/timedialog.cpp index fec1d1c1..c88ce613 100644 --- a/kstars/kstars/timedialog.cpp +++ b/kstars/kstars/timedialog.cpp @@ -87,12 +87,12 @@ TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* parent ) vlay->activate(); - TQObject::connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() )); - TQObject::connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( reject() )); - TQObject::connect( NowButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( setNow() )); - TQObject::connect( HourBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( HourPrefix( int ) )); - TQObject::connect( MinuteBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( MinutePrefix( int ) )); - TQObject::connect( SecondBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( SecondPrefix( int ) )); + TQObject::connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( accept() )); + TQObject::connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( reject() )); + TQObject::connect( NowButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( setNow() )); + TQObject::connect( HourBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( HourPrefix( int ) )); + TQObject::connect( MinuteBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( MinutePrefix( int ) )); + TQObject::connect( SecondBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( SecondPrefix( int ) )); } //Add handler for Escape key to close window diff --git a/kstars/kstars/timespinbox.cpp b/kstars/kstars/timespinbox.cpp index 40e0b94f..df3fa775 100644 --- a/kstars/kstars/timespinbox.cpp +++ b/kstars/kstars/timespinbox.cpp @@ -56,7 +56,7 @@ TimeSpinBox::TimeSpinBox( TQWidget *parent, const char *name, bool _daysonly ) } setFixedWidth( wmax + extra ); - connect( this, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( reportChange() ) ); + connect( this, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( reportChange() ) ); updateDisplay(); } diff --git a/kstars/kstars/timestepbox.cpp b/kstars/kstars/timestepbox.cpp index 4941d56d..8b728768 100644 --- a/kstars/kstars/timestepbox.cpp +++ b/kstars/kstars/timestepbox.cpp @@ -42,9 +42,9 @@ TimeStepBox::TimeStepBox( TQWidget *parent, const char* name, bool daysonly ) timeBox->setValue( 4 ); //real-time - connect( unitBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changeUnits() ) ); - connect( timeBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( syncUnits( int ) ) ); - connect( timeBox, TQT_SIGNAL( scaleChanged( float ) ), this, TQT_SIGNAL( scaleChanged( float ) ) ); + connect( unitBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changeUnits() ) ); + connect( timeBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( syncUnits( int ) ) ); + connect( timeBox, TQ_SIGNAL( scaleChanged( float ) ), this, TQ_SIGNAL( scaleChanged( float ) ) ); } @@ -58,9 +58,9 @@ void TimeStepBox::syncUnits( int tstep ) { if ( abs(tstep) >= unitBox->getUnitValue( i ) ) break; //don't want setValue to trigger changeUnits()... - disconnect( unitBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changeUnits() ) ); + disconnect( unitBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changeUnits() ) ); unitBox->setValue( tstep < 0 ? -i : i ); - connect( unitBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changeUnits() ) ); + connect( unitBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changeUnits() ) ); } void TimeStepBox::setDaysOnly( bool daysonly ) { diff --git a/kstars/kstars/timeunitbox.cpp b/kstars/kstars/timeunitbox.cpp index 0b89f057..4305fbd0 100644 --- a/kstars/kstars/timeunitbox.cpp +++ b/kstars/kstars/timeunitbox.cpp @@ -34,8 +34,8 @@ TimeUnitBox::TimeUnitBox(TQWidget *parent, const char *name, bool daysonly ) setDaysOnly( daysonly ); - connect( UpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( increase() ) ); - connect( DownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( decrease() ) ); + connect( UpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( increase() ) ); + connect( DownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( decrease() ) ); } TimeUnitBox::~TimeUnitBox(){ diff --git a/kstars/kstars/tools/altvstime.cpp b/kstars/kstars/tools/altvstime.cpp index 0df74318..0fd67579 100644 --- a/kstars/kstars/tools/altvstime.cpp +++ b/kstars/kstars/tools/altvstime.cpp @@ -87,18 +87,18 @@ AltVsTime::AltVsTime( TQWidget* parent) : setLSTLimits(); View->updateTickmarks(); - connect( avtUI->browseButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBrowseObject() ) ); - connect( avtUI->cityButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChooseCity() ) ); - connect( avtUI->updateButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpdateDateLoc() ) ); - connect( avtUI->clearButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClear() ) ); - connect( avtUI->addButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddSource() ) ); - connect( avtUI->nameBox, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotAddSource() ) ); - connect( avtUI->raBox, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotAddSource() ) ); - connect( avtUI->decBox, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotAddSource() ) ); - connect( avtUI->clearFieldsButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClearBoxes() ) ); - connect( avtUI->longBox, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotAdvanceFocus() ) ); - connect( avtUI->latBox, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotAdvanceFocus() ) ); - connect( avtUI->PlotList, TQT_SIGNAL( highlighted(int) ), this, TQT_SLOT( slotHighlight() ) ); + connect( avtUI->browseButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBrowseObject() ) ); + connect( avtUI->cityButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChooseCity() ) ); + connect( avtUI->updateButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUpdateDateLoc() ) ); + connect( avtUI->clearButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClear() ) ); + connect( avtUI->addButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddSource() ) ); + connect( avtUI->nameBox, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotAddSource() ) ); + connect( avtUI->raBox, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotAddSource() ) ); + connect( avtUI->decBox, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotAddSource() ) ); + connect( avtUI->clearFieldsButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClearBoxes() ) ); + connect( avtUI->longBox, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotAdvanceFocus() ) ); + connect( avtUI->latBox, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotAdvanceFocus() ) ); + connect( avtUI->PlotList, TQ_SIGNAL( highlighted(int) ), this, TQ_SLOT( slotHighlight() ) ); pList.setAutoDelete(FALSE); deleteList.setAutoDelete(TRUE); //needed for skypoints which may be created in this class diff --git a/kstars/kstars/tools/astrocalc.cpp b/kstars/kstars/tools/astrocalc.cpp index bd9d2037..7ff8e73a 100644 --- a/kstars/kstars/tools/astrocalc.cpp +++ b/kstars/kstars/tools/astrocalc.cpp @@ -92,8 +92,8 @@ AstroCalc::AstroCalc( TQWidget* parent ) : solarItem->setPixmap(0,solarIcon); /*TQListViewItem * planetsItem = */new TQListViewItem(solarItem,i18n("Planets Coordinates")); - connect(navigationPanel, TQT_SIGNAL(clicked(TQListViewItem *)), this, - TQT_SLOT(slotItemSelection(TQListViewItem *))); + connect(navigationPanel, TQ_SIGNAL(clicked(TQListViewItem *)), this, + TQ_SLOT(slotItemSelection(TQListViewItem *))); } AstroCalc::~AstroCalc() diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp index bafc18ee..d708bbaf 100644 --- a/kstars/kstars/tools/lcgenerator.cpp +++ b/kstars/kstars/tools/lcgenerator.cpp @@ -212,11 +212,11 @@ void LCGenerator::createGUI() resize( TQSize(500, 360) ); // Signals/Slots - TQObject::connect(CloseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(close())); - TQObject::connect(GetCurveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(VerifyData())); - TQObject::connect(UpdateListButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateStarList())); - TQObject::connect(DesignationIn, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(updateNameList(int))); - TQObject::connect(NameIn, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(updateDesigList(int))); + TQObject::connect(CloseButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(close())); + TQObject::connect(GetCurveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(VerifyData())); + TQObject::connect(UpdateListButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateStarList())); + TQObject::connect(DesignationIn, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(updateNameList(int))); + TQObject::connect(NameIn, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(updateDesigList(int))); } @@ -427,7 +427,7 @@ void LCGenerator::updateStarList() KURL saveFile (file->name()); downloadJob = TDEIO::file_copy (AAVSOFile, saveFile, -1, true); - connect (downloadJob, TQT_SIGNAL (result (TDEIO::Job *)), TQT_SLOT (downloadReady (TDEIO::Job *))); + connect (downloadJob, TQ_SIGNAL (result (TDEIO::Job *)), TQ_SLOT (downloadReady (TDEIO::Job *))); } void LCGenerator::downloadReady(TDEIO::Job * job) diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp index e67f933c..5aae1f0c 100644 --- a/kstars/kstars/tools/observinglist.cpp +++ b/kstars/kstars/tools/observinglist.cpp @@ -67,40 +67,40 @@ ObservingList::ObservingList( KStars *_ks, TQWidget* parent ) ui->MiniButton->hide(); //Connections - connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SLOT( slotClose() ) ); - connect( ui->TableStack, TQT_SIGNAL( aboutToShow( TQWidget* ) ), - this, TQT_SLOT( slotPrepTable( TQWidget* ) ) ); - connect( ui->FullTable, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotNewSelection() ) ); - connect( ui->TinyTable, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotNewSelection() ) ); - connect( ui->FullTable, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int) ), - this, TQT_SLOT( slotCenterObject() ) ); - connect( ui->TinyTable, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ), - this, TQT_SLOT( slotCenterObject() ) ); - connect( ui->RemoveButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotRemoveObjects() ) ); - connect( ui->CenterButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotCenterObject() ) ); - connect( ui->ScopeButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotSlewToObject() ) ); - connect( ui->DetailsButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotDetails() ) ); - connect( ui->AVTButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotAVT() ) ); - - connect( ui->OpenButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotOpenList() ) ); - connect( ui->SaveButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotSaveList() ) ); - connect( ui->SaveAsButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotSaveListAs() ) ); - connect( ui->WizardButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotWizard() ) ); + connect( this, TQ_SIGNAL( closeClicked() ), this, TQ_SLOT( slotClose() ) ); + connect( ui->TableStack, TQ_SIGNAL( aboutToShow( TQWidget* ) ), + this, TQ_SLOT( slotPrepTable( TQWidget* ) ) ); + connect( ui->FullTable, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotNewSelection() ) ); + connect( ui->TinyTable, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotNewSelection() ) ); + connect( ui->FullTable, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int) ), + this, TQ_SLOT( slotCenterObject() ) ); + connect( ui->TinyTable, TQ_SIGNAL( doubleClicked( TQListBoxItem* ) ), + this, TQ_SLOT( slotCenterObject() ) ); + connect( ui->RemoveButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotRemoveObjects() ) ); + connect( ui->CenterButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotCenterObject() ) ); + connect( ui->ScopeButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotSlewToObject() ) ); + connect( ui->DetailsButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotDetails() ) ); + connect( ui->AVTButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotAVT() ) ); + + connect( ui->OpenButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotOpenList() ) ); + connect( ui->SaveButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotSaveList() ) ); + connect( ui->SaveAsButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotSaveListAs() ) ); + connect( ui->WizardButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotWizard() ) ); //FIXME: enable MiniButton -// connect( ui->MiniButton, TQT_SIGNAL( clicked() ), -// this, TQT_SLOT( slotToggleSize() ) ); +// connect( ui->MiniButton, TQ_SIGNAL( clicked() ), +// this, TQ_SLOT( slotToggleSize() ) ); obsList.setAutoDelete( false ); //do NOT delete removed pointers! diff --git a/kstars/kstars/tools/obslistwizard.cpp b/kstars/kstars/tools/obslistwizard.cpp index cf6c64d1..13864ece 100644 --- a/kstars/kstars/tools/obslistwizard.cpp +++ b/kstars/kstars/tools/obslistwizard.cpp @@ -44,35 +44,35 @@ ObsListWizard::ObsListWizard( TQWidget *parent, const char *name ) olw = new ObsListWizardUI( page ); vlay->addWidget( olw ); - connect( olw->AllButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAllButton() ) ); - connect( olw->NoneButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotNoneButton() ) ); - connect( olw->DeepSkyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDeepSkyButton() ) ); - connect( olw->SolarSystemButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSolarSystemButton() ) ); - connect( olw->LocationButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChangeLocation() ) ); + connect( olw->AllButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAllButton() ) ); + connect( olw->NoneButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNoneButton() ) ); + connect( olw->DeepSkyButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDeepSkyButton() ) ); + connect( olw->SolarSystemButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSolarSystemButton() ) ); + connect( olw->LocationButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChangeLocation() ) ); - connect( olw->FilterList, TQT_SIGNAL( clicked(TQListViewItem*) ), this, TQT_SLOT( slotShowStackWidget(TQListViewItem*) ) ); + connect( olw->FilterList, TQ_SIGNAL( clicked(TQListViewItem*) ), this, TQ_SLOT( slotShowStackWidget(TQListViewItem*) ) ); //Update the selected observing list when certain UI elements are modified - connect( olw->TypeList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->ConstellationList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->RAMin, TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->RAMax, TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->DecMin, TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->DecMax, TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->RA, TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->Dec, TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->Radius, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( slotUpdateObjectCount() ) ); -// connect( olw->Date, TQT_SIGNAL( valueChanged( const ExtDate& ) ), this, TQT_SLOT( slotApplyFilters() ) ); - connect( olw->Mag, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->ExcludeNoMag, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - - connect( olw->SelectByConstellation, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEnableConstellationPage(bool) ) ); - connect( olw->SelectByRect, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEnableRectPage(bool) ) ); - connect( olw->SelectByCirc, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEnableCircPage(bool) ) ); -// connect( olw->SelectByDate, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEnableDatePage(bool) ) ); - connect( olw->SelectByMag, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEnableMagPage(bool) ) ); - - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotApplyFilters() ) ); + connect( olw->TypeList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->ConstellationList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->RAMin, TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->RAMax, TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->DecMin, TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->DecMax, TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->RA, TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->Dec, TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->Radius, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( slotUpdateObjectCount() ) ); +// connect( olw->Date, TQ_SIGNAL( valueChanged( const ExtDate& ) ), this, TQ_SLOT( slotApplyFilters() ) ); + connect( olw->Mag, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->ExcludeNoMag, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + + connect( olw->SelectByConstellation, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEnableConstellationPage(bool) ) ); + connect( olw->SelectByRect, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEnableRectPage(bool) ) ); + connect( olw->SelectByCirc, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEnableCircPage(bool) ) ); +// connect( olw->SelectByDate, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEnableDatePage(bool) ) ); + connect( olw->SelectByMag, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEnableMagPage(bool) ) ); + + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotApplyFilters() ) ); initialize(); } diff --git a/kstars/kstars/tools/planetviewer.cpp b/kstars/kstars/tools/planetviewer.cpp index a4074067..982feefb 100644 --- a/kstars/kstars/tools/planetviewer.cpp +++ b/kstars/kstars/tools/planetviewer.cpp @@ -86,13 +86,13 @@ PlanetViewer::PlanetViewer(TQWidget *parent, const char *name) UpdateInterval[7] = 75; UpdateInterval[8] = 113; - TQTimer::singleShot( 0, this, TQT_SLOT( initPlotObjects() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( initPlotObjects() ) ); - connect( &tmr, TQT_SIGNAL( timeout() ), TQT_SLOT( tick() ) ); - connect( pw->timeStep, TQT_SIGNAL( scaleChanged(float) ), TQT_SLOT( setTimeScale(float) ) ); - connect( pw->RunButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRunClock() ) ); - connect( pw->dateBox, TQT_SIGNAL( valueChanged( const ExtDate & ) ), TQT_SLOT( slotChangeDate( const ExtDate & ) ) ); - connect( pw->TodayButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotToday() ) ); + connect( &tmr, TQ_SIGNAL( timeout() ), TQ_SLOT( tick() ) ); + connect( pw->timeStep, TQ_SIGNAL( scaleChanged(float) ), TQ_SLOT( setTimeScale(float) ) ); + connect( pw->RunButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRunClock() ) ); + connect( pw->dateBox, TQ_SIGNAL( valueChanged( const ExtDate & ) ), TQ_SLOT( slotChangeDate( const ExtDate & ) ) ); + connect( pw->TodayButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotToday() ) ); } PlanetViewer::~PlanetViewer() diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp index edb36217..2dbdb0a1 100644 --- a/kstars/kstars/tools/scriptbuilder.cpp +++ b/kstars/kstars/tools/scriptbuilder.cpp @@ -371,129 +371,129 @@ ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name ) initViewOptions(); //connect widgets in ScriptBuilderUI - connect( sb->FunctionListView, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT( slotAddFunction() ) ); - connect( sb->FunctionListView, TQT_SIGNAL( currentChanged(TQListViewItem*) ), this, TQT_SLOT( slotShowDoc() ) ); - connect( sb->UpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveFunctionUp() ) ); - connect( sb->ScriptListBox, TQT_SIGNAL( currentChanged(TQListBoxItem*) ), this, TQT_SLOT( slotArgWidget() ) ); - connect( sb->DownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveFunctionDown() ) ); - connect( sb->CopyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopyFunction() ) ); - connect( sb->RemoveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveFunction() ) ); - connect( sb->NewButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotNew() ) ); - connect( sb->OpenButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOpen() ) ); - connect( sb->SaveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSave() ) ); - connect( sb->SaveAsButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSaveAs() ) ); - connect( sb->AddButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddFunction() ) ); - connect( sb->RunButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRunScript() ) ); + connect( sb->FunctionListView, TQ_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int )), this, TQ_SLOT( slotAddFunction() ) ); + connect( sb->FunctionListView, TQ_SIGNAL( currentChanged(TQListViewItem*) ), this, TQ_SLOT( slotShowDoc() ) ); + connect( sb->UpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveFunctionUp() ) ); + connect( sb->ScriptListBox, TQ_SIGNAL( currentChanged(TQListBoxItem*) ), this, TQ_SLOT( slotArgWidget() ) ); + connect( sb->DownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveFunctionDown() ) ); + connect( sb->CopyButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCopyFunction() ) ); + connect( sb->RemoveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveFunction() ) ); + connect( sb->NewButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNew() ) ); + connect( sb->OpenButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpen() ) ); + connect( sb->SaveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSave() ) ); + connect( sb->SaveAsButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSaveAs() ) ); + connect( sb->AddButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddFunction() ) ); + connect( sb->RunButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRunScript() ) ); //Connections for Arg Widgets - connect( argSetGeoLocation->FindCityButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotFindCity() ) ); - connect( argLookToward->FindButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotFindObject() ) ); - connect( argChangeViewOption->TreeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowOptions() ) ); - - connect( argLookToward->FocusEdit, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotLookToward() ) ); - connect( argSetRaDec->RaBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotRa() ) ); - connect( argSetRaDec->DecBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotDec() ) ); - connect( argSetAltAz->AltBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotAlt() ) ); - connect( argSetAltAz->AzBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotAz() ) ); - connect( argSetLocalTime->DateBox, TQT_SIGNAL( changed(ExtDate) ), this, TQT_SLOT( slotChangeDate() ) ); - connect( argSetLocalTime->TimeBox, TQT_SIGNAL( valueChanged(const TQTime&) ), this, TQT_SLOT( slotChangeTime() ) ); - connect( argWaitFor->DelayBox, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotWaitFor() ) ); - connect( argWaitForKey->WaitKeyEdit, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotWaitForKey() ) ); - connect( argSetTracking->CheckTrack, TQT_SIGNAL( stateChanged(int) ), this, TQT_SLOT( slotTracking() ) ); - connect( argChangeViewOption->OptionName, TQT_SIGNAL( activated(const TQString &) ), this, TQT_SLOT( slotViewOption() ) ); - connect( argChangeViewOption->OptionValue, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotViewOption() ) ); - connect( argSetGeoLocation->CityName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotChangeCity() ) ); - connect( argSetGeoLocation->ProvinceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotChangeProvince() ) ); - connect( argSetGeoLocation->CountryName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotChangeCountry() ) ); - connect( argTimeScale->TimeScale, TQT_SIGNAL( scaleChanged(float) ), this, TQT_SLOT( slotTimeScale() ) ); - connect( argZoom->ZoomBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotZoom() ) ); - connect( argExportImage->ExportFileName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotExportImage() ) ); - connect( argExportImage->ExportWidth, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotExportImage() ) ); - connect( argExportImage->ExportHeight, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotExportImage() ) ); - connect( argPrintImage->UsePrintDialog, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotPrintImage() ) ); - connect( argPrintImage->UseChartColors, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotPrintImage() ) ); - connect( argSetColor->ColorName, TQT_SIGNAL( activated(const TQString &) ), this, TQT_SLOT( slotChangeColorName() ) ); - connect( argSetColor->ColorValue, TQT_SIGNAL( changed(const TQColor &) ), this, TQT_SLOT( slotChangeColor() ) ); - connect( argLoadColorScheme->SchemeList, TQT_SIGNAL( clicked( TQListBoxItem* ) ), this, TQT_SLOT( slotLoadColorScheme( TQListBoxItem* ) ) ); - connect( snd->ScriptName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotEnableScriptNameOK() ) ); - - connect( sb->AppendINDIWait, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT(slotINDIWaitCheck(bool))); + connect( argSetGeoLocation->FindCityButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotFindCity() ) ); + connect( argLookToward->FindButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotFindObject() ) ); + connect( argChangeViewOption->TreeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotShowOptions() ) ); + + connect( argLookToward->FocusEdit, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotLookToward() ) ); + connect( argSetRaDec->RaBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotRa() ) ); + connect( argSetRaDec->DecBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotDec() ) ); + connect( argSetAltAz->AltBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotAlt() ) ); + connect( argSetAltAz->AzBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotAz() ) ); + connect( argSetLocalTime->DateBox, TQ_SIGNAL( changed(ExtDate) ), this, TQ_SLOT( slotChangeDate() ) ); + connect( argSetLocalTime->TimeBox, TQ_SIGNAL( valueChanged(const TQTime&) ), this, TQ_SLOT( slotChangeTime() ) ); + connect( argWaitFor->DelayBox, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotWaitFor() ) ); + connect( argWaitForKey->WaitKeyEdit, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotWaitForKey() ) ); + connect( argSetTracking->CheckTrack, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( slotTracking() ) ); + connect( argChangeViewOption->OptionName, TQ_SIGNAL( activated(const TQString &) ), this, TQ_SLOT( slotViewOption() ) ); + connect( argChangeViewOption->OptionValue, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotViewOption() ) ); + connect( argSetGeoLocation->CityName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotChangeCity() ) ); + connect( argSetGeoLocation->ProvinceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotChangeProvince() ) ); + connect( argSetGeoLocation->CountryName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotChangeCountry() ) ); + connect( argTimeScale->TimeScale, TQ_SIGNAL( scaleChanged(float) ), this, TQ_SLOT( slotTimeScale() ) ); + connect( argZoom->ZoomBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotZoom() ) ); + connect( argExportImage->ExportFileName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotExportImage() ) ); + connect( argExportImage->ExportWidth, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotExportImage() ) ); + connect( argExportImage->ExportHeight, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotExportImage() ) ); + connect( argPrintImage->UsePrintDialog, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotPrintImage() ) ); + connect( argPrintImage->UseChartColors, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotPrintImage() ) ); + connect( argSetColor->ColorName, TQ_SIGNAL( activated(const TQString &) ), this, TQ_SLOT( slotChangeColorName() ) ); + connect( argSetColor->ColorValue, TQ_SIGNAL( changed(const TQColor &) ), this, TQ_SLOT( slotChangeColor() ) ); + connect( argLoadColorScheme->SchemeList, TQ_SIGNAL( clicked( TQListBoxItem* ) ), this, TQ_SLOT( slotLoadColorScheme( TQListBoxItem* ) ) ); + connect( snd->ScriptName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotEnableScriptNameOK() ) ); + + connect( sb->AppendINDIWait, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT(slotINDIWaitCheck(bool))); // Connections for INDI's Arg widgets // INDI Start Device - connect (argStartINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDIStartDeviceName())); - connect (argStartINDI->INDIMode, TQT_SIGNAL ( clicked( int)), this, TQT_SLOT (slotINDIStartDeviceMode())); + connect (argStartINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDIStartDeviceName())); + connect (argStartINDI->INDIMode, TQ_SIGNAL ( clicked( int)), this, TQ_SLOT (slotINDIStartDeviceMode())); // INDI Shutdown Device - connect (argShutdownINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDIShutdown())); + connect (argShutdownINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDIShutdown())); // INDI Swtich Device - connect (argSwitchINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISwitchDeviceName())); - connect (argSwitchINDI->INDIConnection, TQT_SIGNAL ( clicked( int)), this, TQT_SLOT (slotINDISwitchDeviceConnection())); + connect (argSwitchINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISwitchDeviceName())); + connect (argSwitchINDI->INDIConnection, TQ_SIGNAL ( clicked( int)), this, TQ_SLOT (slotINDISwitchDeviceConnection())); // INDI Set Device Port - connect (argSetPortINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetPortDeviceName())); - connect (argSetPortINDI->devicePort, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetPortDevicePort())); + connect (argSetPortINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetPortDeviceName())); + connect (argSetPortINDI->devicePort, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetPortDevicePort())); // INDI Set Target Coord - connect (argSetTargetCoordINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetTargetCoordDeviceName())); - connect( argSetTargetCoordINDI->RaBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotINDISetTargetCoordDeviceRA() ) ); - connect( argSetTargetCoordINDI->DecBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotINDISetTargetCoordDeviceDEC() ) ); + connect (argSetTargetCoordINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetTargetCoordDeviceName())); + connect( argSetTargetCoordINDI->RaBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotINDISetTargetCoordDeviceRA() ) ); + connect( argSetTargetCoordINDI->DecBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotINDISetTargetCoordDeviceDEC() ) ); // INDI Set Target Name - connect( argSetTargetNameINDI->FindButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotINDIFindObject() ) ); - connect (argSetTargetNameINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetTargetNameDeviceName())); - connect (argSetTargetNameINDI->objectName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetTargetNameObjectName())); + connect( argSetTargetNameINDI->FindButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotINDIFindObject() ) ); + connect (argSetTargetNameINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetTargetNameDeviceName())); + connect (argSetTargetNameINDI->objectName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetTargetNameObjectName())); // INDI Set Action - connect (argSetActionINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetActionDeviceName())); - connect (argSetActionINDI->actionName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetActionName())); + connect (argSetActionINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetActionDeviceName())); + connect (argSetActionINDI->actionName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetActionName())); // INDI Wait For Action - connect (argWaitForActionINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDIWaitForActionDeviceName())); - connect (argWaitForActionINDI->actionName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDIWaitForActionName())); + connect (argWaitForActionINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDIWaitForActionDeviceName())); + connect (argWaitForActionINDI->actionName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDIWaitForActionName())); // INDI Set Focus Speed - connect (argSetFocusSpeedINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetFocusSpeedDeviceName())); - connect (argSetFocusSpeedINDI->speedIN, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT(slotINDISetFocusSpeed())); + connect (argSetFocusSpeedINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetFocusSpeedDeviceName())); + connect (argSetFocusSpeedINDI->speedIN, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT(slotINDISetFocusSpeed())); // INDI Start Focus - connect (argStartFocusINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDIStartFocusDeviceName())); - connect (argStartFocusINDI->directionCombo, TQT_SIGNAL( activated(const TQString &) ), this, TQT_SLOT(slotINDIStartFocusDirection())); + connect (argStartFocusINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDIStartFocusDeviceName())); + connect (argStartFocusINDI->directionCombo, TQ_SIGNAL( activated(const TQString &) ), this, TQ_SLOT(slotINDIStartFocusDirection())); // INDI Set Focus Timeout - connect (argSetFocusTimeoutINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetFocusTimeoutDeviceName())); - connect (argSetFocusTimeoutINDI->timeOut, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT(slotINDISetFocusTimeout())); + connect (argSetFocusTimeoutINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetFocusTimeoutDeviceName())); + connect (argSetFocusTimeoutINDI->timeOut, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT(slotINDISetFocusTimeout())); // INDI Set Geo Location - connect (argSetGeoLocationINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetGeoLocationDeviceName())); - connect( argSetGeoLocationINDI->longBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotINDISetGeoLocationDeviceLong() ) ); - connect( argSetGeoLocationINDI->latBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotINDISetGeoLocationDeviceLat() ) ); + connect (argSetGeoLocationINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetGeoLocationDeviceName())); + connect( argSetGeoLocationINDI->longBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotINDISetGeoLocationDeviceLong() ) ); + connect( argSetGeoLocationINDI->latBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotINDISetGeoLocationDeviceLat() ) ); // INDI Start Exposure - connect (argStartExposureINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDIStartExposureDeviceName())); - connect (argStartExposureINDI->timeOut, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT(slotINDIStartExposureTimeout())); + connect (argStartExposureINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDIStartExposureDeviceName())); + connect (argStartExposureINDI->timeOut, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT(slotINDIStartExposureTimeout())); // INDI Set UTC - connect (argSetUTCINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetUTCDeviceName())); - connect (argSetUTCINDI->UTC, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetUTC())); + connect (argSetUTCINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetUTCDeviceName())); + connect (argSetUTCINDI->UTC, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetUTC())); // INDI Set Scope Action - connect (argSetScopeActionINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetScopeActionDeviceName())); - connect (argSetScopeActionINDI->actionCombo, TQT_SIGNAL( activated(const TQString &) ), this, TQT_SLOT(slotINDISetScopeAction())); + connect (argSetScopeActionINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetScopeActionDeviceName())); + connect (argSetScopeActionINDI->actionCombo, TQ_SIGNAL( activated(const TQString &) ), this, TQ_SLOT(slotINDISetScopeAction())); // INDI Set Frame type - connect (argSetFrameTypeINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetFrameTypeDeviceName())); - connect (argSetFrameTypeINDI->typeCombo, TQT_SIGNAL( activated(const TQString &) ), this, TQT_SLOT(slotINDISetFrameType())); + connect (argSetFrameTypeINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetFrameTypeDeviceName())); + connect (argSetFrameTypeINDI->typeCombo, TQ_SIGNAL( activated(const TQString &) ), this, TQ_SLOT(slotINDISetFrameType())); // INDI Set CCD Temp - connect (argSetCCDTempINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetCCDTempDeviceName())); - connect (argSetCCDTempINDI->temp, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT(slotINDISetCCDTemp())); + connect (argSetCCDTempINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetCCDTempDeviceName())); + connect (argSetCCDTempINDI->temp, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT(slotINDISetCCDTemp())); // INDI Set Filter Num - connect (argSetFilterNumINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetFilterNumDeviceName())); - connect (argSetFilterNumINDI->filter_num, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT(slotINDISetFilterNum())); + connect (argSetFilterNumINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetFilterNumDeviceName())); + connect (argSetFilterNumINDI->filter_num, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT(slotINDISetFilterNum())); //disbale some buttons diff --git a/kstars/kstars/tools/wutdialog.cpp b/kstars/kstars/tools/wutdialog.cpp index f2ed8c7c..d326ae06 100644 --- a/kstars/kstars/tools/wutdialog.cpp +++ b/kstars/kstars/tools/wutdialog.cpp @@ -88,21 +88,21 @@ WUTDialog::WUTDialog(KStars *ks) : makeConnections(); - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } WUTDialog::~WUTDialog(){ } void WUTDialog::makeConnections() { - connect( WUT->DateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotChangeDate() ) ); - connect( WUT->LocationButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotChangeLocation() ) ); - connect( WUT->CenterButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCenter() ) ); - connect( WUT->DetailButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDetails() ) ); - connect( WUT->CategoryListBox, TQT_SIGNAL( highlighted(int) ), TQT_SLOT( slotLoadList(int) ) ); - connect( WUT->ObjectListBox, TQT_SIGNAL( selectionChanged(TQListBoxItem*) ), - TQT_SLOT( slotDisplayObject(TQListBoxItem*) ) ); - connect( WUT->EveningMorningBox, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotEveningMorning(int) ) ); + connect( WUT->DateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotChangeDate() ) ); + connect( WUT->LocationButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotChangeLocation() ) ); + connect( WUT->CenterButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCenter() ) ); + connect( WUT->DetailButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDetails() ) ); + connect( WUT->CategoryListBox, TQ_SIGNAL( highlighted(int) ), TQ_SLOT( slotLoadList(int) ) ); + connect( WUT->ObjectListBox, TQ_SIGNAL( selectionChanged(TQListBoxItem*) ), + TQ_SLOT( slotDisplayObject(TQListBoxItem*) ) ); + connect( WUT->EveningMorningBox, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotEveningMorning(int) ) ); } void WUTDialog::initCategories() { diff --git a/kstars/kstars/tools/wutdialog.h b/kstars/kstars/tools/wutdialog.h index 04e44c7e..95f83b90 100644 --- a/kstars/kstars/tools/wutdialog.h +++ b/kstars/kstars/tools/wutdialog.h @@ -97,7 +97,7 @@ class WUTDialog : public KDialogBase { KStars *kstars; WUTDialogUI *WUT; - /**@short Initialize all SIGNAL/TQT_SLOT connections, used in constructor */ + /**@short Initialize all signal/slot connections, used in constructor */ void makeConnections(); /**@short Initialize catgory list, used in constructor */ diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp index 10752cb2..b10dd9f8 100644 --- a/ktouch/src/ktouch.cpp +++ b/ktouch/src/ktouch.cpp @@ -431,16 +431,16 @@ void KTouch::optionsPreferences() { dialog->addPage(m_pageKeyboard, i18n("Keyboard Settings"), "keyboard_layout"); m_pageColors = new KTouchPrefColorsLayout(0, "Colors"); dialog->addPage(m_pageColors, i18n("Color Settings"), "applications-graphics"); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(applyPreferences())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(applyPreferences())); // TODO : Connect some other buttons/check boxes of the dialog - connect(m_pageGeneral->kcfg_OverrideLectureFont, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configOverrideLectureFontToggled(bool))); - connect(m_pageKeyboard->kcfg_OverrideKeyboardFont, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configOverrideKeyboardFontToggled(bool))); - connect(m_pageTraining->kcfg_AutoLevelChange, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configAutoLevelChangeToggled(bool))); - connect(m_pageColors->kcfg_CommonTypingLineColors, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configCommonColorsToggled(bool))); + connect(m_pageGeneral->kcfg_OverrideLectureFont, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configOverrideLectureFontToggled(bool))); + connect(m_pageKeyboard->kcfg_OverrideKeyboardFont, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configOverrideKeyboardFontToggled(bool))); + connect(m_pageTraining->kcfg_AutoLevelChange, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configAutoLevelChangeToggled(bool))); + connect(m_pageColors->kcfg_CommonTypingLineColors, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configCommonColorsToggled(bool))); // call the functions to enable/disable controls depending on settings configOverrideLectureFontToggled(Prefs::overrideLectureFont()); configOverrideKeyboardFontToggled(Prefs::overrideKeyboardFont()); @@ -684,37 +684,37 @@ void KTouch::initTrainingSession() { void KTouch::setupActions() { // *** File menu *** new TDEAction(i18n("&Open lecture..."), "open_lecture", 0, - this, TQT_SLOT(fileOpenLecture()), actionCollection(), "file_openlecture"); + this, TQ_SLOT(fileOpenLecture()), actionCollection(), "file_openlecture"); new TDEAction(i18n("&Edit lecture..."), "edit_lecture", 0, - this, TQT_SLOT(fileEditLecture()), actionCollection(), "file_editlecture"); + this, TQ_SLOT(fileEditLecture()), actionCollection(), "file_editlecture"); new TDEAction(i18n("&Edit color scheme..."), "edit_colors", 0, - this, TQT_SLOT(fileEditColors()), actionCollection(), "file_editcolors"); + this, TQ_SLOT(fileEditColors()), actionCollection(), "file_editcolors"); // new TDEAction(i18n("&Edit Keyboard..."), "edit_keyboard", 0, -// this, TQT_SLOT(fileEditKeyboard()), actionCollection(), "file_editkeyboard"); - KStdAction::quit(this, TQT_SLOT(fileQuit()), actionCollection()); +// this, TQ_SLOT(fileEditKeyboard()), actionCollection(), "file_editkeyboard"); + KStdAction::quit(this, TQ_SLOT(fileQuit()), actionCollection()); // *** Training menu *** new TDEAction(i18n("&Start New Session"), "launch", 0, - this, TQT_SLOT(trainingNewSession()), actionCollection(), "training_newsession"); + this, TQ_SLOT(trainingNewSession()), actionCollection(), "training_newsession"); m_trainingPause = new TDEAction(i18n("&Pause Session"), "media-playback-pause", 0, - this, TQT_SLOT(trainingPause()), actionCollection(), "training_pause"); + this, TQ_SLOT(trainingPause()), actionCollection(), "training_pause"); new TDEAction(i18n("&Lecture Statistics"), "kalarm", 0, - this, TQT_SLOT(trainingStatistics()), actionCollection(), "training_stats"); + this, TQ_SLOT(trainingStatistics()), actionCollection(), "training_stats"); // Setup menu entries for the training lectures m_defaultLectureAction = new TDESelectAction(i18n("Default &Lectures"), 0, this, 0, actionCollection(), "default_lectures"); m_defaultLectureAction->setMenuAccelsEnabled(false); m_defaultLectureAction->setItems(m_lectureTitles); m_defaultLectureAction->setCurrentItem(0); - connect (m_defaultLectureAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeLecture(int))); + connect (m_defaultLectureAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changeLecture(int))); // *** Settings menu *** - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // Setup menu entries for keyboard layouts m_keyboardLayoutAction= new TDESelectAction(i18n("&Keyboard Layouts"), 0, this, 0, actionCollection(), "keyboard_layouts"); m_keyboardLayoutAction->setMenuAccelsEnabled(false); m_keyboardLayoutAction->setItems(m_keyboardTitles); - connect (m_keyboardLayoutAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeKeyboard(int))); + connect (m_keyboardLayoutAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changeKeyboard(int))); // Setup menu entries for colour schemes m_keyboardColorAction = new TDESelectAction(i18n("&Color Schemes"), 0, this, 0, actionCollection(), "keyboard_schemes"); @@ -726,7 +726,7 @@ void KTouch::setupActions() { if (static_cast<unsigned int>(Prefs::currentColorScheme()) >= schemes_list.count()) Prefs::setCurrentColorScheme(1); m_keyboardColorAction->setCurrentItem(Prefs::currentColorScheme()); - connect (m_keyboardColorAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeColor(int))); + connect (m_keyboardColorAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changeColor(int))); } // ---------------------------------------------------------------------------- diff --git a/ktouch/src/ktouchlectureeditor.cpp b/ktouch/src/ktouchlectureeditor.cpp index 513a740a..66f6aead 100644 --- a/ktouch/src/ktouchlectureeditor.cpp +++ b/ktouch/src/ktouchlectureeditor.cpp @@ -46,18 +46,18 @@ KTouchLectureEditor::KTouchLectureEditor(TQWidget *parent, const char* name, boo { levelListView->setSorting(-1); // don't sort my level list view! - connect(levelListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),this, TQT_SLOT(newSelection(TQListViewItem*)) ); - connect(newCharsEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(newCharsChanged(const TQString&)) ); - connect(newBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(newLevel()) ); - connect(deleteBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteLevel()) ); - connect(upBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveUp()) ); - connect(downBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveDown()) ); + connect(levelListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)),this, TQ_SLOT(newSelection(TQListViewItem*)) ); + connect(newCharsEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(newCharsChanged(const TQString&)) ); + connect(newBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(newLevel()) ); + connect(deleteBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteLevel()) ); + connect(upBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveUp()) ); + connect(downBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveDown()) ); // make the connections for making the lecture modified - connect(titleEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(setModified()) ); - connect(lectureCommentEdit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setModified()) ); - connect(levelCommentEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(setModified()) ); - connect(linesTextEdit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setModified()) ); + connect(titleEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(setModified()) ); + connect(lectureCommentEdit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(setModified()) ); + connect(levelCommentEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(setModified()) ); + connect(linesTextEdit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(setModified()) ); // The font, open, save, saveas and close buttons are already connected } diff --git a/ktouch/src/ktouchslideline.cpp b/ktouch/src/ktouchslideline.cpp index 5ed89201..366fbd77 100644 --- a/ktouch/src/ktouchslideline.cpp +++ b/ktouch/src/ktouchslideline.cpp @@ -77,8 +77,8 @@ KTouchSlideLine::KTouchSlideLine(TQWidget *parent) m_xFrameStudent = 0; m_xFrameStudentCurrent = 0; - connect( &m_cursorTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(toggleCursor()) ); - connect( &m_slideTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slide()) ); + connect( &m_cursorTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(toggleCursor()) ); + connect( &m_slideTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slide()) ); } // ---------------------------------------------------------------------------- diff --git a/ktouch/src/ktouchstatistics.cpp b/ktouch/src/ktouchstatistics.cpp index 0cfdeb2e..488ab6b0 100644 --- a/ktouch/src/ktouchstatistics.cpp +++ b/ktouch/src/ktouchstatistics.cpp @@ -40,13 +40,13 @@ KTouchStatistics::KTouchStatistics(TQWidget* parent) sessionsRadio->setChecked(true); WPMRadio->setChecked(true); eventRadio->setChecked(true); - connect(closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect(lectureCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(lectureActivated(int)) ); - connect(clearButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearHistory()) ); + connect(closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect(lectureCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(lectureActivated(int)) ); + connect(clearButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearHistory()) ); // connect the radio buttons with the chart update function - connect(buttonGroup1, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(updateChartTab()) ); - connect(buttonGroup2, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(updateChartTab()) ); - connect(buttonGroup3, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(updateChartTab()) ); + connect(buttonGroup1, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(updateChartTab()) ); + connect(buttonGroup2, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(updateChartTab()) ); + connect(buttonGroup3, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(updateChartTab()) ); // TODO : temporarily remove detailed stats page and deactivate options levelsRadio->setEnabled(false); diff --git a/ktouch/src/ktouchtrainer.cpp b/ktouch/src/ktouchtrainer.cpp index 568e25c5..72fc4980 100644 --- a/ktouch/src/ktouchtrainer.cpp +++ b/ktouch/src/ktouchtrainer.cpp @@ -55,9 +55,9 @@ KTouchTrainer::KTouchTrainer(KTouchStatus *status, KTouchSlideLine *slideLine, K m_levelDownSound = TDEGlobal::dirs()->findResource("appdata","down.wav"); m_typeWriterSound = TDEGlobal::dirs()->findResource("appdata","typewriter.wav"); - connect(m_statusWidget->levelUpBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(levelUp()) ); - connect(m_statusWidget->levelDownBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(levelDown()) ); - connect(m_trainingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerTick()) ); + connect(m_statusWidget->levelUpBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(levelUp()) ); + connect(m_statusWidget->levelDownBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(levelDown()) ); + connect(m_trainingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerTick()) ); } // ---------------------------------------------------------------------------- diff --git a/ktouch/src/main.cpp b/ktouch/src/main.cpp index cebc0a0d..0e5ad898 100644 --- a/ktouch/src/main.cpp +++ b/ktouch/src/main.cpp @@ -61,7 +61,7 @@ int main(int argc, char **argv) splash.setHideEnabled( true ); // allow user to click the splash screen away splash.show(); // show it TQTimer splashTimer; - splashTimer.connect(&splashTimer, TQT_SIGNAL(timeout()), &splash, TQT_SLOT(hide())); + splashTimer.connect(&splashTimer, TQ_SIGNAL(timeout()), &splash, TQ_SLOT(hide())); splashTimer.start(2000, true); // start singleshot timer to hide the splashscreen */ diff --git a/kturtle/src/dialogs.cpp b/kturtle/src/dialogs.cpp index 1690ca02..d358860c 100644 --- a/kturtle/src/dialogs.cpp +++ b/kturtle/src/dialogs.cpp @@ -28,8 +28,8 @@ ErrorMessage::ErrorMessage (TQWidget *parent) : KDialogBase (parent, "errorDialog", false, 0, KDialogBase::Close | KDialogBase::Help | KDialogBase::User1, KDialogBase::Close, true, i18n("Help on &Error") ) { - connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( showHelpOnError() ) ); - connect( this, TQT_SIGNAL( helpClicked() ), this, TQT_SLOT( errorMessageHelp() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( showHelpOnError() ) ); + connect( this, TQ_SIGNAL( helpClicked() ), this, TQ_SLOT( errorMessageHelp() ) ); setCaption( i18n("Error Dialog") ); setButtonWhatsThis( KDialogBase::Close, i18n("Closes this error dialog") ); setButtonWhatsThis( KDialogBase::Help, i18n("Click here to read more on this error dialog in KTurtle's Handbook.") ); @@ -107,7 +107,7 @@ void ErrorMessage::display() enableButton (KDialogBase::User1, false); errTable->sortColumn(0, true, true); show(); - connect( errTable, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( updateSelection() ) ); + connect( errTable, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( updateSelection() ) ); } void ErrorMessage::updateSelection() @@ -144,10 +144,10 @@ ColorPicker::ColorPicker(TQWidget *parent) : KDialogBase(parent, "colorpicker", false, i18n("Color Picker"), KDialogBase::Close | KDialogBase::Help | KDialogBase::User1, KDialogBase::Close, true ) { // connect to help - connect( this, TQT_SIGNAL( helpClicked() ), TQT_SLOT( slotColorPickerHelp() ) ); + connect( this, TQ_SIGNAL( helpClicked() ), TQ_SLOT( slotColorPickerHelp() ) ); // for toggling convenience - connect( this, TQT_SIGNAL( finished() ), TQT_SLOT( slotEmitVisibility() ) ); + connect( this, TQ_SIGNAL( finished() ), TQ_SLOT( slotEmitVisibility() ) ); // Create the top level page and its layout BaseWidget = new TQWidget(this); @@ -155,7 +155,7 @@ ColorPicker::ColorPicker(TQWidget *parent) // the User1 button: setButtonText( KDialogBase::User1, i18n("Insert Color Code at Cursor") ); - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotEmitColorCode() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotEmitColorCode() ) ); TQVBoxLayout *vlayout = new TQVBoxLayout(BaseWidget); @@ -170,14 +170,14 @@ ColorPicker::ColorPicker(TQWidget *parent) hsSelector = new KHSSelector(BaseWidget); // the color (SH) selector hsSelector->setMinimumSize(300, 150); h1layout->addWidget(hsSelector); - connect( hsSelector, TQT_SIGNAL( valueChanged(int, int) ), TQT_SLOT( slotSelectorChanged(int, int) ) ); + connect( hsSelector, TQ_SIGNAL( valueChanged(int, int) ), TQ_SLOT( slotSelectorChanged(int, int) ) ); h1layout->addSpacing(5); // space in between valuePal = new KValueSelector(BaseWidget); // the darkness (V) pal valuePal->setFixedWidth(30); h1layout->addWidget(valuePal); - connect( valuePal, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotPalChanged(int) ) ); + connect( valuePal, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( slotPalChanged(int) ) ); vlayout->addSpacing(15); // space in between the top and the bottom widgets @@ -203,7 +203,7 @@ ColorPicker::ColorPicker(TQWidget *parent) colorcode = new TQLineEdit(BaseWidget); // the code generator colorcode->setReadOnly(true); v2layout->addWidget(colorcode); - connect( colorcode, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotReselect() ) ); + connect( colorcode, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotReselect() ) ); h2layout->addSpacing(5); // spacing on the right border @@ -269,9 +269,9 @@ void ColorPicker::slotPalChanged(int v_) void ColorPicker::slotReselect() { // reselect by selectAll(), but make sure no looping occurs - disconnect( colorcode, TQT_SIGNAL( selectionChanged() ), 0, 0 ); + disconnect( colorcode, TQ_SIGNAL( selectionChanged() ), 0, 0 ); colorcode->selectAll(); - connect( colorcode, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotReselect() ) ); + connect( colorcode, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotReselect() ) ); } void ColorPicker::slotEmitVisibility() diff --git a/kturtle/src/executer.cpp b/kturtle/src/executer.cpp index 9268eab1..eec03261 100644 --- a/kturtle/src/executer.cpp +++ b/kturtle/src/executer.cpp @@ -1015,7 +1015,7 @@ void Executer::startWaiting(int msec) { bStopWaiting = false; // call a timer that sets stopWaiting to true when it runs - TQTimer::singleShot( msec, this, TQT_SLOT( slotStopWaiting() ) ); + TQTimer::singleShot( msec, this, TQ_SLOT( slotStopWaiting() ) ); while (bStopWaiting == false) { if (bAbort) return; // waits need to be interrupted by the stop action diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp index 81c70f2b..b62f5e4c 100644 --- a/kturtle/src/kturtle.cpp +++ b/kturtle/src/kturtle.cpp @@ -123,59 +123,59 @@ void MainWindow::setupActions() TDEActionCollection *ac = actionCollection(); // abbreviation // File actions - KStdAction::openNew(this, TQT_SLOT(slotNewFile()), ac); - openExAction = new TDEAction(i18n("Open Exa&mples..."), "bookmark_folder", CTRL+Key_E, this, TQT_SLOT(slotOpenExample()), ac, "open_examples"); - KStdAction::open(this, TQT_SLOT(slotOpenFile()), ac); - m_recentFiles = KStdAction::openRecent(this, TQT_SLOT(slotOpenFile(const KURL&)), ac); - KStdAction::save(this, TQT_SLOT(slotSaveFile()), ac); - KStdAction::saveAs(this, TQT_SLOT(slotSaveAs()), ac); - new TDEAction(i18n("Save &Canvas..."), 0, 0, this, TQT_SLOT(slotSaveCanvas()), ac, "save_canvas"); - speed = new TDESelectAction(i18n("Execution Speed"), 0, ALT+Key_S, this, TQT_SLOT( slotChangeSpeed() ), ac, "speed"); + KStdAction::openNew(this, TQ_SLOT(slotNewFile()), ac); + openExAction = new TDEAction(i18n("Open Exa&mples..."), "bookmark_folder", CTRL+Key_E, this, TQ_SLOT(slotOpenExample()), ac, "open_examples"); + KStdAction::open(this, TQ_SLOT(slotOpenFile()), ac); + m_recentFiles = KStdAction::openRecent(this, TQ_SLOT(slotOpenFile(const KURL&)), ac); + KStdAction::save(this, TQ_SLOT(slotSaveFile()), ac); + KStdAction::saveAs(this, TQ_SLOT(slotSaveAs()), ac); + new TDEAction(i18n("Save &Canvas..."), 0, 0, this, TQ_SLOT(slotSaveCanvas()), ac, "save_canvas"); + speed = new TDESelectAction(i18n("Execution Speed"), 0, ALT+Key_S, this, TQ_SLOT( slotChangeSpeed() ), ac, "speed"); TQStringList speeds; speeds << i18n("Full Speed") << i18n("Slow") << i18n("Slower") << i18n("Slowest"); speed->setItems(speeds); speed->setCurrentItem(0); - run = new TDEAction(i18n("&Execute Commands"), "gear", ALT+Key_Return, this, TQT_SLOT( slotExecute() ), ac, "run"); - pause = new TDEToggleAction(i18n("Pause E&xecution"), "media-playback-pause", Key_Pause, this, TQT_SLOT( slotPauseExecution() ), ac, "pause"); + run = new TDEAction(i18n("&Execute Commands"), "gear", ALT+Key_Return, this, TQ_SLOT( slotExecute() ), ac, "run"); + pause = new TDEToggleAction(i18n("Pause E&xecution"), "media-playback-pause", Key_Pause, this, TQ_SLOT( slotPauseExecution() ), ac, "pause"); pause->setChecked(false); pause->setEnabled(false); - stop = new TDEAction(i18n("Stop E&xecution"), "process-stop", Key_Escape, this, TQT_SLOT( slotAbortExecution() ), ac, "stop"); + stop = new TDEAction(i18n("Stop E&xecution"), "process-stop", Key_Escape, this, TQ_SLOT( slotAbortExecution() ), ac, "stop"); stop->setEnabled(false); - KStdAction::print(this, TQT_SLOT(slotPrint()), ac); - KStdAction::quit(this, TQT_SLOT(close()), ac); + KStdAction::print(this, TQ_SLOT(slotPrint()), ac); + KStdAction::quit(this, TQ_SLOT(close()), ac); // Edit actions - KStdAction::undo(this, TQT_SLOT(slotUndo()), ac); - KStdAction::redo(this, TQT_SLOT(slotRedo()), ac); - KStdAction::cut(this, TQT_SLOT(slotCut()), ac); - KStdAction::copy(this, TQT_SLOT(slotCopy()), ac); - KStdAction::paste(this, TQT_SLOT(slotPaste()), ac); - KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), ac); - KStdAction::deselect(this, TQT_SLOT(slotClearSelection()), ac); - new TDEToggleAction(i18n("Toggle Insert"), Key_Insert, this, TQT_SLOT(slotToggleInsert()), ac, "set_insert"); - KStdAction::find(this, TQT_SLOT(slotFind()), ac); - KStdAction::findNext(this, TQT_SLOT(slotFindNext()), ac); - KStdAction::findPrev(this, TQT_SLOT(slotFindPrevious()), ac); - KStdAction::replace(this, TQT_SLOT(slotReplace()), ac); + KStdAction::undo(this, TQ_SLOT(slotUndo()), ac); + KStdAction::redo(this, TQ_SLOT(slotRedo()), ac); + KStdAction::cut(this, TQ_SLOT(slotCut()), ac); + KStdAction::copy(this, TQ_SLOT(slotCopy()), ac); + KStdAction::paste(this, TQ_SLOT(slotPaste()), ac); + KStdAction::selectAll(this, TQ_SLOT(slotSelectAll()), ac); + KStdAction::deselect(this, TQ_SLOT(slotClearSelection()), ac); + new TDEToggleAction(i18n("Toggle Insert"), Key_Insert, this, TQ_SLOT(slotToggleInsert()), ac, "set_insert"); + KStdAction::find(this, TQ_SLOT(slotFind()), ac); + KStdAction::findNext(this, TQ_SLOT(slotFindNext()), ac); + KStdAction::findPrev(this, TQ_SLOT(slotFindPrevious()), ac); + KStdAction::replace(this, TQ_SLOT(slotReplace()), ac); // View actions - new TDEToggleAction(i18n("Show &Line Numbers"), 0, Key_F11, this, TQT_SLOT(slotToggleLineNumbers()), ac, "line_numbers"); - m_fullscreen = KStdAction::fullScreen(this, TQT_SLOT(slotToggleFullscreen()), ac, this, "full_screen"); + new TDEToggleAction(i18n("Show &Line Numbers"), 0, Key_F11, this, TQ_SLOT(slotToggleLineNumbers()), ac, "line_numbers"); + m_fullscreen = KStdAction::fullScreen(this, TQ_SLOT(slotToggleFullscreen()), ac, this, "full_screen"); m_fullscreen->setChecked(b_fullscreen); // Tools actions - colorpicker = new TDEToggleAction(i18n("&Color Picker"), "colorize", ALT+Key_C, this, TQT_SLOT(slotColorPicker()), ac, "color_picker"); - new TDEAction(i18n("&Indent"), "format-indent-more", CTRL+Key_I, this, TQT_SLOT(slotIndent()), ac, "edit_indent"); - new TDEAction(i18n("&Unindent"), "format-indent-less", CTRL+SHIFT+Key_I, this, TQT_SLOT(slotUnIndent()), ac, "edit_unindent"); - new TDEAction(i18n("Cl&ean Indentation"), 0, 0, this, TQT_SLOT(slotCleanIndent()), ac, "edit_cleanIndent"); - new TDEAction(i18n("Co&mment"), 0, CTRL+Key_D, this, TQT_SLOT(slotComment()), ac, "edit_comment"); - new TDEAction(i18n("Unc&omment"), 0, CTRL+SHIFT+Key_D, this, TQT_SLOT(slotUnComment()), ac, "edit_uncomment"); + colorpicker = new TDEToggleAction(i18n("&Color Picker"), "colorize", ALT+Key_C, this, TQ_SLOT(slotColorPicker()), ac, "color_picker"); + new TDEAction(i18n("&Indent"), "format-indent-more", CTRL+Key_I, this, TQ_SLOT(slotIndent()), ac, "edit_indent"); + new TDEAction(i18n("&Unindent"), "format-indent-less", CTRL+SHIFT+Key_I, this, TQ_SLOT(slotUnIndent()), ac, "edit_unindent"); + new TDEAction(i18n("Cl&ean Indentation"), 0, 0, this, TQ_SLOT(slotCleanIndent()), ac, "edit_cleanIndent"); + new TDEAction(i18n("Co&mment"), 0, CTRL+Key_D, this, TQ_SLOT(slotComment()), ac, "edit_comment"); + new TDEAction(i18n("Unc&omment"), 0, CTRL+SHIFT+Key_D, this, TQ_SLOT(slotUnComment()), ac, "edit_uncomment"); // Settings actions - KStdAction::preferences( this, TQT_SLOT(slotSettings()), ac ); - new TDEAction(i18n("&Configure Editor..."), "configure", 0, this, TQT_SLOT(slotEditor()), ac, "set_confdlg"); + KStdAction::preferences( this, TQ_SLOT(slotSettings()), ac ); + new TDEAction(i18n("&Configure Editor..."), "configure", 0, this, TQ_SLOT(slotEditor()), ac, "set_confdlg"); // Help actions - ContextHelp = new TDEAction(0, 0, Key_F2, this, TQT_SLOT(slotContextHelp()), ac, "context_help"); + ContextHelp = new TDEAction(0, 0, Key_F2, this, TQ_SLOT(slotContextHelp()), ac, "context_help"); slotContextHelpUpdate(); // this sets the label of this action // other @@ -204,9 +204,9 @@ void MainWindow::setupEditor() slotSetHighlightstyle( Settings::logoLanguage() ); // allow the cursor position to be indicated in the statusbar - connect( editor, TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(slotCursorStatusBar()) ); + connect( editor, TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(slotCursorStatusBar()) ); // and update the context help menu item - connect( editor, TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(slotContextHelpUpdate()) ); + connect( editor, TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(slotContextHelpUpdate()) ); translate = new Translate(); } @@ -236,7 +236,7 @@ void MainWindow::setupCanvas() baseLayout->setColStretch(0, 1); TQWhatsThis::add( canvasView, i18n("This is the canvas, here the turtle draws a picture.") ); canvasView->show(); - connect( canvasView, TQT_SIGNAL( CanvasResized() ), this, TQT_SLOT( slotUpdateCanvas() ) ); + connect( canvasView, TQ_SIGNAL( CanvasResized() ), this, TQ_SLOT( slotUpdateCanvas() ) ); } // END @@ -525,10 +525,10 @@ void MainWindow::slotExecute() TQString txt = editorInterface->text() + "\x0a\x0a"; // parser expects input to have 2 delimiting newlines TQTextIStream in(&txt); // create the stream Parser parser(in); // pass the reference to the stream to the parse object - connect(&parser, TQT_SIGNAL( ErrorMsg(Token&, const TQString&, uint) ), - errMsg, TQT_SLOT( slotAddError(Token&, const TQString&, uint) ) ); - connect( errMsg, TQT_SIGNAL(setSelection(uint, uint, uint, uint) ), - this, TQT_SLOT(slotSetSelection(uint, uint, uint, uint) ) ); + connect(&parser, TQ_SIGNAL( ErrorMsg(Token&, const TQString&, uint) ), + errMsg, TQ_SLOT( slotAddError(Token&, const TQString&, uint) ) ); + connect( errMsg, TQ_SIGNAL(setSelection(uint, uint, uint, uint) ), + this, TQ_SLOT(slotSetSelection(uint, uint, uint, uint) ) ); parser.parse(); // and GO! TreeNode* root = parser.getTree(); // when finished parsing get the nodeTree kdDebug(0)<<"############## PARSING FINISHED ##############"<<endl; @@ -541,42 +541,42 @@ void MainWindow::slotExecute() kdDebug(0)<<"############## EXECUTION STARTED ##############"<<endl; exe = new Executer(root); // make Executer object, 'exe', and pass it the nodeTree - connect(this, TQT_SIGNAL( changeSpeed(int) ), exe, TQT_SLOT(slotChangeSpeed(int) ) ); - connect(this, TQT_SIGNAL( unpauseExecution() ), exe, TQT_SLOT( slotStopPausing() ) ); - connect( exe, TQT_SIGNAL( setSelection(uint, uint, uint, uint) ), - this, TQT_SLOT ( slotSetSelection(uint, uint, uint, uint) ) ); - connect( exe, TQT_SIGNAL( ErrorMsg(Token&, const TQString&, uint) ), - errMsg, TQT_SLOT ( slotAddError(Token&, const TQString&, uint) ) ); - connect( exe, TQT_SIGNAL( InputDialog(TQString&) ), this, TQT_SLOT( slotInputDialog(TQString&) ) ); - connect( exe, TQT_SIGNAL( MessageDialog(TQString) ), this, TQT_SLOT( slotMessageDialog(TQString) ) ); + connect(this, TQ_SIGNAL( changeSpeed(int) ), exe, TQ_SLOT(slotChangeSpeed(int) ) ); + connect(this, TQ_SIGNAL( unpauseExecution() ), exe, TQ_SLOT( slotStopPausing() ) ); + connect( exe, TQ_SIGNAL( setSelection(uint, uint, uint, uint) ), + this, TQ_SLOT ( slotSetSelection(uint, uint, uint, uint) ) ); + connect( exe, TQ_SIGNAL( ErrorMsg(Token&, const TQString&, uint) ), + errMsg, TQ_SLOT ( slotAddError(Token&, const TQString&, uint) ) ); + connect( exe, TQ_SIGNAL( InputDialog(TQString&) ), this, TQ_SLOT( slotInputDialog(TQString&) ) ); + connect( exe, TQ_SIGNAL( MessageDialog(TQString) ), this, TQ_SLOT( slotMessageDialog(TQString) ) ); // Connect the signals form Executer to the slots from Canvas: - connect( exe, TQT_SIGNAL( Clear() ), canvasView, TQT_SLOT( slotClear() ) ); - connect( exe, TQT_SIGNAL( Go(double, double) ), canvasView, TQT_SLOT( slotGo(double, double) ) ); - connect( exe, TQT_SIGNAL( GoX(double) ), canvasView, TQT_SLOT( slotGoX(double) ) ); - connect( exe, TQT_SIGNAL( GoY(double) ), canvasView, TQT_SLOT( slotGoY(double) ) ); - connect( exe, TQT_SIGNAL( Forward(double) ), canvasView, TQT_SLOT( slotForward(double) ) ); - connect( exe, TQT_SIGNAL( Backward(double) ), canvasView, TQT_SLOT( slotBackward(double) ) ); - connect( exe, TQT_SIGNAL( Direction(double) ), canvasView, TQT_SLOT( slotDirection(double) ) ); - connect( exe, TQT_SIGNAL( TurnLeft(double) ), canvasView, TQT_SLOT( slotTurnLeft(double) ) ); - connect( exe, TQT_SIGNAL( TurnRight(double) ), canvasView, TQT_SLOT( slotTurnRight(double) ) ); - connect( exe, TQT_SIGNAL( Center() ), canvasView, TQT_SLOT( slotCenter() ) ); - connect( exe, TQT_SIGNAL( SetPenWidth(int) ), canvasView, TQT_SLOT( slotSetPenWidth(int) ) ); - connect( exe, TQT_SIGNAL( PenUp() ), canvasView, TQT_SLOT( slotPenUp() ) ); - connect( exe, TQT_SIGNAL( PenDown() ), canvasView, TQT_SLOT( slotPenDown() ) ); - connect( exe, TQT_SIGNAL( SetFgColor(int, int, int) ), canvasView, TQT_SLOT( slotSetFgColor(int, int, int) ) ); - connect( exe, TQT_SIGNAL( SetBgColor(int, int, int) ), canvasView, TQT_SLOT( slotSetBgColor(int, int, int) ) ); - connect( exe, TQT_SIGNAL( ResizeCanvas(int, int) ), canvasView, TQT_SLOT( slotResizeCanvas(int, int) ) ); - connect( exe, TQT_SIGNAL( SpriteShow() ), canvasView, TQT_SLOT( slotSpriteShow() ) ); - connect( exe, TQT_SIGNAL( SpriteHide() ), canvasView, TQT_SLOT( slotSpriteHide() ) ); - connect( exe, TQT_SIGNAL( SpritePress() ), canvasView, TQT_SLOT( slotSpritePress() ) ); - connect( exe, TQT_SIGNAL( SpriteChange(int) ), canvasView, TQT_SLOT( slotSpriteChange(int) ) ); - connect( exe, TQT_SIGNAL( Print(TQString) ), canvasView, TQT_SLOT( slotPrint(TQString) ) ); - connect( exe, TQT_SIGNAL( FontType(TQString, TQString) ), canvasView, TQT_SLOT( slotFontType(TQString, TQString) ) ); - connect( exe, TQT_SIGNAL( FontSize(int) ), canvasView, TQT_SLOT( slotFontSize(int) ) ); - connect( exe, TQT_SIGNAL( WrapOn() ), canvasView, TQT_SLOT( slotWrapOn() ) ); - connect( exe, TQT_SIGNAL( WrapOff() ), canvasView, TQT_SLOT( slotWrapOff() ) ); - connect( exe, TQT_SIGNAL( Reset() ), canvasView, TQT_SLOT( slotReset() ) ); + connect( exe, TQ_SIGNAL( Clear() ), canvasView, TQ_SLOT( slotClear() ) ); + connect( exe, TQ_SIGNAL( Go(double, double) ), canvasView, TQ_SLOT( slotGo(double, double) ) ); + connect( exe, TQ_SIGNAL( GoX(double) ), canvasView, TQ_SLOT( slotGoX(double) ) ); + connect( exe, TQ_SIGNAL( GoY(double) ), canvasView, TQ_SLOT( slotGoY(double) ) ); + connect( exe, TQ_SIGNAL( Forward(double) ), canvasView, TQ_SLOT( slotForward(double) ) ); + connect( exe, TQ_SIGNAL( Backward(double) ), canvasView, TQ_SLOT( slotBackward(double) ) ); + connect( exe, TQ_SIGNAL( Direction(double) ), canvasView, TQ_SLOT( slotDirection(double) ) ); + connect( exe, TQ_SIGNAL( TurnLeft(double) ), canvasView, TQ_SLOT( slotTurnLeft(double) ) ); + connect( exe, TQ_SIGNAL( TurnRight(double) ), canvasView, TQ_SLOT( slotTurnRight(double) ) ); + connect( exe, TQ_SIGNAL( Center() ), canvasView, TQ_SLOT( slotCenter() ) ); + connect( exe, TQ_SIGNAL( SetPenWidth(int) ), canvasView, TQ_SLOT( slotSetPenWidth(int) ) ); + connect( exe, TQ_SIGNAL( PenUp() ), canvasView, TQ_SLOT( slotPenUp() ) ); + connect( exe, TQ_SIGNAL( PenDown() ), canvasView, TQ_SLOT( slotPenDown() ) ); + connect( exe, TQ_SIGNAL( SetFgColor(int, int, int) ), canvasView, TQ_SLOT( slotSetFgColor(int, int, int) ) ); + connect( exe, TQ_SIGNAL( SetBgColor(int, int, int) ), canvasView, TQ_SLOT( slotSetBgColor(int, int, int) ) ); + connect( exe, TQ_SIGNAL( ResizeCanvas(int, int) ), canvasView, TQ_SLOT( slotResizeCanvas(int, int) ) ); + connect( exe, TQ_SIGNAL( SpriteShow() ), canvasView, TQ_SLOT( slotSpriteShow() ) ); + connect( exe, TQ_SIGNAL( SpriteHide() ), canvasView, TQ_SLOT( slotSpriteHide() ) ); + connect( exe, TQ_SIGNAL( SpritePress() ), canvasView, TQ_SLOT( slotSpritePress() ) ); + connect( exe, TQ_SIGNAL( SpriteChange(int) ), canvasView, TQ_SLOT( slotSpriteChange(int) ) ); + connect( exe, TQ_SIGNAL( Print(TQString) ), canvasView, TQ_SLOT( slotPrint(TQString) ) ); + connect( exe, TQ_SIGNAL( FontType(TQString, TQString) ), canvasView, TQ_SLOT( slotFontType(TQString, TQString) ) ); + connect( exe, TQ_SIGNAL( FontSize(int) ), canvasView, TQ_SLOT( slotFontSize(int) ) ); + connect( exe, TQ_SIGNAL( WrapOn() ), canvasView, TQ_SLOT( slotWrapOn() ) ); + connect( exe, TQ_SIGNAL( WrapOff() ), canvasView, TQ_SLOT( slotWrapOff() ) ); + connect( exe, TQ_SIGNAL( Reset() ), canvasView, TQ_SLOT( slotReset() ) ); // START EXECUTION on the selected speed, and use the feedbacked boolean value slotChangeSpeed(); @@ -625,7 +625,7 @@ void MainWindow::finishExecution() if (speed->currentItem() == 0) slotClearSelection(); // if coming from fullscreen-mode show the editor, menu- and statusbar - if (b_fullscreen) TQTimer::singleShot( 1000, this, TQT_SLOT( slotFinishedFullScreenExecution() ) ); + if (b_fullscreen) TQTimer::singleShot( 1000, this, TQ_SLOT( slotFinishedFullScreenExecution() ) ); } void MainWindow::slotChangeSpeed() @@ -833,9 +833,9 @@ void MainWindow::slotFinishedFullScreenExecution() if ( errMsg->containsErrors() ) slotBackToFullScreen(); // straight back to edit if there where errors else { - connect( restartOrBackDialog, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotRestartFullScreen() ) ); - connect( restartOrBackDialog, TQT_SIGNAL( user2Clicked() ), this, TQT_SLOT( slotBackToFullScreen() ) ); - connect( restartOrBackDialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotBackToFullScreen() ) ); + connect( restartOrBackDialog, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( slotRestartFullScreen() ) ); + connect( restartOrBackDialog, TQ_SIGNAL( user2Clicked() ), this, TQ_SLOT( slotBackToFullScreen() ) ); + connect( restartOrBackDialog, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotBackToFullScreen() ) ); restartOrBackDialog->show(); restartOrBackDialog->move(50, 50); } @@ -870,7 +870,7 @@ void MainWindow::slotSettings() // Create a new dialog with the same name as the above checking code. TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self() ); // connect the help - connect( dialog, TQT_SIGNAL( helpClicked() ), this, TQT_SLOT( slotSettingsHelp() ) ); + connect( dialog, TQ_SIGNAL( helpClicked() ), this, TQ_SLOT( slotSettingsHelp() ) ); // making the filling for the 'General' settings dept. general = new TQWidget(); @@ -946,7 +946,7 @@ void MainWindow::slotSettings() dialog->addPage( language, i18n("Language"), "locale", i18n("Language Settings") ); // When the user clicks OK or Apply we want to update our settings. - connect( dialog, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotUpdateSettings() ) ); + connect( dialog, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotUpdateSettings() ) ); // Display the dialog is there where errors. dialog->setInitialSize( TQSize(550, 300) ); @@ -1150,8 +1150,8 @@ void MainWindow::slotColorPicker() { picker = new ColorPicker(this); if(picker == 0) return; // safety - connect( picker, TQT_SIGNAL( visible(bool) ), colorpicker, TQT_SLOT( setChecked(bool) ) ); - connect( picker, TQT_SIGNAL( ColorCode(TQString) ), this, TQT_SLOT( slotInsertText(TQString) ) ); + connect( picker, TQ_SIGNAL( visible(bool) ), colorpicker, TQ_SLOT( setChecked(bool) ) ); + connect( picker, TQ_SIGNAL( ColorCode(TQString) ), this, TQ_SLOT( slotInsertText(TQString) ) ); } // if picker is not 0, there is a colorpickerdialog which only needs to be shown OR hidden if ( picker->isHidden() ) diff --git a/kverbos/kverbos/kverbos.cpp b/kverbos/kverbos/kverbos.cpp index 32803a58..82baf9a0 100644 --- a/kverbos/kverbos/kverbos.cpp +++ b/kverbos/kverbos/kverbos.cpp @@ -108,7 +108,7 @@ KVerbosApp::~KVerbosApp() kverbosCounter--; if (kfeederControl) { - disconnect(view, TQT_SIGNAL(informKFeeder(int)), this, TQT_SLOT(slotFeedIt(int))); + disconnect(view, TQ_SIGNAL(informKFeeder(int)), this, TQ_SLOT(slotFeedIt(int))); delete kfeederControl; kfeederControl = 0; }; @@ -116,25 +116,25 @@ KVerbosApp::~KVerbosApp() void KVerbosApp::initActions() { - fileNewWindow = new TDEAction(i18n("New &Window"), "window_new.png", 0, this, TQT_SLOT(slotFileNewWindow()), actionCollection(),"file_new_window"); - fileNew = KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection()); - fileOpen = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection()); - fileOpenRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - fileOpenStandard = new TDEAction(i18n("Open &Standard Verb File"), "fileopen.png", 0, this, TQT_SLOT(slotFileOpenStandard()), actionCollection(),"file_open_standard"); - fileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection()); - fileSaveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection()); - fileClose = KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection()); - filePrint = KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection()); - fileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); - editCut = KStdAction::cut(this, TQT_SLOT(slotEditCut()), actionCollection()); - editCopy = KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection()); - editPaste = KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection()); - editErfassen = new TDEAction(i18n("E&nter New Verb..."), 0, 0, this, TQT_SLOT(slotEditErfassen()), actionCollection(),"edit_erfassen"); - editBearbeiten = new TDEAction(i18n("&Edit Verb List..."), 0, 0, this, TQT_SLOT(slotEditBearbeiten()), actionCollection(), "edit_bearbeiten"); - - settingOptions = new TDEAction(i18n("&Configure KVerbos..."), 0, 0, this, TQT_SLOT(slotSettingsOptions()), actionCollection(), "settings_options"); - userUsername = new TDEAction(i18n("&Username..."), 0, 0, this, TQT_SLOT(slotSettingsUsername()), actionCollection(), "user_username"); - userResults = new TDEAction(i18n("&Results"), 0, 0, this, TQT_SLOT(slotUserResults()), actionCollection(), "user_results"); + fileNewWindow = new TDEAction(i18n("New &Window"), "window_new.png", 0, this, TQ_SLOT(slotFileNewWindow()), actionCollection(),"file_new_window"); + fileNew = KStdAction::openNew(this, TQ_SLOT(slotFileNew()), actionCollection()); + fileOpen = KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection()); + fileOpenRecent = KStdAction::openRecent(this, TQ_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); + fileOpenStandard = new TDEAction(i18n("Open &Standard Verb File"), "fileopen.png", 0, this, TQ_SLOT(slotFileOpenStandard()), actionCollection(),"file_open_standard"); + fileSave = KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection()); + fileSaveAs = KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection()); + fileClose = KStdAction::close(this, TQ_SLOT(slotFileClose()), actionCollection()); + filePrint = KStdAction::print(this, TQ_SLOT(slotFilePrint()), actionCollection()); + fileQuit = KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); + editCut = KStdAction::cut(this, TQ_SLOT(slotEditCut()), actionCollection()); + editCopy = KStdAction::copy(this, TQ_SLOT(slotEditCopy()), actionCollection()); + editPaste = KStdAction::paste(this, TQ_SLOT(slotEditPaste()), actionCollection()); + editErfassen = new TDEAction(i18n("E&nter New Verb..."), 0, 0, this, TQ_SLOT(slotEditErfassen()), actionCollection(),"edit_erfassen"); + editBearbeiten = new TDEAction(i18n("&Edit Verb List..."), 0, 0, this, TQ_SLOT(slotEditBearbeiten()), actionCollection(), "edit_bearbeiten"); + + settingOptions = new TDEAction(i18n("&Configure KVerbos..."), 0, 0, this, TQ_SLOT(slotSettingsOptions()), actionCollection(), "settings_options"); + userUsername = new TDEAction(i18n("&Username..."), 0, 0, this, TQ_SLOT(slotSettingsUsername()), actionCollection(), "user_username"); + userResults = new TDEAction(i18n("&Results"), 0, 0, this, TQ_SLOT(slotUserResults()), actionCollection(), "user_results"); fileNewWindow->setToolTip(i18n("Opens a new application window")); fileOpenStandard->setToolTip(i18n("Opens the standard KVerbos verb file")); @@ -182,8 +182,8 @@ void KVerbosApp::initDocument() { doc = new KVerbosDoc(this); doc->newDocument(); - connect(doc, TQT_SIGNAL(anzahlVerbenGeaendert(int)), this, TQT_SLOT(slotStatusVerbMsg(int))); - connect(this, TQT_SIGNAL(testAnzahl(int)), this, TQT_SLOT(slotStatusVerbMsg(int))); + connect(doc, TQ_SIGNAL(anzahlVerbenGeaendert(int)), this, TQ_SLOT(slotStatusVerbMsg(int))); + connect(this, TQ_SIGNAL(testAnzahl(int)), this, TQ_SLOT(slotStatusVerbMsg(int))); } void KVerbosApp::initView() @@ -197,9 +197,9 @@ void KVerbosApp::initView() setCentralWidget(view); setCaption(doc->URL().fileName(),false); // - connect(view, TQT_SIGNAL(numberTrainedChanged(int)), this, TQT_SLOT(slotStatusTrainedMsg(int))); - connect(view, TQT_SIGNAL(numberCorrectChanged(int)), this, TQT_SLOT(slotStatusCorrectMsg(int))); - connect(view, TQT_SIGNAL(informKFeeder(int)), this, TQT_SLOT(slotFeedIt(int))); + connect(view, TQ_SIGNAL(numberTrainedChanged(int)), this, TQ_SLOT(slotStatusTrainedMsg(int))); + connect(view, TQ_SIGNAL(numberCorrectChanged(int)), this, TQ_SLOT(slotStatusCorrectMsg(int))); + connect(view, TQ_SIGNAL(informKFeeder(int)), this, TQ_SLOT(slotFeedIt(int))); } void KVerbosApp::openDocumentFile(const KURL& url) @@ -343,7 +343,7 @@ bool KVerbosApp::queryExit() } ///////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATION +// SLOT IMPLEMENTATION ///////////////////////////////////////////////////////////////////// void KVerbosApp::slotFileNewWindow() @@ -710,7 +710,7 @@ void KVerbosApp::slotSettingsOptions() if ((pDlgEdit->CheckBoxKFeeder->isChecked() == false) && (useKFeeder)) { // kfeeder anhalten - disconnect(view, TQT_SIGNAL(informKFeeder(int)), this, TQT_SLOT(slotFeedIt(int))); + disconnect(view, TQ_SIGNAL(informKFeeder(int)), this, TQ_SLOT(slotFeedIt(int))); delete kfeederControl; kfeederControl = 0; }; diff --git a/kverbos/kverbos/kverbosdoc.cpp b/kverbos/kverbos/kverbosdoc.cpp index 608f6b33..33e9b865 100644 --- a/kverbos/kverbos/kverbosdoc.cpp +++ b/kverbos/kverbos/kverbosdoc.cpp @@ -68,7 +68,7 @@ KVerbosDoc::~KVerbosDoc() void KVerbosDoc::addView(KVerbosView *view) { pViewList->append(view); - connect(this, TQT_SIGNAL(changeView()), view, TQT_SLOT(zeigeVerb())); + connect(this, TQ_SIGNAL(changeView()), view, TQ_SLOT(zeigeVerb())); } void KVerbosDoc::removeView(KVerbosView *view) diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp index 5ca5de2f..1d39a821 100644 --- a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp @@ -77,23 +77,23 @@ static ListRef date_itemlist [] = BlockOptions::BlockOptions(TQWidget* parent, const char* name, WFlags fl) : BlockOptionsBase(parent, name, fl) { - connect(expire1, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(block1, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(expire2, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(block2, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(expire3, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(block3, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(expire4, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(block4, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(expire5, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(block5, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(expire6, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(block6, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(expire7, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(block7, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - - connect(kcfg_Block, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotBlockToggled(bool))); - connect(kcfg_Expire, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExpireToggled(bool))); + connect(expire1, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(block1, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(expire2, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(block2, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(expire3, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(block3, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(expire4, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(block4, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(expire5, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(block5, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(expire6, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(block6, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(expire7, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(block7, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + + connect(kcfg_Block, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotBlockToggled(bool))); + connect(kcfg_Expire, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotExpireToggled(bool))); fillWidgets(); updateWidgets(); diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp index 05f9e590..89c88657 100644 --- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp @@ -67,26 +67,26 @@ KVocTrainPrefs::KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * les m_languageOptions = new LanguageOptions(m_langSet, 0, "Language Settings"); addPage(m_languageOptions, i18n("Languages"), "set_language", i18n("Language Settings"), true); - connect(m_languageOptions, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons())); + connect(m_languageOptions, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(updateButtons())); m_viewOptions = new ViewOptions(0, "View Settings"); addPage(m_viewOptions, i18n("View"), "view_choose", i18n("View Settings"), true); m_pasteOptions = new PasteOptions(m_langSet, doc, 0, "Copy & Paste Settings"); addPage(m_pasteOptions, i18n("Copy & Paste"), "edit-paste", i18n("Copy & Paste Settings"), true); - connect(m_pasteOptions, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons())); + connect(m_pasteOptions, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(updateButtons())); m_queryOptions = new QueryOptions(0, "Query Settings"); addPage(m_queryOptions, i18n("Query"), "run_query", i18n("Query Settings"), true); m_thresholdOptions = new ThresholdOptions(lessons, m_queryManager, 0, "Threshold Settings"); addPage(m_thresholdOptions, i18n("Thresholds"), "configure", i18n("Threshold Settings"), true); - connect(m_thresholdOptions, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons())); + connect(m_thresholdOptions, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(updateButtons())); m_blockOptions = new BlockOptions(0, "Blocking Settings"); addPage(m_blockOptions, i18n("Blocking"), "configure", i18n("Blocking Settings"), true); - connect(m_blockOptions, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons())); - connect(m_blockOptions, TQT_SIGNAL(blockExpireChanged(bool, bool)), m_thresholdOptions, TQT_SLOT(slotBlockExpire(bool, bool))); + connect(m_blockOptions, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(updateButtons())); + connect(m_blockOptions, TQ_SIGNAL(blockExpireChanged(bool, bool)), m_thresholdOptions, TQ_SLOT(slotBlockExpire(bool, bool))); setButtonGuiItem(KDialogBase::User1, KGuiItem(i18n("&Profiles..."))); setButtonTip(KDialogBase::User1, i18n("Save or load specific Query settings which consist in a profile")); @@ -143,7 +143,7 @@ void KVocTrainPrefs::slotUser1() if (showDlg) { ProfilesDialog * dlg = new ProfilesDialog(m_queryManager, this, 0, true); - connect(dlg, TQT_SIGNAL(profileActivated()), this, TQT_SLOT(updateWidgets())); + connect(dlg, TQ_SIGNAL(profileActivated()), this, TQ_SLOT(updateWidgets())); dlg->show(); } } diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp index e786b534..b2cf665b 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp @@ -682,14 +682,14 @@ LanguageOptions::LanguageOptions(LangSet & langset, TQWidget* parent, const char { langset_popup = 0; - connect(b_langDel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteClicked())); - connect(b_langNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewClicked())); - connect(b_langPixmap, TQT_SIGNAL(clicked()), TQT_SLOT(slotPixmapClicked())); - connect(e_newName, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotNewNameChanged(const TQString&))); - connect(d_shortName, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotShortActivated(const TQString&))); - connect(e_langLong, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotLangChanged(const TQString&))); - connect(e_shortName2, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotShort2Changed(const TQString&))); - connect(d_kblayout, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotKeyboardLayoutChanged(const TQString&))); + connect(b_langDel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteClicked())); + connect(b_langNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewClicked())); + connect(b_langPixmap, TQ_SIGNAL(clicked()), TQ_SLOT(slotPixmapClicked())); + connect(e_newName, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotNewNameChanged(const TQString&))); + connect(d_shortName, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(slotShortActivated(const TQString&))); + connect(e_langLong, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotLangChanged(const TQString&))); + connect(e_shortName2, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotShort2Changed(const TQString&))); + connect(d_kblayout, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(slotKeyboardLayoutChanged(const TQString&))); // Load the languages first, then the countries and create the // menus for the languages last, so they will have flags @@ -1099,11 +1099,11 @@ void LanguageOptions::loadCountryData() for (TQMap<TQString, Region>::Iterator it = regions.begin(); it != regions.end(); ++it) regmap.insert(it.data().region, it.data()); - connect(langset_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotLangFromGlobalActivated(int))); + connect(langset_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotLangFromGlobalActivated(int))); for (TQMap<TQString, Region>::Iterator it = regmap.begin(); it != regmap.end(); ++it) { TQPopupMenu *regpop = new TQPopupMenu(); - connect(regpop, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotLangFromGlobalActivated(int))); + connect(regpop, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotLangFromGlobalActivated(int))); langset_popup->insertItem(it.key(), regpop); Region r = it.data(); @@ -1201,7 +1201,7 @@ void LanguageOptions::createISO6391Menus() if (it.key()[0].upper() != lang[0].upper()) { pop = new TQPopupMenu(); - connect(pop, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotLangFromISO6391Activated(int))); + connect(pop, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotLangFromISO6391Activated(int))); iso6391_popup->insertItem(it.key()[0].upper(), pop, 1); } diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp index 31a5f768..a009e0bf 100644 --- a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp @@ -58,13 +58,13 @@ PasteOptions::PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* pare SkipButton->setEnabled(!kcfg_UseCurrent->isChecked()); DownButton->setEnabled(!kcfg_UseCurrent->isChecked()); - connect(OrderList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(syncButtons())); - connect(DownButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDownButtonClicked())); - connect(SkipButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSkipButtonClicked())); - connect(UpButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpButtonClicked())); + connect(OrderList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(syncButtons())); + connect(DownButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDownButtonClicked())); + connect(SkipButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSkipButtonClicked())); + connect(UpButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUpButtonClicked())); - connect(SeparatorCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSeparatorComboActivated(int))); - connect(kcfg_UseCurrent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotUseCurrentDocToggled(bool))); + connect(SeparatorCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSeparatorComboActivated(int))); + connect(kcfg_UseCurrent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotUseCurrentDocToggled(bool))); m_doc = doc; fillWidgets(); diff --git a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp index f898f754..c38a2065 100644 --- a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp @@ -46,10 +46,10 @@ ProfilesDialog::ProfilesDialog(QueryManager * m, TQWidget *parent, const char *n mw = new GroupOptions(this); setMainWidget(mw); - connect(mw->ps_del, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteGroup())); - connect(mw->ps_new, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewGroup())); - connect(mw->ps_recall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRecallGroup())); - connect(mw->ps_store, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStoreGroup())); + connect(mw->ps_del, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteGroup())); + connect(mw->ps_new, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewGroup())); + connect(mw->ps_recall, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRecallGroup())); + connect(mw->ps_store, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStoreGroup())); int ls = Prefs::numPreSetting(); for (int i = 0 ; i < ls; i++) diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp index 271bde65..5b81c32a 100644 --- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp @@ -104,20 +104,20 @@ static ThreshListRef Threshdate_itemlist [] = ThresholdOptions::ThresholdOptions(KComboBox * lessons, QueryManager * m, TQWidget* parent, const char* name, WFlags fl) : ThresholdOptionsBase(parent, name, fl), m_lessons(lessons) { - connect(lessoncomp, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetLessonComp(int))); - connect(lessonlist, TQT_SIGNAL(selectionChanged()), TQT_SIGNAL(widgetModified())); - connect(b_all_less, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectAll())); - connect(b_none_less, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectNone())); - connect(typecomp, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetTypeComp(int))); - connect(typelist, TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int))); - connect(gradecomp, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetGradeComp(int))); - connect(gradelist, TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int))); - connect(querycomp, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetQueryComp(int))); - connect(querylist, TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int))); - connect(badcomp, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetBadComp(int))); - connect(badlist, TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int))); - connect(datecomp, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetDateComp(int))); - connect(datelist, TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int))); + connect(lessoncomp, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetLessonComp(int))); + connect(lessonlist, TQ_SIGNAL(selectionChanged()), TQ_SIGNAL(widgetModified())); + connect(b_all_less, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectAll())); + connect(b_none_less, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectNone())); + connect(typecomp, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetTypeComp(int))); + connect(typelist, TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int))); + connect(gradecomp, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetGradeComp(int))); + connect(gradelist, TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int))); + connect(querycomp, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetQueryComp(int))); + connect(querylist, TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int))); + connect(badcomp, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetBadComp(int))); + connect(badlist, TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int))); + connect(datecomp, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetDateComp(int))); + connect(datelist, TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int))); m_queryManager = m; fillWidgets(); diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp index f1c8d62d..5d62f334 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp @@ -33,7 +33,7 @@ DocOptionsPage::DocOptionsPage(bool sort, TQWidget *parent, const char *name):Do sorter = sort; docsort->setChecked(sort); - connect( docsort, TQT_SIGNAL(toggled(bool)), TQT_SLOT(docSortToggled(bool)) ); + connect( docsort, TQ_SIGNAL(toggled(bool)), TQ_SLOT(docSortToggled(bool)) ); } void DocOptionsPage::docSortToggled(bool state) diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp index 646358f1..f17b68bd 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp @@ -51,25 +51,25 @@ LangPropPage::LangPropPage { l_langcode->setText(curr_lang); - connect( indef_female, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(indefFemaleChanged(const TQString&)) ); - connect( def_female, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(defFemaleChanged(const TQString&)) ); - connect( def_male, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(defMaleChanged(const TQString&)) ); - connect( indef_male, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(indefMaleChanged(const TQString&)) ); - connect( def_natural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(defNaturalChanged(const TQString&)) ); - connect( indef_natural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(indefNaturalChanged(const TQString&)) ); - connect( first_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstSingularChanged(const TQString&)) ); - connect( first_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstPluralChanged(const TQString&)) ); - connect( second_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondSingularChanged(const TQString&)) ); - connect( second_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondPluralChanged(const TQString&)) ); - connect( thirdF_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFSingularChanged(const TQString&)) ); - connect( thirdF_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFPluralChanged(const TQString&)) ); - connect( thirdM_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMSingularChanged(const TQString&)) ); - connect( thirdM_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMPluralChanged(const TQString&)) ); - connect( thirdN_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNSingularChanged(const TQString&)) ); - connect( thirdN_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNPluralChanged(const TQString&)) ); - - connect( thirdS_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdSCommonToggled(bool)) ); - connect( thirdP_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdPCommonToggled(bool)) ); + connect( indef_female, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(indefFemaleChanged(const TQString&)) ); + connect( def_female, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(defFemaleChanged(const TQString&)) ); + connect( def_male, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(defMaleChanged(const TQString&)) ); + connect( indef_male, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(indefMaleChanged(const TQString&)) ); + connect( def_natural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(defNaturalChanged(const TQString&)) ); + connect( indef_natural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(indefNaturalChanged(const TQString&)) ); + connect( first_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(firstSingularChanged(const TQString&)) ); + connect( first_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(firstPluralChanged(const TQString&)) ); + connect( second_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(secondSingularChanged(const TQString&)) ); + connect( second_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(secondPluralChanged(const TQString&)) ); + connect( thirdF_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdFSingularChanged(const TQString&)) ); + connect( thirdF_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdFPluralChanged(const TQString&)) ); + connect( thirdM_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdMSingularChanged(const TQString&)) ); + connect( thirdM_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdMPluralChanged(const TQString&)) ); + connect( thirdN_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdNSingularChanged(const TQString&)) ); + connect( thirdN_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdNPluralChanged(const TQString&)) ); + + connect( thirdS_common, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotThirdSCommonToggled(bool)) ); + connect( thirdP_common, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotThirdPCommonToggled(bool)) ); conjugations = conjug; diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp index 7d90f04b..1fdbd151 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp @@ -48,11 +48,11 @@ LessOptPage::LessOptPage : LessOptPageForm( parent, name ) { - connect( lessonList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotLessonChosen(int)) ); - connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewLesson()) ); - connect( b_modify, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyLesson()) ); - connect( b_delete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteLesson()) ); - connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) ); + connect( lessonList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotLessonChosen(int)) ); + connect( b_new, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewLesson()) ); + connect( b_modify, TQ_SIGNAL(clicked()), TQ_SLOT(slotModifyLesson()) ); + connect( b_delete, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteLesson()) ); + connect( b_cleanup, TQ_SIGNAL(clicked()), TQ_SLOT(slotCleanup()) ); doc = _doc; diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp index 2e6e893c..0b5c6f73 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp @@ -46,11 +46,11 @@ TenseOptPage::TenseOptPage : TenseOptPageForm( parent, name ) { - connect( tenseList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotTenseChosen(int)) ); - connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) ); - connect( b_delete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteTense()) ); - connect( b_modify, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyTense()) ); - connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewTense()) ); + connect( tenseList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotTenseChosen(int)) ); + connect( b_cleanup, TQ_SIGNAL(clicked()), TQ_SLOT(slotCleanup()) ); + connect( b_delete, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteTense()) ); + connect( b_modify, TQ_SIGNAL(clicked()), TQ_SLOT(slotModifyTense()) ); + connect( b_new, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewTense()) ); TQString str; for (int i = 0; i < (int) tenses.size(); i++) { diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp index f7a30bf3..9292827a 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp @@ -64,10 +64,10 @@ TitlePage::TitlePage e_remark->setText (doc_remark); label_remark->setBuddy(e_remark); - connect( e_author, TQT_SIGNAL(textChanged()), TQT_SLOT(slotAuthorChanged()) ); - connect( e_title, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTitleChanged(const TQString&)) ); - connect( e_license, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotLicenseChanged(const TQString&)) ); - connect( e_remark, TQT_SIGNAL(textChanged()), TQT_SLOT(slotDocRemarkChanged()) ); + connect( e_author, TQ_SIGNAL(textChanged()), TQ_SLOT(slotAuthorChanged()) ); + connect( e_title, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotTitleChanged(const TQString&)) ); + connect( e_license, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotLicenseChanged(const TQString&)) ); + connect( e_remark, TQ_SIGNAL(textChanged()), TQ_SLOT(slotDocRemarkChanged()) ); } diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp index 9b126b17..adac2c24 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp @@ -47,11 +47,11 @@ TypeOptPage::TypeOptPage TypeOptPageForm( parent, name ), doc(_doc) { - connect( typeList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotTypeChosen(int)) ); - connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) ); - connect( b_delete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteType()) ); - connect( b_modify, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyType()) ); - connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewType()) ); + connect( typeList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotTypeChosen(int)) ); + connect( b_cleanup, TQ_SIGNAL(clicked()), TQ_SLOT(slotCleanup()) ); + connect( b_delete, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteType()) ); + connect( b_modify, TQ_SIGNAL(clicked()), TQ_SLOT(slotModifyType()) ); + connect( b_new, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewType()) ); TQString str; for (int i = 0; i < (int) types.size(); i++) { diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp index 7e6dad66..74b9dcab 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp @@ -48,11 +48,11 @@ UsageOptPage::UsageOptPage UsageOptPageForm( parent, name ), doc(_doc) { - connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) ); - connect( b_delete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteUsage()) ); - connect( b_modify, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyUsage()) ); - connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewUsage()) ); - connect( usageList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotUsageChosen(int)) ); + connect( b_cleanup, TQ_SIGNAL(clicked()), TQ_SLOT(slotCleanup()) ); + connect( b_delete, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteUsage()) ); + connect( b_modify, TQ_SIGNAL(clicked()), TQ_SLOT(slotModifyUsage()) ); + connect( b_new, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewUsage()) ); + connect( usageList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotUsageChosen(int)) ); TQString str; for (int i = 0; i < (int) usages.size(); i++) { diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp index 0bdae252..8a136d73 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp @@ -37,9 +37,9 @@ AdjEntryPage::AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison { comparisons = comp; - connect( lev1Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev1Changed(const TQString&)) ); - connect( lev2Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev2Changed(const TQString&)) ); - connect( lev3Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev3Changed(const TQString&)) ); + connect( lev1Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev1Changed(const TQString&)) ); + connect( lev2Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev2Changed(const TQString&)) ); + connect( lev3Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev3Changed(const TQString&)) ); setData(multi_sel, comp); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp index 87e0fe59..f75f4703 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp @@ -56,11 +56,11 @@ AuxInfoEntryPage::AuxInfoEntryPage remark_line->setMaximumHeight(sz*3); examp_line->setMaximumHeight(sz*3); - connect( para_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotParaSelected()) ); - connect( remark_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotRemarkSelected()) ); - connect( examp_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotExampSelected()) ); - connect( antonym_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotAntonymSelected()) ); - connect( synonym_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotSynonymSelected()) ); + connect( para_line, TQ_SIGNAL(textChanged()), TQ_SLOT(slotParaSelected()) ); + connect( remark_line, TQ_SIGNAL(textChanged()), TQ_SLOT(slotRemarkSelected()) ); + connect( examp_line, TQ_SIGNAL(textChanged()), TQ_SLOT(slotExampSelected()) ); + connect( antonym_line, TQ_SIGNAL(textChanged()), TQ_SLOT(slotAntonymSelected()) ); + connect( synonym_line, TQ_SIGNAL(textChanged()), TQ_SLOT(slotSynonymSelected()) ); setData(multi_sel, syno, anto, exam, rem, para); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp index e4ce0679..254886bc 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp @@ -80,18 +80,18 @@ CommonEntryPage::CommonEntryPage ipafont(_ipafont) { - connect( b_usageDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokeUsageDlg()) ); - connect( b_LessDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokeLessDlg()) ); - connect( b_pronDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokePronDlg()) ); - connect( b_TypeDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokeTypeDlg()) ); - connect( usage_box, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotUsageChanged()) ); - connect( lesson_box, TQT_SIGNAL(activated(int)), TQT_SLOT(slotLessonSelected(int)) ); - connect( subtype_box, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSubTypeSelected(int)) ); - connect( type_box, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeSelected(int)) ); - connect( c_active, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotActiveChanged(bool)) ); - - connect( pronunce_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotPronunceSelected(const TQString&)) ); - connect( expr_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotExprSelected(const TQString&)) ); + connect( b_usageDlg, TQ_SIGNAL(clicked()), TQ_SLOT(invokeUsageDlg()) ); + connect( b_LessDlg, TQ_SIGNAL(clicked()), TQ_SLOT(invokeLessDlg()) ); + connect( b_pronDlg, TQ_SIGNAL(clicked()), TQ_SLOT(invokePronDlg()) ); + connect( b_TypeDlg, TQ_SIGNAL(clicked()), TQ_SLOT(invokeTypeDlg()) ); + connect( usage_box, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotUsageChanged()) ); + connect( lesson_box, TQ_SIGNAL(activated(int)), TQ_SLOT(slotLessonSelected(int)) ); + connect( subtype_box, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSubTypeSelected(int)) ); + connect( type_box, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeSelected(int)) ); + connect( c_active, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotActiveChanged(bool)) ); + + connect( pronunce_line, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotPronunceSelected(const TQString&)) ); + connect( expr_line, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotExprSelected(const TQString&)) ); usage_label->setTitle(i18n("Usage (area) of an Expression", "&Usage Labels")); pronunce_line->setFont(ipafont); @@ -329,7 +329,7 @@ void CommonEntryPage::invokePronDlg() { //if (phoneticDlg == 0) { PhoneticEntryPage * phoneticDlg = new PhoneticEntryPage (ipafont, this); - connect (phoneticDlg, TQT_SIGNAL(charSelected(wchar_t)), TQT_SLOT(phoneticSelected(wchar_t)) ); + connect (phoneticDlg, TQ_SIGNAL(charSelected(wchar_t)), TQ_SLOT(phoneticSelected(wchar_t)) ); phoneticDlg->show(); //} //else diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp index 5fbcc71f..efe7e374 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp @@ -176,23 +176,23 @@ EntryDlg::EntryDlg( updatePages (type); - connect(comm_page, TQT_SIGNAL(typeSelected(const TQString&)), TQT_SLOT(updatePages(const TQString&)) ); + connect(comm_page, TQ_SIGNAL(typeSelected(const TQString&)), TQ_SLOT(updatePages(const TQString&)) ); - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotUndo()) ); - connect( this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotApply()) ); - connect( this, TQT_SIGNAL(user2Clicked()), this, TQT_SLOT(slotDockVertical()) ); - connect( this, TQT_SIGNAL(user3Clicked()), this, TQT_SLOT(slotDockHorizontal()) ); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotUndo()) ); + connect( this, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotApply()) ); + connect( this, TQ_SIGNAL(user2Clicked()), this, TQ_SLOT(slotDockVertical()) ); + connect( this, TQ_SIGNAL(user3Clicked()), this, TQ_SLOT(slotDockHorizontal()) ); - connect (comm_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); - connect (aux_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); - connect (adj_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); - connect (mc_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); - connect (tense_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); + connect (comm_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() )); + connect (aux_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() )); + connect (adj_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() )); + connect (mc_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() )); + connect (tense_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() )); if (from_page != 0) - connect (from_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); + connect (from_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() )); if (to_page != 0) - connect (to_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); + connect (to_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() )); enableButtonApply(false); enableButton(User1, false); diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp index a4bb55f1..8fc70db0 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp @@ -75,17 +75,17 @@ FromToEntryPage::FromToEntryPage monthnames.append (i18n("November")); monthnames.append (i18n("December")); - connect( bcount_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotBCount(const TQString&)) ); - connect( qcount_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotQCount(const TQString&)) ); - connect( fauxami_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotFauxAmiSelected(const TQString&)) ); + connect( bcount_line, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotBCount(const TQString&)) ); + connect( qcount_line, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotQCount(const TQString&)) ); + connect( fauxami_line, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotFauxAmiSelected(const TQString&)) ); - connect( never, TQT_SIGNAL(clicked()), TQT_SLOT(slotNever()) ); - connect( today, TQT_SIGNAL(clicked()), TQT_SLOT(slotToday()) ); - connect( gradebox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotGradeSelected(int)) ); + connect( never, TQ_SIGNAL(clicked()), TQ_SLOT(slotNever()) ); + connect( today, TQ_SIGNAL(clicked()), TQ_SLOT(slotToday()) ); + connect( gradebox, TQ_SIGNAL(activated(int)), TQ_SLOT(slotGradeSelected(int)) ); - connect( year_spin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotYearChanged(int)) ); - connect( month_spin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotMonthChanged(int)) ); - connect( day_spin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotDayChanged(int)) ); + connect( year_spin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotYearChanged(int)) ); + connect( month_spin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotMonthChanged(int)) ); + connect( day_spin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotDayChanged(int)) ); year_spin->setData ((TQStringList *) 0, 1980, 2100); month_spin->setData (&monthnames, 1, 12); diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp index a6967704..1c028345 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp @@ -37,11 +37,11 @@ MCEntryPage::MCEntryPage(EntryDlg *_dlgbook, bool multi_sel, const MultipleChoic { multiplechoice = mc; - connect( mc1Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc1Changed(const TQString&)) ); - connect( mc2Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc2Changed(const TQString&)) ); - connect( mc3Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc3Changed(const TQString&)) ); - connect( mc4Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc4Changed(const TQString&)) ); - connect( mc5Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc5Changed(const TQString&)) ); + connect( mc1Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(mc1Changed(const TQString&)) ); + connect( mc2Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(mc2Changed(const TQString&)) ); + connect( mc3Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(mc3Changed(const TQString&)) ); + connect( mc4Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(mc4Changed(const TQString&)) ); + connect( mc5Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(mc5Changed(const TQString&)) ); setData(multi_sel, mc); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp index a7661be0..e710d2ef 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp @@ -189,7 +189,7 @@ PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, co TQChar qc = uni_ref->code; TQString text = qc; PhoneticButton *butt = new PhoneticButton(text, phoneticbox, this); - connect (butt, TQT_SIGNAL(clicked()), butt, TQT_SLOT(slotClicked()) ); + connect (butt, TQ_SIGNAL(clicked()), butt, TQ_SLOT(slotClicked()) ); TQString tip = i18n("Unicode name: "); tip += TQString::fromLatin1(uni_ref->unicodename); tip += "\n"; diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp index c8c7d41e..e9f2f7c0 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp @@ -45,21 +45,21 @@ TenseEntryPage::TenseEntryPage : TenseEntryPageForm( parent, name ), multi_mode(multi_sel), dlgbook(_dlgbook) { - connect( third_p_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdPCommonToggled(bool)) ); - connect( third_s_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdSCommonToggled(bool)) ); - connect( b_next, TQT_SIGNAL(clicked()), TQT_SLOT(slotNextConj()) ); - connect( tensebox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTenseSelected(int)) ); - - connect( thirdN_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNPluralChanged(const TQString&)) ); - connect( thirdN_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNSingularChanged(const TQString&)) ); - connect( thirdM_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMPluralChanged(const TQString&)) ); - connect( thirdM_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMSingularChanged(const TQString&)) ); - connect( thirdF_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFPluralChanged(const TQString&)) ); - connect( thirdF_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFSingularChanged(const TQString&)) ); - connect( second_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondPluralChanged(const TQString&)) ); - connect( second_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondSingularChanged(const TQString&)) ); - connect( first_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstPluralChanged(const TQString&)) ); - connect( first_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstSingularChanged(const TQString&)) ); + connect( third_p_common, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotThirdPCommonToggled(bool)) ); + connect( third_s_common, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotThirdSCommonToggled(bool)) ); + connect( b_next, TQ_SIGNAL(clicked()), TQ_SLOT(slotNextConj()) ); + connect( tensebox, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTenseSelected(int)) ); + + connect( thirdN_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdNPluralChanged(const TQString&)) ); + connect( thirdN_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdNSingularChanged(const TQString&)) ); + connect( thirdM_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdMPluralChanged(const TQString&)) ); + connect( thirdM_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdMSingularChanged(const TQString&)) ); + connect( thirdF_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdFPluralChanged(const TQString&)) ); + connect( thirdF_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdFSingularChanged(const TQString&)) ); + connect( second_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(secondPluralChanged(const TQString&)) ); + connect( second_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(secondSingularChanged(const TQString&)) ); + connect( first_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(firstPluralChanged(const TQString&)) ); + connect( first_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(firstSingularChanged(const TQString&)) ); prefix = con_prefix; selection = ""; diff --git a/kvoctrain/kvoctrain/kva_clip.cpp b/kvoctrain/kvoctrain/kva_clip.cpp index 66e1ca9a..a3a5860e 100644 --- a/kvoctrain/kvoctrain/kva_clip.cpp +++ b/kvoctrain/kvoctrain/kva_clip.cpp @@ -106,11 +106,11 @@ void kvoctrainApp::slotEditCopy() } if (!exp.isEmpty()) { #if defined(_WS_X11_) -// disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),this,0); +// disconnect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()),this,0); #endif TQApplication::clipboard()->setText(exp); #if defined(_WS_X11_) -// connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged())); +// connect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()), this,TQ_SLOT(clipboardChanged())); #endif } diff --git a/kvoctrain/kvoctrain/kva_header.cpp b/kvoctrain/kvoctrain/kva_header.cpp index e7e716a8..55a37717 100644 --- a/kvoctrain/kvoctrain/kva_header.cpp +++ b/kvoctrain/kvoctrain/kva_header.cpp @@ -52,8 +52,8 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ header_m->insertItem(SmallIconSet("sort_incr"), i18n(SORT_ALPHA), (header << 16) | IDH_SORT_COL_ALPHA); header_m->insertItem(SmallIconSet("sort_num"), i18n(SORT_NUM), (header << 16) | IDH_SORT_COL_NUM); - connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (header_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect (header_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); header_m->exec(TQPoint (x, y)); return; @@ -89,8 +89,8 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ langs_m->insertItem(names[i], (header << 16) | (i << (16+8)) | IDH_SET_LANG); } - connect (langs_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetHeaderProp(int))); - connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (langs_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetHeaderProp(int))); + connect (langs_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); header_m = new TQPopupMenu(); @@ -142,8 +142,8 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ } } header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL); - connect (query_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (query_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect (query_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); for (int i = 1; i < (int) doc->numLangs(); i++) { // show pixmap and long name if available int j; @@ -167,16 +167,16 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ header_m->insertItem(i18n("&Antonyms"), (header << 16) | IDH_START_ANTONYM); header_m->insertItem(i18n("E&xamples"), (header << 16) | IDH_START_EXAMPLE); header_m->insertItem(i18n("&Paraphrase"), (header << 16) | IDH_START_PARAPHRASE); - connect (multiple_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (multiple_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect (multiple_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); header_m->insertSeparator(); header_m->insertItem(SmallIconSet("sort_incr"), i18n(SORT_ALPHA), (header+KV_EXTRA_COLS << 16) | IDH_SORT_COL_ALPHA); header_m->insertItem(SmallIconSet("set_language"), i18n("Set &Language"), langs_m, (2 << 16) | IDH_NULL); } - connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (header_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect (header_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); header_m->exec(TQPoint(x, y)); } diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp index 6a4d92eb..26b1599f 100644 --- a/kvoctrain/kvoctrain/kva_init.cpp +++ b/kvoctrain/kvoctrain/kva_init.cpp @@ -90,7 +90,7 @@ kvoctrainApp::kvoctrainApp(TQWidget *parent, const char *name) querying = false; btimer = new TQTimer( this ); - connect( btimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeOutBackup()) ); + connect( btimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeOutBackup()) ); if (Prefs::autoBackup()) btimer->start(Prefs::backupTime() * 60 * 1000, TRUE); } @@ -98,116 +98,116 @@ kvoctrainApp::kvoctrainApp(TQWidget *parent, const char *name) void kvoctrainApp::initActions() { - fileNew = KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection()); + fileNew = KStdAction::openNew(this, TQ_SLOT(slotFileNew()), actionCollection()); fileNew->setWhatsThis(i18n("Creates a new blank vocabulary document")); fileNew->setToolTip(fileNew->whatsThis()); - fileOpen = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection()); + fileOpen = KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection()); fileOpen->setWhatsThis(i18n("Opens an existing vocabulary document")); fileOpen->setToolTip(fileOpen->whatsThis()); - fileOpenExample = new TDEAction(i18n("Open &Example..."), "document-open", 0, this, TQT_SLOT(slotFileOpenExample()), actionCollection(), "file_open_example"); + fileOpenExample = new TDEAction(i18n("Open &Example..."), "document-open", 0, this, TQ_SLOT(slotFileOpenExample()), actionCollection(), "file_open_example"); fileOpen->setWhatsThis(i18n("Open a vocabulary document")); fileOpen->setToolTip(fileOpen->whatsThis()); - fileGHNS = new TDEAction(i18n("&Get New Vocabularies..."), "knewstuff", CTRL+Key_G, this, TQT_SLOT(slotGHNS()), actionCollection(), "file_ghns"); + fileGHNS = new TDEAction(i18n("&Get New Vocabularies..."), "knewstuff", CTRL+Key_G, this, TQ_SLOT(slotGHNS()), actionCollection(), "file_ghns"); fileGHNS->setWhatsThis(i18n("Downloads new vocabularies")); fileGHNS->setToolTip(fileGHNS->whatsThis()); - fileOpenRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); + fileOpenRecent = KStdAction::openRecent(this, TQ_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - fileMerge = new TDEAction(i18n("&Merge..."), 0, 0, this, TQT_SLOT(slotFileMerge()), actionCollection(), "file_merge"); + fileMerge = new TDEAction(i18n("&Merge..."), 0, 0, this, TQ_SLOT(slotFileMerge()), actionCollection(), "file_merge"); fileMerge->setWhatsThis(i18n("Merge an existing vocabulary document with the current one")); fileMerge->setToolTip(fileOpen->whatsThis()); - fileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection()); + fileSave = KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection()); fileSave->setWhatsThis(i18n("Save the active vocabulary document")); fileSave->setToolTip(fileSave->whatsThis()); - fileSaveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection()); + fileSaveAs = KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection()); fileSaveAs->setWhatsThis(i18n("Save the active vocabulary document with a different name")); fileSaveAs->setToolTip(fileSaveAs->whatsThis()); - filePrint = KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection()); + filePrint = KStdAction::print(this, TQ_SLOT(slotFilePrint()), actionCollection()); filePrint->setWhatsThis(i18n("Print the active vocabulary document")); filePrint->setToolTip(filePrint->whatsThis()); - fileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); + fileQuit = KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); fileQuit->setWhatsThis(i18n("Quit KVocTrain")); fileQuit->setToolTip(fileQuit->whatsThis()); - editCopy = KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection()); + editCopy = KStdAction::copy(this, TQ_SLOT(slotEditCopy()), actionCollection()); editCopy->setWhatsThis(i18n("Copy")); editCopy->setToolTip(editCopy->whatsThis()); - editPaste = KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection()); + editPaste = KStdAction::paste(this, TQ_SLOT(slotEditPaste()), actionCollection()); editPaste->setWhatsThis(i18n("Paste")); editPaste->setToolTip(editPaste->whatsThis()); - editSelectAll = KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), actionCollection()); + editSelectAll = KStdAction::selectAll(this, TQ_SLOT(slotSelectAll()), actionCollection()); editSelectAll->setWhatsThis(i18n("Select all rows")); editSelectAll->setToolTip(editSelectAll->whatsThis()); - editClearSelection = KStdAction::deselect(this, TQT_SLOT(slotCancelSelection()), actionCollection()); + editClearSelection = KStdAction::deselect(this, TQ_SLOT(slotCancelSelection()), actionCollection()); editClearSelection->setWhatsThis(i18n("Deselect all rows")); editClearSelection->setToolTip(editClearSelection->whatsThis()); - editSearchFromClipboard = KStdAction::find(this, TQT_SLOT(slotSmartSearchClip()), actionCollection()); + editSearchFromClipboard = KStdAction::find(this, TQ_SLOT(slotSmartSearchClip()), actionCollection()); editSearchFromClipboard->setWhatsThis(i18n("Search for the clipboard contents in the vocabulary")); editSearchFromClipboard->setToolTip(editSearchFromClipboard->whatsThis()); - editAppend = new TDEAction(i18n("&Append New Entry"), "insert_table_row", "Insert", this, TQT_SLOT(slotAppendRow()), actionCollection(),"edit_append"); + editAppend = new TDEAction(i18n("&Append New Entry"), "insert_table_row", "Insert", this, TQ_SLOT(slotAppendRow()), actionCollection(),"edit_append"); editAppend->setWhatsThis(i18n("Append a new row to the vocabulary")); editAppend->setToolTip(editAppend->whatsThis()); - editEditSelectedArea = new TDEAction(i18n("&Edit Selected Area..."), "edit_table_row", "Ctrl+Return", this, TQT_SLOT(slotEditRow()), actionCollection(),"edit_edit_selected_area"); + editEditSelectedArea = new TDEAction(i18n("&Edit Selected Area..."), "edit_table_row", "Ctrl+Return", this, TQ_SLOT(slotEditRow()), actionCollection(),"edit_edit_selected_area"); editEditSelectedArea->setWhatsThis(i18n("Edit the entries in the selected rows")); editEditSelectedArea->setToolTip(editEditSelectedArea->whatsThis()); - editRemoveSelectedArea = new TDEAction(i18n("&Remove Selected Area"), "delete_table_row", "Delete", this, TQT_SLOT(slotRemoveRow()), actionCollection(),"edit_remove_selected_area"); + editRemoveSelectedArea = new TDEAction(i18n("&Remove Selected Area"), "delete_table_row", "Delete", this, TQ_SLOT(slotRemoveRow()), actionCollection(),"edit_remove_selected_area"); editRemoveSelectedArea->setWhatsThis(i18n("Delete the selected rows")); editRemoveSelectedArea->setToolTip(editRemoveSelectedArea->whatsThis()); - editSaveSelectedArea = new TDEAction(i18n("Save E&ntries in Query As..."), TDEGlobal::iconLoader()->loadIcon("document-save-as", TDEIcon::Small), 0, this, TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area"); + editSaveSelectedArea = new TDEAction(i18n("Save E&ntries in Query As..."), TDEGlobal::iconLoader()->loadIcon("document-save-as", TDEIcon::Small), 0, this, TQ_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area"); editSaveSelectedArea->setWhatsThis(i18n("Save the entries in the query as a new vocabulary")); editSaveSelectedArea->setToolTip(editSaveSelectedArea->whatsThis()); - vocabShowStatistics = new TDEAction(i18n("Show &Statistics"), "statistics", 0, this, TQT_SLOT(slotShowStatist()), actionCollection(),"vocab_show_statistics"); + vocabShowStatistics = new TDEAction(i18n("Show &Statistics"), "statistics", 0, this, TQ_SLOT(slotShowStatist()), actionCollection(),"vocab_show_statistics"); vocabShowStatistics->setWhatsThis(i18n("Show statistics for the current vocabulary")); vocabShowStatistics->setToolTip(vocabShowStatistics->whatsThis()); - vocabAssignLessons = new TDEAction(i18n("Assign L&essons..."), "rand_less", 0, this, TQT_SLOT(slotCreateRandom()), actionCollection(),"vocab_assign_lessons"); + vocabAssignLessons = new TDEAction(i18n("Assign L&essons..."), "rand_less", 0, this, TQ_SLOT(slotCreateRandom()), actionCollection(),"vocab_assign_lessons"); vocabAssignLessons->setWhatsThis(i18n("Create random lessons with unassigned entries")); vocabAssignLessons->setToolTip(vocabAssignLessons->whatsThis()); - vocabCleanUp = new TDEAction(i18n("&Clean Up"), "cleanup", 0, this, TQT_SLOT(slotCleanVocabulary()), actionCollection(),"vocab_clean_up"); + vocabCleanUp = new TDEAction(i18n("&Clean Up"), "cleanup", 0, this, TQ_SLOT(slotCleanVocabulary()), actionCollection(),"vocab_clean_up"); vocabCleanUp->setWhatsThis(i18n("Remove entries with same content from vocabulary")); vocabCleanUp->setToolTip(vocabCleanUp->whatsThis()); vocabAppendLanguage = new TDESelectAction(i18n("&Append Language"), "insert_table_col", 0, actionCollection(), "vocab_append_language"); - connect(vocabAppendLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowVocabAppendLanguage())); - connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotAppendLang(int))); - connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect(vocabAppendLanguage->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowVocabAppendLanguage())); + connect (vocabAppendLanguage->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotAppendLang(int))); + connect (vocabAppendLanguage->popupMenu(), TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); vocabSetLanguage = new TDESelectAction(i18n("Set &Language"), "set_language", 0, actionCollection(), "vocab_set_language"); - connect(vocabSetLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowVocabSetLanguage())); + connect(vocabSetLanguage->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowVocabSetLanguage())); vocabRemoveLanguage = new TDESelectAction(i18n("&Remove Language"), "delete_table_col", 0, actionCollection(), "vocab_remove_language"); - connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowVocabRemoveLanguage())); - connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect(vocabRemoveLanguage->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowVocabRemoveLanguage())); + connect(vocabRemoveLanguage->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect(vocabRemoveLanguage->popupMenu(), TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); - vocabDocumentProperties = new TDEAction(i18n("Document &Properties"), 0, 0, this, TQT_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties"); + vocabDocumentProperties = new TDEAction(i18n("Document &Properties"), 0, 0, this, TQ_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties"); vocabDocumentProperties->setWhatsThis(i18n("Edit document properties")); vocabDocumentProperties->setToolTip(vocabAppendLanguage->whatsThis()); - vocabLanguageProperties = new TDEAction(i18n("Lan&guage Properties"), 0, 0, this, TQT_SLOT(slotDocPropsLang()), actionCollection(), "vocab_language_properties"); + vocabLanguageProperties = new TDEAction(i18n("Lan&guage Properties"), 0, 0, this, TQ_SLOT(slotDocPropsLang()), actionCollection(), "vocab_language_properties"); vocabLanguageProperties->setWhatsThis(i18n("Edit language properties in current document")); vocabLanguageProperties->setToolTip(vocabSetLanguage->whatsThis()); lessons = new KComboBox(this); lessons->setMinimumWidth(160); - connect(lessons, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotChooseLesson(int))); + connect(lessons, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotChooseLesson(int))); lessons->setFocusPolicy(TQWidget::NoFocus); vocabLessons = new KWidgetAction(lessons, i18n("Lessons"), 0, this, 0, actionCollection(), "vocab_lessons"); @@ -216,33 +216,33 @@ void kvoctrainApp::initActions() searchLine = new KLineEdit(this); searchLine->setFocusPolicy(TQWidget::ClickFocus); - connect (searchLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotSearchNext())); - connect (searchLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotResumeSearch(const TQString&))); + connect (searchLine, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotSearchNext())); + connect (searchLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotResumeSearch(const TQString&))); vocabSearch = new KWidgetAction(searchLine, i18n("Smart Search"), 0, this, 0, actionCollection(), "vocab_search"); vocabSearch->setAutoSized(true); vocabSearch->setWhatsThis(i18n("Search vocabulary for specified text ")); vocabSearch->setToolTip(vocabSearch->whatsThis()); /* - learningResumeQuery = new TDEAction(i18n("Resume &Query..."), "run_query", 0, this, TQT_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_query"); + learningResumeQuery = new TDEAction(i18n("Resume &Query..."), "run_query", 0, this, TQ_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_query"); //learningResumeQuery->setWhatsThis(i18n("")); learningResumeQuery->setToolTip(learningResumeQuery->whatsThis()); - learningResumeMultipleChoice = new TDEAction(i18n("&Resume Multiple Choice..."), "run_multi", 0, this, TQT_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_multiple_choice"); + learningResumeMultipleChoice = new TDEAction(i18n("&Resume Multiple Choice..."), "run_multi", 0, this, TQ_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_multiple_choice"); //learningResumeMultipleChoice->setWhatsThis(i18n("")); learningResumeMultipleChoice->setToolTip(learningResumeMultipleChoice->whatsThis()); */ - configApp = KStdAction::preferences(this, TQT_SLOT( slotGeneralOptions()), actionCollection()); + configApp = KStdAction::preferences(this, TQ_SLOT( slotGeneralOptions()), actionCollection()); configApp->setWhatsThis(i18n("Show the configuration dialog")); configApp->setToolTip(configApp->whatsThis()); - /*configQueryOptions = new TDEAction(i18n("Configure &Query..."), "configure_query", 0, this, TQT_SLOT(slotQueryOptions()), actionCollection(),"config_query_options"); + /*configQueryOptions = new TDEAction(i18n("Configure &Query..."), "configure_query", 0, this, TQ_SLOT(slotQueryOptions()), actionCollection(),"config_query_options"); configQueryOptions->setWhatsThis(i18n("Show the query configuration dialog")); configQueryOptions->setToolTip(configQueryOptions->whatsThis());*/ actionCollection()->setHighlightingEnabled(true); - connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), this, TQT_SLOT(slotStatusHelpMsg(const TQString &))); - //connect(actionCollection(), TQT_SIGNAL(actionHighlighted(TDEAction *, bool)), this, TQT_SLOT(slotActionHighlighted(TDEAction *, bool))); + connect(actionCollection(), TQ_SIGNAL(actionStatusText(const TQString &)), this, TQ_SLOT(slotStatusHelpMsg(const TQString &))); + //connect(actionCollection(), TQ_SIGNAL(actionHighlighted(TDEAction *, bool)), this, TQ_SLOT(slotActionHighlighted(TDEAction *, bool))); if (!initialGeometrySet()) resize( TQSize(550, 400).expandedTo(minimumSizeHint())); @@ -254,9 +254,9 @@ void kvoctrainApp::initActions() configToolbar->setToolTip(configToolbar->whatsThis()); learn_menu = (TQPopupMenu*) child( "learning", "TDEPopupMenu" ); - connect(learn_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect(learn_menu, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); - connect(learn_menu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowLearn())); + connect(learn_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect(learn_menu, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); + connect(learn_menu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowLearn())); } @@ -287,7 +287,7 @@ void kvoctrainApp::initDoc( ) loadDocProps(doc); if (doc->numLangs() == 0) doc->appendLang("en"); - connect (doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool))); + connect (doc, TQ_SIGNAL (docModified(bool)), this, TQ_SLOT(slotModifiedDoc(bool))); doc->setModified(false); } diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp index fbe94dc1..7261bd5d 100644 --- a/kvoctrain/kvoctrain/kva_io.cpp +++ b/kvoctrain/kvoctrain/kva_io.cpp @@ -169,7 +169,7 @@ void kvoctrainApp::slotFileNew() view->setView(doc, langset); view->getTable()->setFont(Prefs::tableFont()); view->adjustContent(); - connect (doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool))); + connect (doc, TQ_SIGNAL (docModified(bool)), this, TQ_SLOT(slotModifiedDoc(bool))); doc->setModified(false); } slotStatusMsg(IDS_DEFAULT); @@ -210,7 +210,7 @@ void kvoctrainApp::loadfileFromPath(const KURL & url, bool addRecent) view->adjustContent(); if (addRecent) fileOpenRecent->addURL(url) /*addRecentFile (url.path())*/; - connect (doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool))); + connect (doc, TQ_SIGNAL (docModified(bool)), this, TQ_SLOT(slotModifiedDoc(bool))); doc->setModified(false); } } @@ -254,7 +254,7 @@ void kvoctrainApp::slotFileMerge() slotStatusMsg(msg); prepareProgressBar(); kvoctrainDoc *new_doc = new kvoctrainDoc (this, url); - connect (new_doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool))); + connect (new_doc, TQ_SIGNAL (docModified(bool)), this, TQ_SLOT(slotModifiedDoc(bool))); doc->setModified(false); removeProgressBar(); diff --git a/kvoctrain/kvoctrain/kva_query.cpp b/kvoctrain/kvoctrain/kva_query.cpp index 48c024f0..fce1db59 100644 --- a/kvoctrain/kvoctrain/kva_query.cpp +++ b/kvoctrain/kvoctrain/kva_query.cpp @@ -179,11 +179,11 @@ void kvoctrainApp::slotStartPropertyQuery(int col, QueryType property) exp, doc); - connect( simpleQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)), - this, TQT_SLOT(slotEditEntry(int,int))); + connect( simpleQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)), + this, TQ_SLOT(slotEditEntry(int,int))); - connect( simpleQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), - this, TQT_SLOT(slotTimeOutProperty(QueryDlgBase::Result))); + connect( simpleQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), + this, TQ_SLOT(slotTimeOutProperty(QueryDlgBase::Result))); simpleQueryDlg->initFocus(); simpleQueryDlg->show(); @@ -352,11 +352,11 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type) exp->getConjugation(act_query_col)); verbQueryDlg->initFocus(); - connect( verbQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)), - this, TQT_SLOT(slotEditEntry(int,int))); + connect( verbQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)), + this, TQ_SLOT(slotEditEntry(int,int))); - connect(verbQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), - this, TQT_SLOT(slotTimeOutType(QueryDlgBase::Result))); + connect(verbQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), + this, TQ_SLOT(slotTimeOutType(QueryDlgBase::Result))); verbQueryDlg->show(); } else if (queryType == TQT_Articles) { @@ -370,10 +370,10 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type) doc, doc->getArticle(act_query_col)); artQueryDlg->initFocus(); - connect( artQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)), - this, TQT_SLOT(slotEditEntry(int,int))); - connect(artQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), - this, TQT_SLOT(slotTimeOutType(QueryDlgBase::Result))); + connect( artQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)), + this, TQ_SLOT(slotEditEntry(int,int))); + connect(artQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), + this, TQ_SLOT(slotTimeOutType(QueryDlgBase::Result))); artQueryDlg->show(); } else if (queryType == TQT_Comparison) { @@ -387,11 +387,11 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type) doc, exp->getComparison(act_query_col)); adjQueryDlg->initFocus(); - connect( adjQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)), - this, TQT_SLOT(slotEditEntry(int,int))); + connect( adjQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)), + this, TQ_SLOT(slotEditEntry(int,int))); - connect(adjQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), - this, TQT_SLOT(slotTimeOutType(QueryDlgBase::Result))); + connect(adjQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), + this, TQ_SLOT(slotTimeOutType(QueryDlgBase::Result))); adjQueryDlg->show(); } else { @@ -642,10 +642,10 @@ void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & o exp, doc); randomQueryDlg->initFocus(); - connect( randomQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)), - this, TQT_SLOT(slotEditEntry(int,int))); - connect(randomQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), - this, TQT_SLOT(slotTimeOutRandomQuery(QueryDlgBase::Result))); + connect( randomQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)), + this, TQ_SLOT(slotEditEntry(int,int))); + connect(randomQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), + this, TQ_SLOT(slotTimeOutRandomQuery(QueryDlgBase::Result))); randomQueryDlg->show(); } else if (queryType == TQT_Multiple) { @@ -661,10 +661,10 @@ void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & o exp, doc); mcQueryDlg->initFocus(); - connect( mcQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)), - this, TQT_SLOT(slotEditEntry(int,int))); - connect(mcQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), - this, TQT_SLOT(slotTimeOutMultipleChoice(QueryDlgBase::Result))); + connect( mcQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)), + this, TQ_SLOT(slotEditEntry(int,int))); + connect(mcQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), + this, TQ_SLOT(slotTimeOutMultipleChoice(QueryDlgBase::Result))); mcQueryDlg->show(); } else { diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp index 5bcd011f..b75c2050 100644 --- a/kvoctrain/kvoctrain/kvoctrain.cpp +++ b/kvoctrain/kvoctrain/kvoctrain.cpp @@ -410,8 +410,8 @@ void kvoctrainApp::createEntryDlg(int row, int col) doc->getEntry(row)->isActive(), Prefs::iPAFont()); } - connect( entryDlg, TQT_SIGNAL(sigEditChoice(int)), - this, TQT_SLOT(slotEditCallBack(int))); + connect( entryDlg, TQ_SIGNAL(sigEditChoice(int)), + this, TQ_SLOT(slotEditCallBack(int))); view->getTable()->setReadOnly(true); @@ -961,7 +961,7 @@ void kvoctrainApp::slotGeneralOptions() void kvoctrainApp::slotGeneralOptionsPage(int index) { KVocTrainPrefs* dialog = new KVocTrainPrefs(langset, doc, lessons, &querymanager, this, "settings", Prefs::self() ); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotApplyPreferences())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotApplyPreferences())); if (index >= 0) dialog->selectPage(index); dialog->show(); @@ -1149,8 +1149,8 @@ void kvoctrainApp::aboutToShowLearn() } header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL); - connect (query_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (query_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect (query_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); for (int i = 1; i < (int) doc->numLangs(); i++) { // show pixmap and long name if available @@ -1177,12 +1177,12 @@ void kvoctrainApp::aboutToShowLearn() header_m->insertItem(i18n("E&xamples"), (header << 16) | IDH_START_EXAMPLE); header_m->insertItem(i18n("&Paraphrase"), (header << 16) | IDH_START_PARAPHRASE); - connect (multiple_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (multiple_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect (multiple_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); } - connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (header_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect (header_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); TQString id = header == 0 ? doc->getOriginalIdent() : doc->getIdent(header); @@ -1263,8 +1263,8 @@ void kvoctrainApp::aboutToShowVocabSetLanguage() langs_m->insertItem(names[i], (header << 16) | (i << (16+8)) | IDH_SET_LANG); } - connect (langs_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetHeaderProp(int))); - connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (langs_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetHeaderProp(int))); + connect (langs_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); if (header == 0) set_m->insertItem(i18n("&Original"), langs_m, (2 << 16) | IDH_NULL); diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp index e524e033..ff3382df 100644 --- a/kvoctrain/kvoctrain/kvoctraintable.cpp +++ b/kvoctrain/kvoctrain/kvoctraintable.cpp @@ -61,13 +61,13 @@ KVocTrainTable::KVocTrainTable(kvoctrainDoc *doc, const LangSet *ls, TQWidget *p m_pixInactive = TQPixmap(TDEGlobal::iconLoader()->loadIcon("no", TDEIcon::Small)); delayTimer = new TQTimer(this); - connect(delayTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(menuTriggerTimeout())); + connect(delayTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(menuTriggerTimeout())); TQHeader *header = horizontalHeader(); - connect(header, TQT_SIGNAL(pressed(int)), this, TQT_SLOT(headerPressEvent(int))); - connect(header, TQT_SIGNAL(released(int)), this, TQT_SLOT(headerReleaseEvent(int))); + connect(header, TQ_SIGNAL(pressed(int)), this, TQ_SLOT(headerPressEvent(int))); + connect(header, TQ_SIGNAL(released(int)), this, TQ_SLOT(headerReleaseEvent(int))); - connect(this, TQT_SIGNAL(currentChanged(int, int)), this, TQT_SLOT(slotCurrentChanged(int, int))); + connect(this, TQ_SIGNAL(currentChanged(int, int)), this, TQ_SLOT(slotCurrentChanged(int, int))); } diff --git a/kvoctrain/kvoctrain/kvoctrainview.cpp b/kvoctrain/kvoctrain/kvoctrainview.cpp index 600f27a7..9eb0f449 100644 --- a/kvoctrain/kvoctrain/kvoctrainview.cpp +++ b/kvoctrain/kvoctrain/kvoctrainview.cpp @@ -59,13 +59,13 @@ kvoctrainView::kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp if (m_doc->numLangs() == 0) m_doc->appendLang(i18n("Original")); - connect(m_table, TQT_SIGNAL(selected(int)), m_table, TQT_SLOT(sortByColumn_alpha(int))); - connect(m_table, TQT_SIGNAL(rightButtonClicked(int, int, int)), parent, TQT_SLOT(slotHeaderMenu(int, int, int))); - connect(m_table, TQT_SIGNAL(edited(int, int)), parent, TQT_SLOT(slotEditEntry(int, int))); - connect(m_table, TQT_SIGNAL(currentChanged(int, int)), parent, TQT_SLOT(slotCurrentCellChanged(int, int))); - connect(m_table, TQT_SIGNAL(selectionChanged()), m_table, TQT_SLOT(slotSelectionChanged())); - connect(m_table, TQT_SIGNAL(forwardKeyPressEvent(TQKeyEvent*)), parent, TQT_SLOT(keyPressEvent(TQKeyEvent *))); - connect(m_table, TQT_SIGNAL(forwardKeyReleaseEvent(TQKeyEvent*)), parent, TQT_SLOT(keyReleaseEvent(TQKeyEvent *))); + connect(m_table, TQ_SIGNAL(selected(int)), m_table, TQ_SLOT(sortByColumn_alpha(int))); + connect(m_table, TQ_SIGNAL(rightButtonClicked(int, int, int)), parent, TQ_SLOT(slotHeaderMenu(int, int, int))); + connect(m_table, TQ_SIGNAL(edited(int, int)), parent, TQ_SLOT(slotEditEntry(int, int))); + connect(m_table, TQ_SIGNAL(currentChanged(int, int)), parent, TQ_SLOT(slotCurrentCellChanged(int, int))); + connect(m_table, TQ_SIGNAL(selectionChanged()), m_table, TQ_SLOT(slotSelectionChanged())); + connect(m_table, TQ_SIGNAL(forwardKeyPressEvent(TQKeyEvent*)), parent, TQ_SLOT(keyPressEvent(TQKeyEvent *))); + connect(m_table, TQ_SIGNAL(forwardKeyReleaseEvent(TQKeyEvent*)), parent, TQ_SLOT(keyReleaseEvent(TQKeyEvent *))); list_layout = new TQGridLayout( this, 2, 1/*, 4 */); list_layout->addWidget(m_table, 1, 0); diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp index 5d0ec824..906c3753 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp @@ -97,7 +97,7 @@ kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url) if (!url.isEmpty()) doc_url = url; - connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) ); + connect( this, TQ_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQ_SLOT(slotProgress(kvoctrainDoc*,int)) ); TQString tmpfile; if (TDEIO::NetAccess::download( url, tmpfile, 0 )) @@ -189,7 +189,7 @@ kvoctrainDoc::~kvoctrainDoc() bool kvoctrainDoc::saveAs (TQObject *parent, const KURL & url, TQString title, FileType ft) { - connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) ); + connect( this, TQ_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQ_SLOT(slotProgress(kvoctrainDoc*,int)) ); KURL tmp (url); if (title == i18n("Untitled")) diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp index 0fb0ec89..09710019 100644 --- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp @@ -55,18 +55,18 @@ AdjQueryDlg::AdjQueryDlg mw = new AdjQueryDlgForm(this); setMainWidget(mw); - connect(mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) ); - connect(mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) ); - connect(mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) ); - connect(mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) ); + connect(mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) ); + connect(mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) ); + connect(mw->verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) ); + connect(mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showAllClicked()) ); - connect(mw->lev1Field, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) ); - connect(mw->lev2Field, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) ); - connect(mw->lev3Field, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) ); + connect(mw->lev1Field, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressed()) ); + connect(mw->lev2Field, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressed()) ); + connect(mw->lev3Field, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressed()) ); - connect(mw->lev1Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev1Changed(const TQString&)) ); - connect(mw->lev2Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev2Changed(const TQString&)) ); - connect(mw->lev3Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev3Changed(const TQString&)) ); + connect(mw->lev1Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev1Changed(const TQString&)) ); + connect(mw->lev2Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev2Changed(const TQString&)) ); + connect(mw->lev3Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev3Changed(const TQString&)) ); qtimer = 0; @@ -137,7 +137,7 @@ void AdjQueryDlg::setQuery(TQString, if (mqtime > 0) { if (qtimer == 0) { qtimer = new TQTimer( this ); - connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) ); + connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) ); } if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) { diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp index 1912d7b3..9e8e9ce2 100644 --- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp @@ -61,14 +61,14 @@ ArtQueryDlg::ArtQueryDlg mw->artGroup->insert (mw->male); mw->artGroup->insert (mw->rb_fem); - connect(mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) ); - connect(mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) ); - connect(mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) ); - connect(mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) ); + connect(mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) ); + connect(mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) ); + connect(mw->verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) ); + connect(mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showAllClicked()) ); - connect(mw->natural, TQT_SIGNAL(clicked()), TQT_SLOT(slotNaturalClicked()) ); - connect(mw->male, TQT_SIGNAL(clicked()), TQT_SLOT(slotMaleClicked()) ); - connect(mw->rb_fem, TQT_SIGNAL(clicked()), TQT_SLOT(slotFemClicked()) ); + connect(mw->natural, TQ_SIGNAL(clicked()), TQ_SLOT(slotNaturalClicked()) ); + connect(mw->male, TQ_SIGNAL(clicked()), TQ_SLOT(slotMaleClicked()) ); + connect(mw->rb_fem, TQ_SIGNAL(clicked()), TQ_SLOT(slotFemClicked()) ); setQuery (type, entry, col, query_cycle, query_num, query_startnum, exp, doc, articles); mw->countbar->setFormat("%v/%m"); @@ -158,7 +158,7 @@ void ArtQueryDlg::setQuery(TQString, if (mqtime > 0) { if (qtimer == 0) { qtimer = new TQTimer( this ); - connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) ); + connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) ); } if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) { diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp index 42a578f0..19b977c1 100644 --- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp @@ -64,15 +64,15 @@ MCQueryDlg::MCQueryDlg( mw->transgroup->insert(mw->rb_trans4); mw->transgroup->insert(mw->rb_trans5); - connect( mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) ); - connect( mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) ); -// connect( verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) ); - connect( mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showItClicked()) ); - connect( mw->rb_trans5, TQT_SIGNAL(clicked()), TQT_SLOT(trans5clicked()) ); - connect( mw->rb_trans4, TQT_SIGNAL(clicked()), TQT_SLOT(trans4clicked()) ); - connect( mw->rb_trans3, TQT_SIGNAL(clicked()), TQT_SLOT(trans3clicked()) ); - connect( mw->rb_trans2, TQT_SIGNAL(clicked()), TQT_SLOT(trans2clicked()) ); - connect( mw->rb_trans1, TQT_SIGNAL(clicked()), TQT_SLOT(trans1clicked()) ); + connect( mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) ); + connect( mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) ); +// connect( verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) ); + connect( mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showItClicked()) ); + connect( mw->rb_trans5, TQ_SIGNAL(clicked()), TQ_SLOT(trans5clicked()) ); + connect( mw->rb_trans4, TQ_SIGNAL(clicked()), TQ_SLOT(trans4clicked()) ); + connect( mw->rb_trans3, TQ_SIGNAL(clicked()), TQ_SLOT(trans3clicked()) ); + connect( mw->rb_trans2, TQ_SIGNAL(clicked()), TQ_SLOT(trans2clicked()) ); + connect( mw->rb_trans1, TQ_SIGNAL(clicked()), TQ_SLOT(trans1clicked()) ); qtimer = 0; @@ -121,7 +121,7 @@ void MCQueryDlg::setQuery(TQString org, if (mqtime > 0) { if (qtimer == 0) { qtimer = new TQTimer( this ); - connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) ); + connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) ); } if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) { diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp index 819ed2a2..f9725434 100644 --- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp @@ -140,14 +140,14 @@ RandomQueryDlg::RandomQueryDlg( mw = new QueryDlgForm(this); setMainWidget(mw); - connect( mw->c_type, TQT_SIGNAL(clicked()), TQT_SLOT(slotTypeClicked()) ); - connect( mw->c_remark, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemClicked()) ); - connect( mw->c_falsefriend, TQT_SIGNAL(clicked()), TQT_SLOT(slotFFClicked()) ); - connect( mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) ); - connect( mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) ); - connect( mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) ); - connect( mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) ); - connect( mw->show_more, TQT_SIGNAL(clicked()), TQT_SLOT(showMoreClicked()) ); + connect( mw->c_type, TQ_SIGNAL(clicked()), TQ_SLOT(slotTypeClicked()) ); + connect( mw->c_remark, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemClicked()) ); + connect( mw->c_falsefriend, TQ_SIGNAL(clicked()), TQ_SLOT(slotFFClicked()) ); + connect( mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) ); + connect( mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) ); + connect( mw->verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) ); + connect( mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showAllClicked()) ); + connect( mw->show_more, TQ_SIGNAL(clicked()), TQ_SLOT(showMoreClicked()) ); mw->show_more -> setEnabled (Prefs::showMore()); mw->know_it -> setEnabled (Prefs::iKnow()); @@ -173,8 +173,8 @@ RandomQueryDlg::RandomQueryDlg( transCombos.at(i) -> setInsertionPolicy (TQComboBox::NoInsertion); transCombos.at(i) -> setDuplicatesEnabled (false); vb->addWidget(transCombos.at(i)); - connect (transCombos.at(i), TQT_SIGNAL (textChanged (const TQString&)), TQT_SLOT (slotTransChanged (const TQString&))); - connect (transCombos.at(i) -> lineEdit(), TQT_SIGNAL (lostFocus()), TQT_SLOT (slotTransLostFocus())); + connect (transCombos.at(i), TQ_SIGNAL (textChanged (const TQString&)), TQ_SLOT (slotTransChanged (const TQString&))); + connect (transCombos.at(i) -> lineEdit(), TQ_SIGNAL (lostFocus()), TQ_SLOT (slotTransLostFocus())); } } else @@ -184,8 +184,8 @@ RandomQueryDlg::RandomQueryDlg( transFields.append (new TQLineEdit (mw->TranslationFrame, TQCString ("transField") + TQCString().setNum (i))); transFields.at(i) -> setSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transFields.at(i) -> sizePolicy().hasHeightForWidth())); vb->addWidget(transFields.at(i)); - connect (transFields.at(i), TQT_SIGNAL (textChanged (const TQString&)), TQT_SLOT (slotTransChanged (const TQString&))); - connect (transFields.at(i), TQT_SIGNAL (lostFocus()), TQT_SLOT (slotTransLostFocus())); + connect (transFields.at(i), TQ_SIGNAL (textChanged (const TQString&)), TQ_SLOT (slotTransChanged (const TQString&))); + connect (transFields.at(i), TQ_SIGNAL (lostFocus()), TQ_SLOT (slotTransLostFocus())); } } @@ -316,7 +316,7 @@ void RandomQueryDlg::setQuery(TQString org, if (mqtime > 0) { if (qtimer == 0) { qtimer = new TQTimer( this ); - connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) ); + connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) ); } if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) { diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp index c5b40d09..e0737d32 100644 --- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp @@ -51,12 +51,12 @@ SimpleQueryDlg::SimpleQueryDlg( mw = new SimpleQueryDlgForm(this); setMainWidget(mw); - connect(mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) ); - connect(mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) ); - connect(mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) ); - connect(mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) ); - connect(mw->show_more, TQT_SIGNAL(clicked()), TQT_SLOT(showMoreClicked()) ); - connect(mw->answerField, TQT_SIGNAL(textChanged()), TQT_SLOT(slotAnswerChanged()) ); + connect(mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) ); + connect(mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) ); + connect(mw->verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) ); + connect(mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showAllClicked()) ); + connect(mw->show_more, TQ_SIGNAL(clicked()), TQ_SLOT(showMoreClicked()) ); + connect(mw->answerField, TQ_SIGNAL(textChanged()), TQ_SLOT(slotAnswerChanged()) ); kv_doc = 0; qtimer = 0; @@ -170,7 +170,7 @@ void SimpleQueryDlg::setQuery(QueryType _querytype, if (mqtime > 0) { if (qtimer == 0) { qtimer = new TQTimer( this ); - connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) ); + connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) ); } if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) { diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp index e7868a9e..03e29d64 100644 --- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp @@ -54,32 +54,32 @@ VerbQueryDlg::VerbQueryDlg mw = new VerbQueryDlgForm(this); setMainWidget(mw); - connect(mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) ); - connect(mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) ); - connect(mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) ); - connect(mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) ); - - connect(mw->p3pmField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p3pnField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p3snField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p3smField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p3pfField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p3sfField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p2pField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p2sField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p1pField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p1sField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - - connect(mw->p3pmField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3pmChanged(const TQString&)) ); - connect(mw->p3snField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3snChanged(const TQString&)) ); - connect(mw->p3pnField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3pnChanged(const TQString&)) ); - connect(mw->p3smField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3smChanged(const TQString&)) ); - connect(mw->p3pfField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3pfChanged(const TQString&)) ); - connect(mw->p3sfField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3sfChanged(const TQString&)) ); - connect(mw->p2pField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP2pChanged(const TQString&)) ); - connect(mw->p2sField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP2sChanged(const TQString&)) ); - connect(mw->p1pField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP1pChanged(const TQString&)) ); - connect(mw->p1sField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP1sChanged(const TQString&)) ); + connect(mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) ); + connect(mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) ); + connect(mw->verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) ); + connect(mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showAllClicked()) ); + + connect(mw->p3pmField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p3pnField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p3snField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p3smField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p3pfField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p3sfField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p2pField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p2sField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p1pField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p1sField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + + connect(mw->p3pmField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3pmChanged(const TQString&)) ); + connect(mw->p3snField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3snChanged(const TQString&)) ); + connect(mw->p3pnField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3pnChanged(const TQString&)) ); + connect(mw->p3smField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3smChanged(const TQString&)) ); + connect(mw->p3pfField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3pfChanged(const TQString&)) ); + connect(mw->p3sfField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3sfChanged(const TQString&)) ); + connect(mw->p2pField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP2pChanged(const TQString&)) ); + connect(mw->p2sField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP2sChanged(const TQString&)) ); + connect(mw->p1pField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP1pChanged(const TQString&)) ); + connect(mw->p1sField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP1sChanged(const TQString&)) ); qtimer = 0; @@ -146,7 +146,7 @@ void VerbQueryDlg::setQuery(TQString, if (mqtime > 0) { // more than 1000 milli-seconds if (qtimer == 0) { qtimer = new TQTimer( this ); - connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) ); + connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) ); } if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) { diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp index ae34d191..f6aa5a31 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp +++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp @@ -85,8 +85,8 @@ StatistikPage::StatistikPage(int col, kvoctrainDoc *_doc, TQWidget *parent, con } } setupPixmaps(); - connect(StatListView, TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint& , int ) ), - this, TQT_SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) ); + connect(StatListView, TQ_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint& , int ) ), + this, TQ_SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) ); } diff --git a/kwordquiz/src/dlgspecchar.cpp b/kwordquiz/src/dlgspecchar.cpp index da993afc..697e6a16 100644 --- a/kwordquiz/src/dlgspecchar.cpp +++ b/kwordquiz/src/dlgspecchar.cpp @@ -41,7 +41,7 @@ void DlgSpecChar::initDialog(const TQChar &_chr, const TQString &_font, bool /*_ int t = (_chr.unicode()/256); charSelect = new KCharSelect( page, "", _font, _chr, t); - connect(charSelect, TQT_SIGNAL(doubleClicked()),this, TQT_SLOT(slotDoubleClicked())); + connect(charSelect, TQ_SIGNAL(doubleClicked()),this, TQ_SLOT(slotDoubleClicked())); charSelect->resize( charSelect->sizeHint() ); charSelect->enableFontCombo( false ); grid->addWidget( charSelect, 0, 0 ); diff --git a/kwordquiz/src/flashview.cpp b/kwordquiz/src/flashview.cpp index 3e150a34..b22b9275 100644 --- a/kwordquiz/src/flashview.cpp +++ b/kwordquiz/src/flashview.cpp @@ -30,7 +30,7 @@ FlashView::FlashView(TQWidget *parent, const char *name, WFlags f) { m_score = new WTQScore(); m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimer())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimer())); } diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp index 6652915f..92a20dd6 100644 --- a/kwordquiz/src/kwordquiz.cpp +++ b/kwordquiz/src/kwordquiz.cpp @@ -105,117 +105,117 @@ void KWordQuizApp::initActions() TDEAction* configNotifications; TDEAction* configApp; - fileNew = KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection()); + fileNew = KStdAction::openNew(this, TQ_SLOT(slotFileNew()), actionCollection()); fileNew->setWhatsThis(i18n("Creates a new blank vocabulary document")); fileNew->setToolTip(fileNew->whatsThis()); - fileOpen = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection()); + fileOpen = KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection()); fileOpen->setWhatsThis(i18n("Opens an existing vocabulary document")); fileOpen->setToolTip(fileOpen->whatsThis()); - fileOpenRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); + fileOpenRecent = KStdAction::openRecent(this, TQ_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - fileGHNS = new TDEAction(i18n("&Get New Vocabularies..."), "knewstuff", "CTRL+G", this, TQT_SLOT(slotFileGHNS()), actionCollection(), "file_ghns"); + fileGHNS = new TDEAction(i18n("&Get New Vocabularies..."), "knewstuff", "CTRL+G", this, TQ_SLOT(slotFileGHNS()), actionCollection(), "file_ghns"); fileGHNS->setWhatsThis(i18n("Downloads new vocabularies")); fileGHNS->setToolTip(fileGHNS->whatsThis()); - fileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection()); + fileSave = KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection()); fileSave->setWhatsThis(i18n("Saves the active vocabulary document")); fileSave->setToolTip(fileSave->whatsThis()); - fileSaveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection()); + fileSaveAs = KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection()); fileSaveAs->setWhatsThis(i18n("Saves the active vocabulary document with a different name")); fileSaveAs->setToolTip(fileSaveAs->whatsThis()); - fileClose = KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection()); + fileClose = KStdAction::close(this, TQ_SLOT(slotFileClose()), actionCollection()); fileClose->setWhatsThis(i18n("Closes the active vocabulary document")); fileClose->setToolTip(fileClose->whatsThis()); - filePrint = KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection()); + filePrint = KStdAction::print(this, TQ_SLOT(slotFilePrint()), actionCollection()); filePrint->setWhatsThis(i18n("Prints the active vocabulary document")); filePrint->setToolTip(filePrint->whatsThis()); - fileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); + fileQuit = KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); fileQuit->setWhatsThis(i18n("Quits KWordQuiz")); fileQuit->setToolTip(fileQuit->whatsThis()); - editUndo = KStdAction::undo(this, TQT_SLOT(slotEditUndo()), actionCollection()); + editUndo = KStdAction::undo(this, TQ_SLOT(slotEditUndo()), actionCollection()); editUndo->setWhatsThis(i18n("Undoes the last command")); editUndo->setToolTip(editUndo->whatsThis()); - editCut = KStdAction::cut(this, TQT_SLOT(slotEditCut()), actionCollection()); + editCut = KStdAction::cut(this, TQ_SLOT(slotEditCut()), actionCollection()); editCut->setWhatsThis(i18n("Cuts the text from the selected cells and places it on the clipboard")); editCut->setToolTip(editCut->whatsThis()); - editCopy = KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection()); + editCopy = KStdAction::copy(this, TQ_SLOT(slotEditCopy()), actionCollection()); editCopy->setWhatsThis(i18n("Copies the text from the selected cells and places it on the clipboard")); editCopy->setToolTip(editCopy->whatsThis()); - editPaste = KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection()); + editPaste = KStdAction::paste(this, TQ_SLOT(slotEditPaste()), actionCollection()); editPaste->setWhatsThis(i18n("Pastes previously cut or copied text from the clipboard into the selected cells")); editPaste->setToolTip(editPaste->whatsThis()); - editClear = KStdAction::clear(this, TQT_SLOT(slotEditClear()), actionCollection()); + editClear = KStdAction::clear(this, TQ_SLOT(slotEditClear()), actionCollection()); editClear->setWhatsThis(i18n("Clears the content of the selected cells")); editClear->setToolTip(editClear->whatsThis()); - editInsert = new TDEAction(i18n("&Insert Row"), "insert_table_row", "CTRL+I", this, TQT_SLOT(slotEditInsert()), actionCollection(),"edit_insert"); + editInsert = new TDEAction(i18n("&Insert Row"), "insert_table_row", "CTRL+I", this, TQ_SLOT(slotEditInsert()), actionCollection(),"edit_insert"); editInsert->setWhatsThis(i18n("Inserts a new row above the current row")); editInsert->setToolTip(editInsert->whatsThis()); - editDelete = new TDEAction(i18n("&Delete Row"), "delete_table_row", "CTRL+K", this, TQT_SLOT(slotEditDelete()), actionCollection(),"edit_delete"); + editDelete = new TDEAction(i18n("&Delete Row"), "delete_table_row", "CTRL+K", this, TQ_SLOT(slotEditDelete()), actionCollection(),"edit_delete"); editDelete->setWhatsThis(i18n("Deletes the selected row(s)")); editDelete->setToolTip(editDelete->whatsThis()); - editMarkBlank = new TDEAction(i18n("&Mark as Blank"), "markasblank", "CTRL+M", this, TQT_SLOT(slotEditMarkBlank()), actionCollection(),"edit_mark_blank"); + editMarkBlank = new TDEAction(i18n("&Mark as Blank"), "markasblank", "CTRL+M", this, TQ_SLOT(slotEditMarkBlank()), actionCollection(),"edit_mark_blank"); editMarkBlank->setWhatsThis(i18n("Marks the current or selected word as a blank for Fill-in-the-blank")); editMarkBlank->setToolTip(editMarkBlank->whatsThis()); - editUnmarkBlank = new TDEAction(i18n("&Unmark Blanks"), "unmarkasblank", 0, this, TQT_SLOT(slotEditUnmarkBlank()), actionCollection(),"edit_unmark_blank"); + editUnmarkBlank = new TDEAction(i18n("&Unmark Blanks"), "unmarkasblank", 0, this, TQ_SLOT(slotEditUnmarkBlank()), actionCollection(),"edit_unmark_blank"); editUnmarkBlank->setWhatsThis(i18n("Removes blanks from the current or selected word")); editUnmarkBlank->setToolTip(editUnmarkBlank->whatsThis()); - //@todo implement editFind = KStdAction::find(this, TQT_SLOT(slotEditFind()), actionCollection()); + //@todo implement editFind = KStdAction::find(this, TQ_SLOT(slotEditFind()), actionCollection()); - vocabLanguages = new TDEAction(i18n("&Column Titles..."), "languages", "CTRL+L", this, TQT_SLOT(slotVocabLanguages()), actionCollection(),"vocab_languages"); + vocabLanguages = new TDEAction(i18n("&Column Titles..."), "languages", "CTRL+L", this, TQ_SLOT(slotVocabLanguages()), actionCollection(),"vocab_languages"); vocabLanguages->setWhatsThis(i18n("Defines the column titles for the active vocabulary")); vocabLanguages->setToolTip(vocabLanguages->whatsThis()); - vocabFont = new TDEAction(i18n("&Font..."), "fonts", 0, this, TQT_SLOT(slotVocabFont()), actionCollection(),"vocab_font"); + vocabFont = new TDEAction(i18n("&Font..."), "fonts", 0, this, TQ_SLOT(slotVocabFont()), actionCollection(),"vocab_font"); vocabFont->setWhatsThis(i18n("Defines the font used by the editor")); vocabFont->setToolTip(vocabFont->whatsThis()); - //@todo implement vocabKeyboard = new TDEAction(i18n("&Keyboard..."), "kxkb", 0, this, TQT_SLOT(slotVocabKeyboard()), actionCollection(),"vocab_keyboard"); + //@todo implement vocabKeyboard = new TDEAction(i18n("&Keyboard..."), "kxkb", 0, this, TQ_SLOT(slotVocabKeyboard()), actionCollection(),"vocab_keyboard"); - vocabRC = new TDEAction(i18n("&Rows/Columns..."), "rowcol", 0, this, TQT_SLOT(slotVocabRC()), actionCollection(),"vocab_rc"); + vocabRC = new TDEAction(i18n("&Rows/Columns..."), "rowcol", 0, this, TQ_SLOT(slotVocabRC()), actionCollection(),"vocab_rc"); vocabRC->setWhatsThis(i18n("Defines the number of rows, row heights, and column widths for the active vocabulary")); vocabRC->setToolTip(vocabRC->whatsThis()); - vocabSort = new TDEAction(i18n("&Sort..."), "sort_incr", 0, this, TQT_SLOT(slotVocabSort()), actionCollection(),"vocab_sort"); + vocabSort = new TDEAction(i18n("&Sort..."), "sort_incr", 0, this, TQ_SLOT(slotVocabSort()), actionCollection(),"vocab_sort"); vocabSort->setWhatsThis(i18n("Sorts the vocabulary in ascending or descending order based on the left or right column")); vocabSort->setToolTip(vocabSort->whatsThis()); - vocabShuffle = new TDEAction(i18n("Sh&uffle"), "shuffle", 0, this, TQT_SLOT(slotVocabShuffle()), actionCollection(),"vocab_shuffle"); + vocabShuffle = new TDEAction(i18n("Sh&uffle"), "shuffle", 0, this, TQ_SLOT(slotVocabShuffle()), actionCollection(),"vocab_shuffle"); vocabShuffle->setWhatsThis(i18n("Shuffles the entries of the active vocabulary")); vocabShuffle->setToolTip(vocabShuffle->whatsThis()); - mode = new TDEToolBarPopupAction(i18n("Change Mode"), "mode1", 0, this, TQT_SLOT(slotMode0()), actionCollection(),"mode_0"); + mode = new TDEToolBarPopupAction(i18n("Change Mode"), "mode1", 0, this, TQ_SLOT(slotMode0()), actionCollection(),"mode_0"); mode->setWhatsThis(i18n("Changes the mode used in quiz sessions")); mode->setToolTip(mode->whatsThis()); TDEPopupMenu *popup = mode->popupMenu(); popup->clear(); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode1", TDEIcon::Toolbar), "", this, TQT_SLOT(slotMode1()), 0, 0); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode2", TDEIcon::Toolbar), "", this, TQT_SLOT(slotMode2()), 0, 1); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode3", TDEIcon::Toolbar), "", this, TQT_SLOT(slotMode3()), 0, 2); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode4", TDEIcon::Toolbar), "", this, TQT_SLOT(slotMode4()), 0, 3); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode5", TDEIcon::Toolbar), "", this, TQT_SLOT(slotMode5()), 0, 4); - - mode1 = new TDEToggleAction("", "mode1", 0, this, TQT_SLOT(slotMode1()), actionCollection(),"mode_1"); - mode2 = new TDEToggleAction("", "mode2", 0, this, TQT_SLOT(slotMode2()), actionCollection(),"mode_2"); - mode3 = new TDEToggleAction("", "mode3", 0, this, TQT_SLOT(slotMode3()), actionCollection(),"mode_3"); - mode4 = new TDEToggleAction("", "mode4", 0, this, TQT_SLOT(slotMode4()), actionCollection(),"mode_4"); - mode5 = new TDEToggleAction("", "mode5", 0, this, TQT_SLOT(slotMode5()), actionCollection(),"mode_5"); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode1", TDEIcon::Toolbar), "", this, TQ_SLOT(slotMode1()), 0, 0); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode2", TDEIcon::Toolbar), "", this, TQ_SLOT(slotMode2()), 0, 1); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode3", TDEIcon::Toolbar), "", this, TQ_SLOT(slotMode3()), 0, 2); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode4", TDEIcon::Toolbar), "", this, TQ_SLOT(slotMode4()), 0, 3); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode5", TDEIcon::Toolbar), "", this, TQ_SLOT(slotMode5()), 0, 4); + + mode1 = new TDEToggleAction("", "mode1", 0, this, TQ_SLOT(slotMode1()), actionCollection(),"mode_1"); + mode2 = new TDEToggleAction("", "mode2", 0, this, TQ_SLOT(slotMode2()), actionCollection(),"mode_2"); + mode3 = new TDEToggleAction("", "mode3", 0, this, TQ_SLOT(slotMode3()), actionCollection(),"mode_3"); + mode4 = new TDEToggleAction("", "mode4", 0, this, TQ_SLOT(slotMode4()), actionCollection(),"mode_4"); + mode5 = new TDEToggleAction("", "mode5", 0, this, TQ_SLOT(slotMode5()), actionCollection(),"mode_5"); mode1->setWhatsThis(i18n("Selects this mode")); mode2->setWhatsThis(i18n("Selects this mode")); mode3->setWhatsThis(i18n("Selects this mode")); @@ -227,19 +227,19 @@ void KWordQuizApp::initActions() mode4->setToolTip(mode4->whatsThis()); mode5->setToolTip(mode5->whatsThis()); - quizEditor = new TDEAction(i18n("&Editor"), "editor", "F6", this, TQT_SLOT(slotQuizEditor()), actionCollection(),"quiz_editor"); + quizEditor = new TDEAction(i18n("&Editor"), "editor", "F6", this, TQ_SLOT(slotQuizEditor()), actionCollection(),"quiz_editor"); quizEditor->setWhatsThis(i18n("Activates the vocabulary editor")); quizEditor->setToolTip(quizEditor->whatsThis()); - quizFlash = new TDEAction(i18n("&Flashcard"), "flash", "F7", this, TQT_SLOT(slotQuizFlash()), actionCollection(),"quiz_flash"); + quizFlash = new TDEAction(i18n("&Flashcard"), "flash", "F7", this, TQ_SLOT(slotQuizFlash()), actionCollection(),"quiz_flash"); quizFlash->setWhatsThis(i18n("Starts a flashcard session using the active vocabulary")); quizFlash->setToolTip(quizFlash->whatsThis()); - quizMultiple = new TDEAction(i18n("&Multiple Choice"), "multiple", "F8", this, TQT_SLOT(slotQuizMultiple()), actionCollection(),"quiz_multiple"); + quizMultiple = new TDEAction(i18n("&Multiple Choice"), "multiple", "F8", this, TQ_SLOT(slotQuizMultiple()), actionCollection(),"quiz_multiple"); quizMultiple->setWhatsThis(i18n("Starts a multiple choice session using the active vocabulary")); quizMultiple->setToolTip(quizMultiple->whatsThis()); - quizQA = new TDEAction(i18n("&Question && Answer"), "qa", "F9", this, TQT_SLOT(slotQuizQA()), actionCollection(),"quiz_qa"); + quizQA = new TDEAction(i18n("&Question && Answer"), "qa", "F9", this, TQ_SLOT(slotQuizQA()), actionCollection(),"quiz_qa"); quizQA->setWhatsThis(i18n("Starts a question and answer session using the active vocabulary")); quizQA->setToolTip(quizQA->whatsThis()); @@ -267,26 +267,26 @@ void KWordQuizApp::initActions() quizRepeatErrors->setWhatsThis(i18n("Repeats all incorrectly answered questions")); quizRepeatErrors->setToolTip(quizRepeatErrors->whatsThis()); - configNotifications = KStdAction::configureNotifications(this, TQT_SLOT(slotConfigureNotifications()), actionCollection()); + configNotifications = KStdAction::configureNotifications(this, TQ_SLOT(slotConfigureNotifications()), actionCollection()); configNotifications->setWhatsThis(i18n("Configures sound and other notifications for certain events")); configNotifications->setToolTip(configNotifications->whatsThis()); - configApp = KStdAction::preferences(this, TQT_SLOT( slotConfigure()), actionCollection()); + configApp = KStdAction::preferences(this, TQ_SLOT( slotConfigure()), actionCollection()); configApp->setWhatsThis(i18n("Specifies preferences for the vocabulary editor and quiz sessions")); configApp->setToolTip(configApp->whatsThis()); charMapper = new TQSignalMapper(this); - connect(charMapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotInsertChar(int))); - - specialChar1 = new TDEAction(i18n("Special Character 1"), "", "CTRL+1", charMapper, TQT_SLOT(map()), actionCollection(), "char_1") ; - specialChar2 = new TDEAction(i18n("Special Character 2"), 0, "CTRL+2", charMapper, TQT_SLOT(map()), actionCollection(), "char_2") ; - specialChar3 = new TDEAction(i18n("Special Character 3"), 0, "CTRL+3", charMapper, TQT_SLOT(map()), actionCollection(), "char_3") ; - specialChar4 = new TDEAction(i18n("Special Character 4"), 0, "CTRL+4", charMapper, TQT_SLOT(map()), actionCollection(), "char_4") ; - specialChar5 = new TDEAction(i18n("Special Character 5"), 0, "CTRL+5", charMapper, TQT_SLOT(map()), actionCollection(), "char_5") ; - specialChar6 = new TDEAction(i18n("Special Character 6"), 0, "CTRL+6", charMapper, TQT_SLOT(map()), actionCollection(), "char_6") ; - specialChar7 = new TDEAction(i18n("Special Character 7"), 0, "CTRL+7", charMapper, TQT_SLOT(map()), actionCollection(), "char_7") ; - specialChar8 = new TDEAction(i18n("Special Character 8"), 0, "CTRL+8", charMapper, TQT_SLOT(map()), actionCollection(), "char_8") ; - specialChar9 = new TDEAction(i18n("Special Character 9"), 0, "CTRL+9", charMapper, TQT_SLOT(map()), actionCollection(), "char_9") ; + connect(charMapper, TQ_SIGNAL(mapped(int)), this, TQ_SLOT(slotInsertChar(int))); + + specialChar1 = new TDEAction(i18n("Special Character 1"), "", "CTRL+1", charMapper, TQ_SLOT(map()), actionCollection(), "char_1") ; + specialChar2 = new TDEAction(i18n("Special Character 2"), 0, "CTRL+2", charMapper, TQ_SLOT(map()), actionCollection(), "char_2") ; + specialChar3 = new TDEAction(i18n("Special Character 3"), 0, "CTRL+3", charMapper, TQ_SLOT(map()), actionCollection(), "char_3") ; + specialChar4 = new TDEAction(i18n("Special Character 4"), 0, "CTRL+4", charMapper, TQ_SLOT(map()), actionCollection(), "char_4") ; + specialChar5 = new TDEAction(i18n("Special Character 5"), 0, "CTRL+5", charMapper, TQ_SLOT(map()), actionCollection(), "char_5") ; + specialChar6 = new TDEAction(i18n("Special Character 6"), 0, "CTRL+6", charMapper, TQ_SLOT(map()), actionCollection(), "char_6") ; + specialChar7 = new TDEAction(i18n("Special Character 7"), 0, "CTRL+7", charMapper, TQ_SLOT(map()), actionCollection(), "char_7") ; + specialChar8 = new TDEAction(i18n("Special Character 8"), 0, "CTRL+8", charMapper, TQ_SLOT(map()), actionCollection(), "char_8") ; + specialChar9 = new TDEAction(i18n("Special Character 9"), 0, "CTRL+9", charMapper, TQ_SLOT(map()), actionCollection(), "char_9") ; charMapper->setMapping(specialChar1, 1); charMapper->setMapping(specialChar2, 2); @@ -299,8 +299,8 @@ void KWordQuizApp::initActions() charMapper->setMapping(specialChar9, 9); actionCollection()->setHighlightingEnabled(true); - connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), this, TQT_SLOT(slotStatusMsg(const TQString &))); - connect(actionCollection(), TQT_SIGNAL(actionHighlighted(TDEAction *, bool)), this, TQT_SLOT(slotActionHighlighted(TDEAction *, bool))); + connect(actionCollection(), TQ_SIGNAL(actionStatusText(const TQString &)), this, TQ_SLOT(slotStatusMsg(const TQString &))); + connect(actionCollection(), TQ_SIGNAL(actionHighlighted(TDEAction *, bool)), this, TQ_SLOT(slotActionHighlighted(TDEAction *, bool))); updateSpecialCharIcons(); if (!initialGeometrySet()) @@ -333,8 +333,8 @@ void KWordQuizApp::initView() setCentralWidget(m_editView); setCaption(doc->URL().fileName(),false); m_editView->setFont(Prefs::editorFont()); - connect(m_editView, TQT_SIGNAL(undoChange(const TQString&, bool )), this, TQT_SLOT(slotUndoChange(const TQString&, bool))); - connect(m_editView, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), this, TQT_SLOT(slotContextMenuRequested(int, int, const TQPoint& ))); + connect(m_editView, TQ_SIGNAL(undoChange(const TQString&, bool )), this, TQ_SLOT(slotUndoChange(const TQString&, bool))); + connect(m_editView, TQ_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), this, TQ_SLOT(slotContextMenuRequested(int, int, const TQPoint& ))); } void KWordQuizApp::openURL(const KURL& url) @@ -472,7 +472,7 @@ bool KWordQuizApp::queryExit() } ///////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATION +// SLOT IMPLEMENTATION ///////////////////////////////////////////////////////////////////// void KWordQuizApp::slotFileNew() @@ -956,7 +956,7 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) break; case WQQuiz::qtFlash: m_quiz = new WQQuiz(m_editView); - connect(m_quiz, TQT_SIGNAL(checkingAnswer(int )), m_editView, TQT_SLOT(slotCheckedAnswer(int ))); + connect(m_quiz, TQ_SIGNAL(checkingAnswer(int )), m_editView, TQ_SLOT(slotCheckedAnswer(int ))); m_quiz ->setQuizType(WQQuiz::qtFlash); m_quiz->setQuizMode(Prefs::mode()); if (m_quiz -> init()) @@ -964,12 +964,12 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) m_editView->saveCurrentSelection(true); m_editView->hide(); m_flashView = new FlashView(this); - connect(quizCheck, TQT_SIGNAL(activated()), m_flashView, TQT_SLOT(slotFlip())); - connect(flashKnow, TQT_SIGNAL(activated()), m_flashView, TQT_SLOT(slotKnow())); - connect(flashDontKnow, TQT_SIGNAL(activated()), m_flashView, TQT_SLOT(slotDontKnow())); - connect(quizRestart, TQT_SIGNAL(activated()), m_flashView, TQT_SLOT(slotRestart())); - connect(quizRepeatErrors, TQT_SIGNAL(activated()), m_flashView, TQT_SLOT(slotRepeat())); - connect(this, TQT_SIGNAL(settingsChanged()), m_flashView, TQT_SLOT(slotApplySettings())); + connect(quizCheck, TQ_SIGNAL(activated()), m_flashView, TQ_SLOT(slotFlip())); + connect(flashKnow, TQ_SIGNAL(activated()), m_flashView, TQ_SLOT(slotKnow())); + connect(flashDontKnow, TQ_SIGNAL(activated()), m_flashView, TQ_SLOT(slotDontKnow())); + connect(quizRestart, TQ_SIGNAL(activated()), m_flashView, TQ_SLOT(slotRestart())); + connect(quizRepeatErrors, TQ_SIGNAL(activated()), m_flashView, TQ_SLOT(slotRepeat())); + connect(this, TQ_SIGNAL(settingsChanged()), m_flashView, TQ_SLOT(slotApplySettings())); setCentralWidget(m_flashView); m_flashView -> setQuiz(m_quiz); @@ -984,7 +984,7 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) break; case WQQuiz::qtMultiple: m_quiz = new WQQuiz(m_editView); - connect(m_quiz, TQT_SIGNAL(checkingAnswer(int )), m_editView, TQT_SLOT(slotCheckedAnswer(int ))); + connect(m_quiz, TQ_SIGNAL(checkingAnswer(int )), m_editView, TQ_SLOT(slotCheckedAnswer(int ))); m_quiz ->setQuizType(WQQuiz::qtMultiple); m_quiz->setQuizMode(Prefs::mode()); if (m_quiz -> init()) @@ -992,10 +992,10 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) m_editView->saveCurrentSelection(true); m_editView->hide(); m_multipleView = new MultipleView(this); - connect(quizCheck, TQT_SIGNAL(activated()), m_multipleView, TQT_SLOT(slotCheck())); - connect(quizRestart, TQT_SIGNAL(activated()), m_multipleView, TQT_SLOT(slotRestart())); - connect(quizRepeatErrors, TQT_SIGNAL(activated()), m_multipleView, TQT_SLOT(slotRepeat())); - connect(this, TQT_SIGNAL(settingsChanged()), m_multipleView, TQT_SLOT(slotApplySettings())); + connect(quizCheck, TQ_SIGNAL(activated()), m_multipleView, TQ_SLOT(slotCheck())); + connect(quizRestart, TQ_SIGNAL(activated()), m_multipleView, TQ_SLOT(slotRestart())); + connect(quizRepeatErrors, TQ_SIGNAL(activated()), m_multipleView, TQ_SLOT(slotRepeat())); + connect(this, TQ_SIGNAL(settingsChanged()), m_multipleView, TQ_SLOT(slotApplySettings())); setCentralWidget(m_multipleView); @@ -1011,7 +1011,7 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) break; case WQQuiz::qtQA: m_quiz = new WQQuiz(m_editView); - connect(m_quiz, TQT_SIGNAL(checkingAnswer(int )), m_editView, TQT_SLOT(slotCheckedAnswer(int ))); + connect(m_quiz, TQ_SIGNAL(checkingAnswer(int )), m_editView, TQ_SLOT(slotCheckedAnswer(int ))); m_quiz ->setQuizType(WQQuiz::qtQA); m_quiz->setQuizMode(Prefs::mode()); if (m_quiz -> init()) @@ -1019,11 +1019,11 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) m_editView->saveCurrentSelection(true); m_editView->hide(); m_qaView = new QAView(this); - connect(quizCheck, TQT_SIGNAL(activated()), m_qaView, TQT_SLOT(slotCheck())); - connect(qaHint, TQT_SIGNAL(activated()), m_qaView, TQT_SLOT(slotHint())); - connect(quizRestart, TQT_SIGNAL(activated()), m_qaView, TQT_SLOT(slotRestart())); - connect(quizRepeatErrors, TQT_SIGNAL(activated()), m_qaView, TQT_SLOT(slotRepeat())); - connect(this, TQT_SIGNAL(settingsChanged()), m_qaView, TQT_SLOT(slotApplySettings())); + connect(quizCheck, TQ_SIGNAL(activated()), m_qaView, TQ_SLOT(slotCheck())); + connect(qaHint, TQ_SIGNAL(activated()), m_qaView, TQ_SLOT(slotHint())); + connect(quizRestart, TQ_SIGNAL(activated()), m_qaView, TQ_SLOT(slotRestart())); + connect(quizRepeatErrors, TQ_SIGNAL(activated()), m_qaView, TQ_SLOT(slotRepeat())); + connect(this, TQ_SIGNAL(settingsChanged()), m_qaView, TQ_SLOT(slotApplySettings())); setCentralWidget(m_qaView); @@ -1055,7 +1055,7 @@ void KWordQuizApp::slotConfigure() //TDEConfigDialog didn't find an instance of this dialog, so lets create it : KWordQuizPrefs* dialog = new KWordQuizPrefs( this, "settings", Prefs::self() ); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotApplyPreferences())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotApplyPreferences())); dialog->show(); } diff --git a/kwordquiz/src/kwordquizdoc.cpp b/kwordquiz/src/kwordquizdoc.cpp index abf26295..70fb3663 100644 --- a/kwordquiz/src/kwordquizdoc.cpp +++ b/kwordquiz/src/kwordquizdoc.cpp @@ -38,7 +38,7 @@ KWordQuizDoc::KWordQuizDoc(TQWidget *parent, const char *name) : TQObject(parent, name) { - connect(KDirWatch::self(), TQT_SIGNAL(dirty(const TQString& )), this, TQT_SLOT(slotModifiedOnDisk(const TQString& ))); + connect(KDirWatch::self(), TQ_SIGNAL(dirty(const TQString& )), this, TQ_SLOT(slotModifiedOnDisk(const TQString& ))); /* if(!pViewList) { pViewList = new TQPtrList<KWordQuizView>(); diff --git a/kwordquiz/src/kwordquizprefs.cpp b/kwordquiz/src/kwordquizprefs.cpp index 0f8a13c7..2844ce48 100644 --- a/kwordquiz/src/kwordquizprefs.cpp +++ b/kwordquiz/src/kwordquizprefs.cpp @@ -60,8 +60,8 @@ KWordQuizPrefs::KWordQuizPrefs(TQWidget *parent, const char *name, TDEConfigSke m_dlgSpecChar = 0L; - connect(m_prefCharacter->lstCharacters, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCharListSelectionChanged())); - connect(m_prefCharacter->btnCharacter, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectSpecChar())); + connect(m_prefCharacter->lstCharacters, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotCharListSelectionChanged())); + connect(m_prefCharacter->btnCharacter, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectSpecChar())); KWordQuizApp *win=(KWordQuizApp *) parent; int i=0; @@ -96,8 +96,8 @@ void KWordQuizPrefs::slotSelectSpecChar( ) if (m_dlgSpecChar == 0) { m_dlgSpecChar = new DlgSpecChar( this, "insert special char", f, c, true ); - connect(m_dlgSpecChar, TQT_SIGNAL(insertChar(TQChar)), this, TQT_SLOT(slotSpecChar(TQChar))); - connect(m_dlgSpecChar, TQT_SIGNAL(finished()), this, TQT_SLOT(slotDlgSpecCharClosed())); + connect(m_dlgSpecChar, TQ_SIGNAL(insertChar(TQChar)), this, TQ_SLOT(slotSpecChar(TQChar))); + connect(m_dlgSpecChar, TQ_SIGNAL(finished()), this, TQ_SLOT(slotDlgSpecCharClosed())); } m_dlgSpecChar->show(); } @@ -106,8 +106,8 @@ void KWordQuizPrefs::slotDlgSpecCharClosed() { if ( m_dlgSpecChar ) { - disconnect(m_dlgSpecChar, TQT_SIGNAL(insertChar(TQChar)), this, TQT_SLOT(slotSpecChar(TQChar))); - disconnect(m_dlgSpecChar, TQT_SIGNAL(finished()), this, TQT_SLOT(slotDlgSpecCharClosed())); + disconnect(m_dlgSpecChar, TQ_SIGNAL(insertChar(TQChar)), this, TQ_SLOT(slotSpecChar(TQChar))); + disconnect(m_dlgSpecChar, TQ_SIGNAL(finished()), this, TQ_SLOT(slotDlgSpecCharClosed())); m_dlgSpecChar->deleteLater(); m_dlgSpecChar = 0L; } diff --git a/kwordquiz/src/kwordquizview.cpp b/kwordquiz/src/kwordquizview.cpp index 6d875c87..b1b75b41 100644 --- a/kwordquiz/src/kwordquizview.cpp +++ b/kwordquiz/src/kwordquizview.cpp @@ -842,8 +842,8 @@ void KWordQuizView::doVocabSpecChar( ) if (dlgSpecChar==0) { dlgSpecChar = new DlgSpecChar( this, "insert special char", f, c, false ); - connect( dlgSpecChar, TQT_SIGNAL(insertChar(TQChar)), this, TQT_SLOT(slotSpecChar(TQChar))); - connect( dlgSpecChar, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDlgSpecCharClosed() ) ); + connect( dlgSpecChar, TQ_SIGNAL(insertChar(TQChar)), this, TQ_SLOT(slotSpecChar(TQChar))); + connect( dlgSpecChar, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDlgSpecCharClosed() ) ); } dlgSpecChar->show(); } @@ -852,8 +852,8 @@ void KWordQuizView::slotDlgSpecCharClosed( ) { if ( dlgSpecChar ) { - disconnect( dlgSpecChar, TQT_SIGNAL(insertChar(TQChar)), this, TQT_SLOT(slotSpecChar(TQChar))); - disconnect( dlgSpecChar, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDlgSpecCharClosed() ) ); + disconnect( dlgSpecChar, TQ_SIGNAL(insertChar(TQChar)), this, TQ_SLOT(slotSpecChar(TQChar))); + disconnect( dlgSpecChar, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDlgSpecCharClosed() ) ); dlgSpecChar->deleteLater(); dlgSpecChar = 0L; } diff --git a/libtdeedu/extdate/extdatepicker.cpp b/libtdeedu/extdate/extdatepicker.cpp index 48eeeae6..b8874d75 100644 --- a/libtdeedu/extdate/extdatepicker.cpp +++ b/libtdeedu/extdate/extdatepicker.cpp @@ -178,17 +178,17 @@ void ExtDatePicker::init( const ExtDate &dt ) monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow"))); monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow"))); } - connect(table, TQT_SIGNAL(dateChanged(const ExtDate&)), TQT_SLOT(dateChangedSlot(const ExtDate&))); - connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot())); - connect(monthForward, TQT_SIGNAL(clicked()), TQT_SLOT(monthForwardClicked())); - connect(monthBackward, TQT_SIGNAL(clicked()), TQT_SLOT(monthBackwardClicked())); - connect(yearForward, TQT_SIGNAL(clicked()), TQT_SLOT(yearForwardClicked())); - connect(yearBackward, TQT_SIGNAL(clicked()), TQT_SLOT(yearBackwardClicked())); - connect(d->selectWeek, TQT_SIGNAL(activated(int)), TQT_SLOT(weekSelected(int))); - connect(d->todayButton, TQT_SIGNAL(clicked()), TQT_SLOT(todayButtonClicked())); - connect(selectMonth, TQT_SIGNAL(clicked()), TQT_SLOT(selectMonthClicked())); - connect(selectYear, TQT_SIGNAL(toggled(bool)), TQT_SLOT(selectYearClicked())); - connect(line, TQT_SIGNAL(returnPressed()), TQT_SLOT(lineEnterPressed())); + connect(table, TQ_SIGNAL(dateChanged(const ExtDate&)), TQ_SLOT(dateChangedSlot(const ExtDate&))); + connect(table, TQ_SIGNAL(tableClicked()), TQ_SLOT(tableClickedSlot())); + connect(monthForward, TQ_SIGNAL(clicked()), TQ_SLOT(monthForwardClicked())); + connect(monthBackward, TQ_SIGNAL(clicked()), TQ_SLOT(monthBackwardClicked())); + connect(yearForward, TQ_SIGNAL(clicked()), TQ_SLOT(yearForwardClicked())); + connect(yearBackward, TQ_SIGNAL(clicked()), TQ_SLOT(yearBackwardClicked())); + connect(d->selectWeek, TQ_SIGNAL(activated(int)), TQ_SLOT(weekSelected(int))); + connect(d->todayButton, TQ_SIGNAL(clicked()), TQ_SLOT(todayButtonClicked())); + connect(selectMonth, TQ_SIGNAL(clicked()), TQ_SLOT(selectMonthClicked())); + connect(selectYear, TQ_SIGNAL(toggled(bool)), TQ_SLOT(selectYearClicked())); + connect(line, TQ_SIGNAL(returnPressed()), TQ_SLOT(lineEnterPressed())); table->setFocus(); @@ -388,7 +388,7 @@ ExtDatePicker::selectYearClicked() // ----- picker->resize(picker->sizeHint()); popup->setMainWidget(picker); - connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); + connect(picker, TQ_SIGNAL(closeMe(int)), popup, TQ_SLOT(close(int))); picker->setFocus(); if(popup->exec(selectYear->mapToGlobal(TQPoint(0, selectMonth->height())))) { @@ -511,8 +511,8 @@ ExtDatePicker::setCloseButton( bool enable ) d->navigationLayout->addWidget(d->closeButton); TQToolTip::add(d->closeButton, i18n("Close")); d->closeButton->setPixmap( SmallIcon("remove") ); - connect( d->closeButton, TQT_SIGNAL( clicked() ), - topLevelWidget(), TQT_SLOT( close() ) ); + connect( d->closeButton, TQ_SIGNAL( clicked() ), + topLevelWidget(), TQ_SLOT( close() ) ); } else { delete d->closeButton; diff --git a/libtdeedu/extdate/extdatetbl.cpp b/libtdeedu/extdate/extdatetbl.cpp index a4a8e244..662e8a7c 100644 --- a/libtdeedu/extdate/extdatetbl.cpp +++ b/libtdeedu/extdate/extdatetbl.cpp @@ -576,7 +576,7 @@ ExtDateInternalWeekSelector::ExtDateInternalWeekSelector setFont(font); setFrameStyle(TQFrame::NoFrame); setValidator(val); - connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(weekEnteredSlot())); + connect(this, TQ_SIGNAL(returnPressed()), TQ_SLOT(weekEnteredSlot())); } void @@ -826,7 +826,7 @@ ExtDateInternalYearSelector::ExtDateInternalYearSelector //there si also a year limit in ExtCalendarSystemGregorian... val->setRange(-50000, 50000); setValidator(val); - connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(yearEnteredSlot())); + connect(this, TQ_SIGNAL(returnPressed()), TQ_SLOT(yearEnteredSlot())); } ExtDateInternalYearSelector::~ExtDateInternalYearSelector() { diff --git a/libtdeedu/extdate/extdatetimeedit.cpp b/libtdeedu/extdate/extdatetimeedit.cpp index 1d67eae3..d9f19cd6 100644 --- a/libtdeedu/extdate/extdatetimeedit.cpp +++ b/libtdeedu/extdate/extdatetimeedit.cpp @@ -830,10 +830,10 @@ void ExtDateEdit::init() d->ed = new ExtDateTimeEditor( this, "date editor" ); d->controls->setEditWidget( d->ed ); setFocusProxy( d->ed ); - connect( d->controls, TQT_SIGNAL( stepUpPressed() ), TQT_SLOT( stepUp() ) ); - connect( d->controls, TQT_SIGNAL( stepDownPressed() ), TQT_SLOT( stepDown() ) ); - connect( this, TQT_SIGNAL( valueChanged(const ExtDate&) ), - TQT_SLOT( updateButtons() ) ); + connect( d->controls, TQ_SIGNAL( stepUpPressed() ), TQ_SLOT( stepUp() ) ); + connect( d->controls, TQ_SIGNAL( stepDownPressed() ), TQ_SLOT( stepDown() ) ); + connect( this, TQ_SIGNAL( valueChanged(const ExtDate&) ), + TQ_SLOT( updateButtons() ) ); d->ed->appendSection( TQNumberSection( 0,4 ) ); d->ed->appendSection( TQNumberSection( 5,7 ) ); d->ed->appendSection( TQNumberSection( 8,10 ) ); @@ -1740,8 +1740,8 @@ public: // d->controls = new ExtDateTimeSpinWidget( this, qstrcmp( name(), "qt_datetime_timeedit" ) == 0 ? "qt_spin_widget" : "time edit controls" ); // d->controls->setEditWidget( d->ed ); // setFocusProxy( d->ed ); -// connect( d->controls, TQT_SIGNAL( stepUpPressed() ), TQT_SLOT( stepUp() ) ); -// connect( d->controls, TQT_SIGNAL( stepDownPressed() ), TQT_SLOT( stepDown() ) ); +// connect( d->controls, TQ_SIGNAL( stepUpPressed() ), TQ_SLOT( stepUp() ) ); +// connect( d->controls, TQ_SIGNAL( stepDownPressed() ), TQ_SLOT( stepDown() ) ); // // d->ed->appendSection( TQNumberSection( 0,0, TRUE, 0 ) ); // d->ed->appendSection( TQNumberSection( 0,0, TRUE, 1 ) ); @@ -2610,10 +2610,10 @@ void ExtDateTimeEdit::init() de = new ExtDateEdit( this, "qt_datetime_dateedit" ); te = new TQTimeEdit( this, "qt_datetime_timeedit" ); d->adv = FALSE; - connect( de, TQT_SIGNAL( valueChanged( const ExtDate& ) ), - this, TQT_SLOT( newValue( const ExtDate& ) ) ); - connect( te, TQT_SIGNAL( valueChanged( const TQTime& ) ), - this, TQT_SLOT( newValue( const TQTime& ) ) ); + connect( de, TQ_SIGNAL( valueChanged( const ExtDate& ) ), + this, TQ_SLOT( newValue( const ExtDate& ) ) ); + connect( te, TQ_SIGNAL( valueChanged( const TQTime& ) ), + this, TQ_SLOT( newValue( const TQTime& ) ) ); setFocusProxy( de ); setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); } diff --git a/libtdeedu/extdate/extdatewidget.cpp b/libtdeedu/extdate/extdatewidget.cpp index 5d790bf4..87252215 100644 --- a/libtdeedu/extdate/extdatewidget.cpp +++ b/libtdeedu/extdate/extdatewidget.cpp @@ -89,9 +89,9 @@ ExtDateWidget::ExtDateWidget( const ExtDate &date, TQWidget *parent, // d->m_year = new ExtDateWidgetSpinBox(d->calendar->minValidYear(), // d->calendar->maxValidYear(), this); // -// connect(d->m_day, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); -// connect(d->m_month, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDateChanged())); -// connect(d->m_year, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); +// connect(d->m_day, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged())); +// connect(d->m_month, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDateChanged())); +// connect(d->m_year, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged())); // } void ExtDateWidget::init(const ExtDate& date) @@ -113,9 +113,9 @@ void ExtDateWidget::init(const ExtDate& date) d->m_year = new ExtDateWidgetSpinBox(d->calendar->minValidYear(), d->calendar->maxValidYear(), this); - connect(d->m_day, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); - connect(d->m_month, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDateChanged())); - connect(d->m_year, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); + connect(d->m_day, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged())); + connect(d->m_month, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDateChanged())); + connect(d->m_year, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged())); } ExtDateWidget::~ExtDateWidget() diff --git a/libtdeedu/extdate/main.cpp b/libtdeedu/extdate/main.cpp index 53e8d92f..585668c6 100644 --- a/libtdeedu/extdate/main.cpp +++ b/libtdeedu/extdate/main.cpp @@ -25,6 +25,6 @@ int main( int argc, char *argv[] ) TDEApplication a; TestWidget *t = new TestWidget(0,0); t->show(); - TQObject::connect(kapp, TQT_SIGNAL(lastWindowClosed()), kapp, TQT_SLOT(quit())); + TQObject::connect(kapp, TQ_SIGNAL(lastWindowClosed()), kapp, TQ_SLOT(quit())); return a.exec(); } diff --git a/libtdeedu/extdate/testwidget.cpp b/libtdeedu/extdate/testwidget.cpp index a6912ef4..81965cc1 100644 --- a/libtdeedu/extdate/testwidget.cpp +++ b/libtdeedu/extdate/testwidget.cpp @@ -53,8 +53,8 @@ TestWidget::TestWidget( TQWidget *p, const char *name ) : TDEMainWindow( p, name setCentralWidget(w); - connect( kdp, TQT_SIGNAL( dateChanged(TQDate) ), this, TQT_SLOT( slotKDateChanged(TQDate) ) ); - connect( edp, TQT_SIGNAL( dateChanged(const ExtDate&) ), this, TQT_SLOT( slotExtDateChanged(const ExtDate&) ) ); + connect( kdp, TQ_SIGNAL( dateChanged(TQDate) ), this, TQ_SLOT( slotKDateChanged(TQDate) ) ); + connect( edp, TQ_SIGNAL( dateChanged(const ExtDate&) ), this, TQ_SLOT( slotExtDateChanged(const ExtDate&) ) ); } void TestWidget::slotKDateChanged(TQDate d) { diff --git a/libtdeedu/tdeeduui/tdeeduglossary.cpp b/libtdeedu/tdeeduui/tdeeduglossary.cpp index 50443f2f..5bb50343 100644 --- a/libtdeedu/tdeeduui/tdeeduglossary.cpp +++ b/libtdeedu/tdeeduui/tdeeduglossary.cpp @@ -203,9 +203,9 @@ GlossaryDialog::GlossaryDialog( bool folded, TQWidget *parent, const char *name) m_htmlpart = new TDEHTMLPart( vs, "html-part" ); - connect( m_htmlpart->browserExtension(), TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), this, TQT_SLOT( displayItem( const KURL &, const KParts::URLArgs & ) ) ); - connect( m_glosstree, TQT_SIGNAL(clicked( TQListViewItem * )), this, TQT_SLOT(slotClicked( TQListViewItem * ))); - connect( clear, TQT_SIGNAL(clicked()), m_search, TQT_SLOT(clear())); + connect( m_htmlpart->browserExtension(), TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), this, TQ_SLOT( displayItem( const KURL &, const KParts::URLArgs & ) ) ); + connect( m_glosstree, TQ_SIGNAL(clicked( TQListViewItem * )), this, TQ_SLOT(slotClicked( TQListViewItem * ))); + connect( clear, TQ_SIGNAL(clicked()), m_search, TQ_SLOT(clear())); resize( 600, 400 ); } |