diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-20 22:30:18 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-21 09:40:01 +0900 |
commit | 5446eb7150897a6fb453a7246d7d09ddd8d2bc69 (patch) | |
tree | 256ab63f945cfa34856ae619951a8eb7773918ee /kstars | |
parent | 63af14c32527b3449e31cd9d01c38b5074177378 (diff) | |
download | tdeedu-5446eb7150897a6fb453a7246d7d09ddd8d2bc69.tar.gz tdeedu-5446eb7150897a6fb453a7246d7d09ddd8d2bc69.zip |
Replace various '#define' strings - part 6
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit cf40f006901966bdf86163dbe5d1c7cb55f099ec)
Diffstat (limited to 'kstars')
-rw-r--r-- | kstars/kstars/fitsviewer.cpp | 34 | ||||
-rw-r--r-- | kstars/kstars/focusdialog.cpp | 2 | ||||
-rw-r--r-- | kstars/kstars/fovdialog.cpp | 2 | ||||
-rw-r--r-- | kstars/kstars/imageviewer.cpp | 6 | ||||
-rw-r--r-- | kstars/kstars/kstarsactions.cpp | 14 | ||||
-rw-r--r-- | kstars/kstars/kstarsinit.cpp | 110 | ||||
-rw-r--r-- | kstars/kstars/tools/scriptbuilder.cpp | 2 |
7 files changed, 85 insertions, 85 deletions
diff --git a/kstars/kstars/fitsviewer.cpp b/kstars/kstars/fitsviewer.cpp index b054c940..0289a430 100644 --- a/kstars/kstars/fitsviewer.cpp +++ b/kstars/kstars/fitsviewer.cpp @@ -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" ), TQT_TQOBJECT(this), TQT_SLOT( imageReduction()), actionCollection(), "image_reduce"); + new TDEAction( i18n("Image Reduction"), tempFile.name(), TDEShortcut( "Ctrl+R" ), this, TQT_SLOT( imageReduction()), actionCollection(), "image_reduce"); tempFile.close(); } else - new TDEAction( i18n("Image Reduction"), "blend", TDEShortcut( "Ctrl+R" ), TQT_TQOBJECT(this), TQT_SLOT( imageReduction()), actionCollection(), "image_reduce"); + new TDEAction( i18n("Image Reduction"), "blend", TDEShortcut( "Ctrl+R" ), this, TQT_SLOT( imageReduction()), actionCollection(), "image_reduce"); /*if (KSUtils::openDataFile( tempFile, "bricon.png" ) ) { - new TDEAction( i18n("Brightness/Contrast"), tempFile.name(), TDEShortcut( "Ctrl+T" ), TQT_TQOBJECT(this), TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); + new TDEAction( i18n("Brightness/Contrast"), tempFile.name(), TDEShortcut( "Ctrl+T" ), this, TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); tempFile.close(); } else*/ - new TDEAction( i18n("Brightness/Contrast"), "contrast+", TDEShortcut( "Ctrl+T" ), TQT_TQOBJECT(this), TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); + new TDEAction( i18n("Brightness/Contrast"), "contrast+", TDEShortcut( "Ctrl+T" ), this, TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); if (KSUtils::openDataFile( tempFile, "histogram.png" ) ) { - new TDEAction ( i18n("Histogram"), tempFile.name(), TDEShortcut("Ctrl+H"), TQT_TQOBJECT(this), TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram"); + new TDEAction ( i18n("Histogram"), tempFile.name(), TDEShortcut("Ctrl+H"), this, TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram"); tempFile.close(); } else - new TDEAction ( i18n("Histogram"), "wizard", TDEShortcut("Ctrl+H"), TQT_TQOBJECT(this), TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram"); + new TDEAction ( i18n("Histogram"), "wizard", TDEShortcut("Ctrl+H"), this, TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram"); - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection()); - KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection()); - KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(fitsCOPY()), actionCollection()); - KStdAction::zoomIn(TQT_TQOBJECT(image), TQT_SLOT(fitsZoomIn()), actionCollection()); - KStdAction::zoomOut(TQT_TQOBJECT(image), TQT_SLOT(fitsZoomOut()), actionCollection()); + 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()); new TDEAction( i18n( "&Default Zoom" ), "viewmagfit.png", TDEShortcut( "Ctrl+D" ), - TQT_TQOBJECT(image), TQT_SLOT(fitsZoomDefault()), actionCollection(), "zoom_default" ); - new TDEAction( i18n( "Statistics"), "sum", 0, TQT_TQOBJECT(this), TQT_SLOT(fitsStatistics()), actionCollection(), "image_stats"); - new TDEAction( i18n( "FITS Header"), "frame_spreadsheet.png", 0, TQT_TQOBJECT(this), TQT_SLOT(fitsHeader()), actionCollection(), "fits_editor"); + 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"); /* Create GUI */ createGUI("fitsviewer.rc"); @@ -557,7 +557,7 @@ void FITSViewer::fileSave() if (TQFile::exists(currentURL.path())) { - int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), + int r=KMessageBox::warningContinueCancel(static_cast<TQWidget*>(parent()), i18n( "A file named \"%1\" already exists. " "Overwrite it?" ).arg(currentURL.fileName()), i18n( "Overwrite File?" ), diff --git a/kstars/kstars/focusdialog.cpp b/kstars/kstars/focusdialog.cpp index 997550ee..fcd468eb 100644 --- a/kstars/kstars/focusdialog.cpp +++ b/kstars/kstars/focusdialog.cpp @@ -42,7 +42,7 @@ FocusDialog::FocusDialog( TQWidget *parent ) setMainWidget(page); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, spacingHint() ); fdlg = new FocusDialogDlg(page); - fdlg->epochName->setValidator( new KDoubleValidator( TQT_TQOBJECT(fdlg->epochName) ) ); + fdlg->epochName->setValidator( new KDoubleValidator( fdlg->epochName ) ); vlay->addWidget( fdlg ); connect( fdlg->raBox, TQT_SIGNAL(textChanged( const TQString & ) ), this, TQT_SLOT( checkLineEdits() ) ); diff --git a/kstars/kstars/fovdialog.cpp b/kstars/kstars/fovdialog.cpp index 19194474..de6afaba 100644 --- a/kstars/kstars/fovdialog.cpp +++ b/kstars/kstars/fovdialog.cpp @@ -42,7 +42,7 @@ FOVDialog::FOVDialog( TQWidget *parent ) : KDialogBase( KDialogBase::Plain, i18n( "Set FOV Indicator" ), Ok|Cancel, Ok, parent ) { - ks = (KStars*)TQT_TQWIDGET(parent); + ks = (KStars*)parent; TQFrame *page = plainPage(); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 ); diff --git a/kstars/kstars/imageviewer.cpp b/kstars/kstars/imageviewer.cpp index 7e31d3cc..265d8021 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, TQT_TQOBJECT(this), TQT_SLOT (close()), actionCollection()); + TDEAction *action = new TDEAction (i18n ("Close Window"), "window-close", CTRL+Key_Q, this, TQT_SLOT (close()), actionCollection()); action->plug (toolBar()); - action = new TDEAction (i18n ("Save Image"), "document-save", CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT (saveFileToDisc()), actionCollection()); + action = new TDEAction (i18n ("Save Image"), "document-save", CTRL+Key_S, this, TQT_SLOT (saveFileToDisc()), actionCollection()); action->plug (toolBar()); statusBar()->insertItem( capText, 0, 1, true ); @@ -208,7 +208,7 @@ void ImageViewer::saveFileToDisc() TQFile f (newURL.directory() + "/" + newURL.fileName()); if (f.exists()) { - int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), + int r=KMessageBox::warningContinueCancel(static_cast<TQWidget*>(parent()), i18n( "A file named \"%1\" already exists. " "Overwrite it?" ).arg(newURL.fileName()), i18n( "Overwrite File?" ), diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp index 900f586e..5ab8daeb 100644 --- a/kstars/kstars/kstarsactions.cpp +++ b/kstars/kstars/kstarsactions.cpp @@ -198,7 +198,7 @@ void KStars::slotWUT() { //FIXME GLOSSARY // void KStars::slotGlossary(){ -// GlossaryDialog *dlg = new GlossaryDialog( true, TQT_TQOBJECT(this), "glossary" ); +// GlossaryDialog *dlg = new GlossaryDialog( true, this, "glossary" ); // TQString glossaryfile =data()->stdDirs->findResource( "data", "kstars/glossary.xml" ); // KURL u = glossaryfile; // Glossary *g = Glossary::readFromXML( u ); @@ -356,8 +356,8 @@ void KStars::slotViewOps() { TDEConfigDialog* dialog = new TDEConfigDialog( this, "settings", Options::self() ); - connect( dialog, TQT_SIGNAL( applyClicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotApplySettings() ) ); - connect( dialog, TQT_SIGNAL( okClicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotApplySettings() ) ); + connect( dialog, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApplySettings() ) ); + connect( dialog, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotApplySettings() ) ); OpsCatalog *opcatalog = new OpsCatalog( this, "catalogs" ); OpsGuides *opguides = new OpsGuides( this, "guides" ); @@ -450,7 +450,7 @@ void KStars::slotExportImage() { //Warn user if file exists! if (TQFile::exists(fileURL.path())) { - int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), + int r=KMessageBox::warningContinueCancel(static_cast<TQWidget*>(parent()), i18n( "A file named \"%1\" already exists. " "Overwrite it?" ).arg(fileURL.fileName()), i18n( "Overwrite File?" ), @@ -873,7 +873,7 @@ void KStars::slotFOVEdit() { if ( fields.count() == 4 ) { TQString nm = fields[0].stripWhiteSpace(); - TDEToggleAction *kta = new TDEToggleAction( nm, 0, TQT_TQOBJECT(this), TQT_SLOT( slotTargetSymbol() ), + TDEToggleAction *kta = new TDEToggleAction( nm, 0, this, TQT_SLOT( slotTargetSymbol() ), actionCollection(), nm.utf8() ); kta->setExclusiveGroup( "fovsymbol" ); fovActionMenu->insert( kta ); @@ -884,7 +884,7 @@ void KStars::slotFOVEdit() { } fovActionMenu->popupMenu()->insertSeparator(); - fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, TQT_TQOBJECT(this), + fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, this, TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); //set FOV to whatever was highlighted in FOV dialog @@ -1020,7 +1020,7 @@ void KStars::slotShowGUIItem( bool show ) { void KStars::addColorMenuItem( TQString name, TQString actionName ) { colorActionMenu->insert( new TDEAction( name, 0, - TQT_TQOBJECT(this), TQT_SLOT( slotColorScheme() ), actionCollection(), actionName.local8Bit() ) ); + this, TQT_SLOT( slotColorScheme() ), actionCollection(), actionName.local8Bit() ) ); } void KStars::removeColorMenuItem( TQString actionName ) { diff --git a/kstars/kstars/kstarsinit.cpp b/kstars/kstars/kstarsinit.cpp index 71ff520b..b4890a43 100644 --- a/kstars/kstars/kstarsinit.cpp +++ b/kstars/kstars/kstarsinit.cpp @@ -49,27 +49,27 @@ void KStars::initActions() { //File Menu: new TDEAction(i18n("&New Window"), "window-new", TDEShortcut( "Ctrl+N" ), - TQT_TQOBJECT(this), TQT_SLOT( newWindow() ), actionCollection(), "new_window"); + this, TQT_SLOT( newWindow() ), actionCollection(), "new_window"); new TDEAction(i18n("&Close Window"), "window-close", TDEShortcut( "Ctrl+W" ), - TQT_TQOBJECT(this), TQT_SLOT( closeWindow() ), actionCollection(), "close_window"); + this, TQT_SLOT( closeWindow() ), actionCollection(), "close_window"); new TDEAction( i18n( "&Download Data..." ), "knewstuff", TDEShortcut( "Ctrl+D" ), - TQT_TQOBJECT(this), TQT_SLOT( slotDownload() ), actionCollection(), "get_data" ); - new TDEAction( i18n( "Open FITS..."), "document-open", TDEShortcut( "Ctrl+O"), TQT_TQOBJECT(this), TQT_SLOT( slotOpenFITS()), actionCollection(), "open_file"); + this, TQT_SLOT( slotDownload() ), actionCollection(), "get_data" ); + new TDEAction( i18n( "Open FITS..."), "document-open", TDEShortcut( "Ctrl+O"), this, TQT_SLOT( slotOpenFITS()), actionCollection(), "open_file"); new TDEAction( i18n( "&Save Sky Image..." ), "fileexport", TDEShortcut( "Ctrl+I" ), - TQT_TQOBJECT(this), TQT_SLOT( slotExportImage() ), actionCollection(), "export_image" ); + this, TQT_SLOT( slotExportImage() ), actionCollection(), "export_image" ); new TDEAction( i18n( "&Run Script..." ), "launch", TDEShortcut( "Ctrl+R" ), - TQT_TQOBJECT(this), TQT_SLOT( slotRunScript() ), actionCollection(), "run_script" ); - KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), actionCollection(), "print" ); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit" ); + this, TQT_SLOT( slotRunScript() ), actionCollection(), "run_script" ); + KStdAction::print(this, TQT_SLOT( slotPrint() ), actionCollection(), "print" ); + KStdAction::quit(this, TQT_SLOT( close() ), actionCollection(), "quit" ); //Time Menu: new TDEAction( i18n( "Set Time to &Now" ), TDEShortcut( "Ctrl+E" ), - TQT_TQOBJECT(this), TQT_SLOT( slotSetTimeToNow() ), actionCollection(), "time_to_now" ); + this, TQT_SLOT( slotSetTimeToNow() ), actionCollection(), "time_to_now" ); new TDEAction( i18n( "set Clock to New Time", "&Set Time..." ), "clock", TDEShortcut( "Ctrl+S" ), - TQT_TQOBJECT(this), TQT_SLOT( slotSetTime() ), actionCollection(), "time_dialog" ); + this, TQT_SLOT( slotSetTime() ), actionCollection(), "time_dialog" ); ToggleAction *actTimeRun = new ToggleAction( i18n( "Stop &Clock" ), BarIcon("media-playback-pause"), i18n("Start &Clock"), BarIcon("1rightarrow"), - 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleTimer() ), actionCollection(), "timer_control" ); + 0, this, TQT_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()) ); @@ -79,36 +79,36 @@ void KStars::initActions() { //Focus Menu: new TDEAction(i18n( "&Zenith" ), TDEShortcut( "Z" ), - TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "zenith"); + this, TQT_SLOT( slotPointFocus() ), actionCollection(), "zenith"); new TDEAction(i18n( "&North" ), TDEShortcut( "N" ), - TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "north"); + this, TQT_SLOT( slotPointFocus() ), actionCollection(), "north"); new TDEAction(i18n( "&East" ), TDEShortcut( "E" ), - TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "east"); + this, TQT_SLOT( slotPointFocus() ), actionCollection(), "east"); new TDEAction(i18n( "&South" ), TDEShortcut( "S" ), - TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "south"); + this, TQT_SLOT( slotPointFocus() ), actionCollection(), "south"); new TDEAction(i18n( "&West" ), TDEShortcut( "W" ), - TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "west"); - TDEAction *tmpAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotFind() ), + this, TQT_SLOT( slotPointFocus() ), actionCollection(), "west"); + TDEAction *tmpAction = KStdAction::find( this, TQT_SLOT( slotFind() ), actionCollection(), "find_object" ); tmpAction->setText( i18n( "&Find Object..." ) ); tmpAction->setToolTip( i18n( "Find object" ) ); new TDEAction( i18n( "Engage &Tracking" ), "decrypted", TDEShortcut( "Ctrl+T" ), - TQT_TQOBJECT(this), TQT_SLOT( slotTrack() ), actionCollection(), "track_object" ); + this, TQT_SLOT( slotTrack() ), actionCollection(), "track_object" ); new TDEAction( i18n( "Set Focus &Manually..." ), TDEShortcut( "Ctrl+M" ), - TQT_TQOBJECT(this), TQT_SLOT( slotManualFocus() ), actionCollection(), "manual_focus" ); + this, TQT_SLOT( slotManualFocus() ), actionCollection(), "manual_focus" ); //View Menu: - KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT( slotZoomIn() ), actionCollection(), "zoom_in" ); - KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT( slotZoomOut() ), actionCollection(), "zoom_out" ); + KStdAction::zoomIn(this, TQT_SLOT( slotZoomIn() ), actionCollection(), "zoom_in" ); + KStdAction::zoomOut(this, TQT_SLOT( slotZoomOut() ), actionCollection(), "zoom_out" ); new TDEAction( i18n( "&Default Zoom" ), "viewmagfit.png", TDEShortcut( "Ctrl+Z" ), - TQT_TQOBJECT(this), TQT_SLOT( slotDefaultZoom() ), actionCollection(), "zoom_default" ); + this, TQT_SLOT( slotDefaultZoom() ), actionCollection(), "zoom_default" ); new TDEAction( i18n( "&Zoom to Angular Size..." ), "viewmag.png", TDEShortcut( "Ctrl+Shift+Z" ), - TQT_TQOBJECT(this), TQT_SLOT( slotSetZoom() ), actionCollection(), "zoom_set" ); + this, TQT_SLOT( slotSetZoom() ), actionCollection(), "zoom_set" ); actCoordSys = new ToggleAction( i18n("Horizontal &Coordinates"), i18n( "Equatorial &Coordinates" ), - Key_Space, TQT_TQOBJECT(this), TQT_SLOT( slotCoordSys() ), actionCollection(), "coordsys" ); - KStdAction::fullScreen( TQT_TQOBJECT(this), TQT_SLOT( slotFullScreen() ), actionCollection(), 0 ); + Key_Space, this, TQT_SLOT( slotCoordSys() ), actionCollection(), "coordsys" ); + KStdAction::fullScreen( this, TQT_SLOT( slotFullScreen() ), actionCollection(), 0 ); //Settings Menu: @@ -191,62 +191,62 @@ void KStars::initActions() { initFOV(); new TDEAction( i18n( "Location on Earth", "&Geographic..." ), - "kstars_geo", TDEShortcut( "Ctrl+G" ), TQT_TQOBJECT(this), + "kstars_geo", TDEShortcut( "Ctrl+G" ), this, TQT_SLOT( slotGeoLocator() ), actionCollection(), "geolocation" ); - KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotViewOps() ), actionCollection(), "configure" ); + KStdAction::preferences( this, TQT_SLOT( slotViewOps() ), actionCollection(), "configure" ); new TDEAction(i18n( "Startup Wizard..." ), "wizard", TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( slotWizard() ), actionCollection(), "startwizard" ); + this, TQT_SLOT( slotWizard() ), actionCollection(), "startwizard" ); //Tools Menu: new TDEAction(i18n( "Calculator..."), TDEShortcut( "Ctrl+C"), - TQT_TQOBJECT(this), TQT_SLOT( slotCalculator() ), actionCollection(), "astrocalculator"); + this, TQT_SLOT( slotCalculator() ), actionCollection(), "astrocalculator"); new TDEAction(i18n( "Observing List..."), TDEShortcut( "Ctrl+L"), - TQT_TQOBJECT(this), TQT_SLOT( slotObsList() ), actionCollection(), "obslist"); + this, TQT_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"), - TQT_TQOBJECT(this), TQT_SLOT( slotLCGenerator() ), actionCollection(), "lightcurvegenerator"); + this, TQT_SLOT( slotLCGenerator() ), actionCollection(), "lightcurvegenerator"); new TDEAction(i18n( "Altitude vs. Time..."), TDEShortcut( "Ctrl+A"), - TQT_TQOBJECT(this), TQT_SLOT( slotAVT() ), actionCollection(), "altitude_vs_time"); + this, TQT_SLOT( slotAVT() ), actionCollection(), "altitude_vs_time"); new TDEAction(i18n( "What's up Tonight..."), TDEShortcut("Ctrl+U"), - TQT_TQOBJECT(this), TQT_SLOT(slotWUT()), actionCollection(), "whats_up_tonight"); + this, TQT_SLOT(slotWUT()), actionCollection(), "whats_up_tonight"); //FIXME GLOSSARY // new TDEAction(i18n( "Glossary..."), TDEShortcut("Ctrl+K"), // this, TQT_SLOT(slotGlossary()), actionCollection(), "glossary"); new TDEAction(i18n( "Script Builder..."), TDEShortcut("Ctrl+B"), - TQT_TQOBJECT(this), TQT_SLOT(slotScriptBuilder()), actionCollection(), "scriptbuilder"); + this, TQT_SLOT(slotScriptBuilder()), actionCollection(), "scriptbuilder"); new TDEAction(i18n( "Solar System..."), TDEShortcut("Ctrl+Y"), - TQT_TQOBJECT(this), TQT_SLOT(slotSolarSystem()), actionCollection(), "solarsystem"); + this, TQT_SLOT(slotSolarSystem()), actionCollection(), "solarsystem"); new TDEAction(i18n( "Jupiter's Moons..."), TDEShortcut("Ctrl+J"), - TQT_TQOBJECT(this), TQT_SLOT(slotJMoonTool()), actionCollection(), "jmoontool"); + this, TQT_SLOT(slotJMoonTool()), actionCollection(), "jmoontool"); // devices Menu - new TDEAction(i18n("Telescope Wizard..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTelescopeWizard()), actionCollection(), "telescope_wizard"); - new TDEAction(i18n("Telescope Properties..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTelescopeProperties()), actionCollection(), "telescope_properties"); - new TDEAction(i18n("Device Manager..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIDriver()), actionCollection(), "device_manager"); + 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"); - tmpAction = new TDEAction(i18n("Capture Image Sequence..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImageSequence()), actionCollection(), "capture_sequence"); + tmpAction = new TDEAction(i18n("Capture Image Sequence..."), 0, this, TQT_SLOT(slotImageSequence()), actionCollection(), "capture_sequence"); tmpAction->setEnabled(false); - tmpAction = new TDEAction(i18n("INDI Control Panel..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIPanel()), actionCollection(), "indi_control_panel"); + tmpAction = new TDEAction(i18n("INDI Control Panel..."), 0, this, TQT_SLOT(slotINDIPanel()), actionCollection(), "indi_control_panel"); tmpAction->setEnabled(false); - new TDEAction(i18n("Configure INDI..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIConf()), actionCollection(), "configure_indi"); + new TDEAction(i18n("Configure INDI..."), 0, this, TQT_SLOT(slotINDIConf()), actionCollection(), "configure_indi"); //Help Menu: new TDEAction( i18n( "Tip of the Day" ), "idea", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotTipOfDay() ), actionCollection(), "help_tipofday" ); + this, TQT_SLOT( slotTipOfDay() ), actionCollection(), "help_tipofday" ); //Handbook toolBar item: new TDEAction( i18n( "&Handbook" ), "contents", TDEShortcut( "F1" ), - TQT_TQOBJECT(this), TQT_SLOT( appHelpActivated() ), actionCollection(), "handbook" ); + this, TQT_SLOT( appHelpActivated() ), actionCollection(), "handbook" ); // //viewToolBar actions: @@ -254,39 +254,39 @@ void KStars::initActions() { //show_stars: a = new TDEToggleAction( i18n( "Toggle Stars" ), "kstars_stars", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_stars" ); + 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_stars" ); //show_deepsky: a = new TDEToggleAction( i18n( "Toggle Deep Sky Objects" ), "kstars_deepsky", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_deepsky" ); + 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_deepsky" ); //show_planets: a = new TDEToggleAction( i18n( "Toggle Solar System" ), "kstars_planets", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_planets" ); + 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_planets" ); //show_clines: a = new TDEToggleAction( i18n( "Toggle Constellation Lines" ), "kstars_clines", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_clines" ); + 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_clines" ); //show_cnames: a = new TDEToggleAction( i18n( "Toggle Constellation Names" ), "kstars_cnames", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cnames" ); + 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cnames" ); //show_cbound: a = new TDEToggleAction( i18n( "Toggle Constellation Boundaries" ), "kstars_cbound", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cbounds" ); + 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cbounds" ); //show_mw: a = new TDEToggleAction( i18n( "Toggle Milky Way" ), "kstars_mw", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_mw" ); + 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_mw" ); //show_grid: a = new TDEToggleAction( i18n( "Toggle Coordinate Grid" ), "kstars_grid", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_grid" ); + 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_grid" ); //show_horizon: a = new TDEToggleAction( i18n( "Toggle Ground" ), "kstars_horizon", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_horizon" ); + 0, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( slotTargetSymbol() ), + TDEToggleAction *kta = new TDEToggleAction( nm, 0, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); + fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, this, TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); } void KStars::initStatusBar() { diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp index ebdd377a..edb36217 100644 --- a/kstars/kstars/tools/scriptbuilder.cpp +++ b/kstars/kstars/tools/scriptbuilder.cpp @@ -803,7 +803,7 @@ void ScriptBuilder::slotSave() { //Warn user if file exists if (TQFile::exists(currentFileURL.path())) { - int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), + int r=KMessageBox::warningContinueCancel(static_cast<TQWidget*>(parent()), i18n( "A file named \"%1\" already exists. " "Overwrite it?" ).arg(currentFileURL.fileName()), i18n( "Overwrite File?" ), |