diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:30:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:30:46 -0600 |
| commit | 999f961ff5278b84c8ffd8a91addb9343e589cf0 (patch) | |
| tree | ed392c698357e3037e6d9f5f40a33797b72e6129 /kstars | |
| parent | 2d7b541a4e0095d40e37aaefbf9c4a9b9d149302 (diff) | |
| download | tdeedu-999f961ff5278b84c8ffd8a91addb9343e589cf0.tar.gz tdeedu-999f961ff5278b84c8ffd8a91addb9343e589cf0.zip | |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'kstars')
151 files changed, 800 insertions, 800 deletions
diff --git a/kstars/kstars/addcatdialog.cpp b/kstars/kstars/addcatdialog.cpp index 86c2b6dd..22c35355 100644 --- a/kstars/kstars/addcatdialog.cpp +++ b/kstars/kstars/addcatdialog.cpp @@ -106,7 +106,7 @@ void AddCatDialog::slotHelp() { * Position angle: floating-point value (position angle, in degrees) */ bool AddCatDialog::validateDataFile() { - KStars *ksw = (KStars*) tqtopLevelWidget()->parent(); + KStars *ksw = (KStars*) topLevelWidget()->parent(); //Create the catalog file contents: first the header CatalogContents = writeCatalogHeader(); diff --git a/kstars/kstars/addcatdialogui.ui b/kstars/kstars/addcatdialogui.ui index 30abaeb3..daa0ea0a 100644 --- a/kstars/kstars/addcatdialogui.ui +++ b/kstars/kstars/addcatdialogui.ui @@ -234,7 +234,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -308,7 +308,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kstars/kstars/addlinkdialogui.ui b/kstars/kstars/addlinkdialogui.ui index 89092759..290b2e35 100644 --- a/kstars/kstars/addlinkdialogui.ui +++ b/kstars/kstars/addlinkdialogui.ui @@ -86,7 +86,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>450</width> <height>0</height> @@ -113,7 +113,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/ccdpreviewui.ui b/kstars/kstars/ccdpreviewui.ui index 4f4399f9..43a349d0 100644 --- a/kstars/kstars/ccdpreviewui.ui +++ b/kstars/kstars/ccdpreviewui.ui @@ -31,13 +31,13 @@ <property name="name"> <cstring>playB</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -57,13 +57,13 @@ <property name="name"> <cstring>captureB</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -97,7 +97,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>300</width> <height>21</height> @@ -118,7 +118,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>160</width> <height>120</height> @@ -351,7 +351,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> diff --git a/kstars/kstars/conbridlg.cpp b/kstars/kstars/conbridlg.cpp index 4b57b431..ec9aa240 100644 --- a/kstars/kstars/conbridlg.cpp +++ b/kstars/kstars/conbridlg.cpp @@ -231,7 +231,7 @@ void ContrastBrightnessDlg::setBrightness(int brightnessValue) } -TQSize ContrastBrightnessDlg::tqsizeHint() const +TQSize ContrastBrightnessDlg::sizeHint() const { return TQSize(400,130); } diff --git a/kstars/kstars/conbridlg.h b/kstars/kstars/conbridlg.h index 1f9ce088..fb914b16 100644 --- a/kstars/kstars/conbridlg.h +++ b/kstars/kstars/conbridlg.h @@ -34,7 +34,7 @@ class ContrastBrightnessDlg : public KDialogBase { ContrastBrightnessDlg(TQWidget *parent=0); ~ContrastBrightnessDlg(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void range(int min, int max, int & num); void range(float min, float max, float & num); diff --git a/kstars/kstars/details_data.ui b/kstars/kstars/details_data.ui index e665d099..a5d9a9ba 100644 --- a/kstars/kstars/details_data.ui +++ b/kstars/kstars/details_data.ui @@ -180,7 +180,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>20</height> @@ -199,7 +199,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -235,7 +235,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>77</width> <height>20</height> @@ -449,7 +449,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>8</height> @@ -481,7 +481,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -532,7 +532,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -557,7 +557,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>8</height> diff --git a/kstars/kstars/details_links.ui b/kstars/kstars/details_links.ui index 352d4b5b..758a82d7 100644 --- a/kstars/kstars/details_links.ui +++ b/kstars/kstars/details_links.ui @@ -66,7 +66,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kstars/kstars/details_position.ui b/kstars/kstars/details_position.ui index 940b16a2..439ce387 100644 --- a/kstars/kstars/details_position.ui +++ b/kstars/kstars/details_position.ui @@ -194,7 +194,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>16</height> @@ -321,7 +321,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -405,7 +405,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>170</width> <height>20</height> @@ -487,7 +487,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -718,7 +718,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>83</width> <height>20</height> @@ -894,7 +894,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/kstars/kstars/devicemanager.cpp b/kstars/kstars/devicemanager.cpp index a83cd5cc..bb6bf287 100644 --- a/kstars/kstars/devicemanager.cpp +++ b/kstars/kstars/devicemanager.cpp @@ -155,7 +155,7 @@ void DeviceManager::dataReceived() sNotifier->disconnect(); close(serverFD); parent->removeDeviceMgr(mgrID); - KMessageBox::error(0, TQString::tqfromLatin1(errmsg)); + KMessageBox::error(0, TQString::fromLatin1(errmsg)); return; } @@ -397,7 +397,7 @@ void DeviceManager::doMsg (XMLEle *msg, INDI_D *dp) if (timestamp) txt_w->insert(TQString(valuXMLAtt(timestamp)) + TQString(" ")); else - txt_w->insert( KStarsDateTime::tqcurrentDateTime().toString("yyyy/mm/dd - h:m:s ap ")); + txt_w->insert( KStarsDateTime::currentDateTime().toString("yyyy/mm/dd - h:m:s ap ")); /* finally! the msg */ message = findXMLAtt(msg, "message"); diff --git a/kstars/kstars/devmanager.ui b/kstars/kstars/devmanager.ui index 4a7b5be8..56a0029a 100644 --- a/kstars/kstars/devmanager.ui +++ b/kstars/kstars/devmanager.ui @@ -51,7 +51,7 @@ </column> <column> <property name="text"> - <string>tqStatus</string> + <string>Status</string> </property> <property name="clickable"> <bool>true</bool> @@ -104,7 +104,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>125</height> @@ -126,7 +126,7 @@ <property name="name"> <cstring>serverLogText</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>90</height> @@ -216,7 +216,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -241,7 +241,7 @@ <widget class="KListView"> <column> <property name="text"> - <string>tqStatus</string> + <string>Status</string> </property> <property name="clickable"> <bool>true</bool> @@ -366,7 +366,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -396,7 +396,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>289</width> <height>20</height> diff --git a/kstars/kstars/finddialog.cpp b/kstars/kstars/finddialog.cpp index c1aa5321..84dfe5c0 100644 --- a/kstars/kstars/finddialog.cpp +++ b/kstars/kstars/finddialog.cpp @@ -48,7 +48,7 @@ FindDialog::FindDialog( TQWidget* parent ) : SearchBox = new TQLineEdit( page, "SearchBox" ); filterTypeLabel = new TQLabel( page, "filterTypeLabel" ); - filterTypeLabel->tqsetAlignment( AlignRight ); + filterTypeLabel->setAlignment( AlignRight ); filterTypeLabel->setText( i18n( "Filter by type: " ) ); filterType = new TQComboBox( page, "filterType" ); diff --git a/kstars/kstars/fitsheaderdialog.ui b/kstars/kstars/fitsheaderdialog.ui index d00c90ee..7903b000 100644 --- a/kstars/kstars/fitsheaderdialog.ui +++ b/kstars/kstars/fitsheaderdialog.ui @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>300</width> <height>20</height> diff --git a/kstars/kstars/focusdialog.cpp b/kstars/kstars/focusdialog.cpp index 7b182225..8da163c2 100644 --- a/kstars/kstars/focusdialog.cpp +++ b/kstars/kstars/focusdialog.cpp @@ -152,7 +152,7 @@ long double FocusDialog::epochToJd (double epoch) { } -TQSize FocusDialog::tqsizeHint() const +TQSize FocusDialog::sizeHint() const { return TQSize(240,210); } diff --git a/kstars/kstars/focusdialog.h b/kstars/kstars/focusdialog.h index 20bf2428..e6707028 100644 --- a/kstars/kstars/focusdialog.h +++ b/kstars/kstars/focusdialog.h @@ -47,7 +47,7 @@ public: SkyPoint* point() const { return Point; } /**@return suggested size of focus window. */ - TQSize tqsizeHint() const; + TQSize sizeHint() const; /**@return whether user set the AltAz coords */ bool usedAltAz() const { return UsedAltAz; } diff --git a/kstars/kstars/focusdialogdlg.ui b/kstars/kstars/focusdialogdlg.ui index 4484e1be..12149e0c 100644 --- a/kstars/kstars/focusdialogdlg.ui +++ b/kstars/kstars/focusdialogdlg.ui @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -155,7 +155,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kstars/kstars/fovdialogui.ui b/kstars/kstars/fovdialogui.ui index 31df9717..e75a1986 100644 --- a/kstars/kstars/fovdialogui.ui +++ b/kstars/kstars/fovdialogui.ui @@ -23,7 +23,7 @@ <property name="name"> <cstring>FOVListBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>160</width> <height>0</height> @@ -68,7 +68,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -113,7 +113,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -132,7 +132,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>80</height> @@ -169,7 +169,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> diff --git a/kstars/kstars/histdialog.ui b/kstars/kstars/histdialog.ui index 2711b215..c01043bc 100644 --- a/kstars/kstars/histdialog.ui +++ b/kstars/kstars/histdialog.ui @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>640</width> <height>325</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>640</width> <height>325</height> @@ -70,13 +70,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>500</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>500</width> <height>150</height> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>130</width> <height>20</height> @@ -240,7 +240,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>270</width> <height>20</height> diff --git a/kstars/kstars/imagereductionui.ui b/kstars/kstars/imagereductionui.ui index 6fd1a362..faa1e7ef 100644 --- a/kstars/kstars/imagereductionui.ui +++ b/kstars/kstars/imagereductionui.ui @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>20</height> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>20</height> @@ -354,7 +354,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -441,7 +441,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>20</height> @@ -522,7 +522,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -551,7 +551,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>210</width> <height>20</height> diff --git a/kstars/kstars/imagesequence.cpp b/kstars/kstars/imagesequence.cpp index 73026e99..d33617bc 100644 --- a/kstars/kstars/imagesequence.cpp +++ b/kstars/kstars/imagesequence.cpp @@ -79,7 +79,7 @@ imagesequence::~imagesequence() { } -bool imagesequence::updatetqStatus() +bool imagesequence::updateStatus() { bool result; diff --git a/kstars/kstars/imagesequence.h b/kstars/kstars/imagesequence.h index 304b9ad3..d04bf0a0 100644 --- a/kstars/kstars/imagesequence.h +++ b/kstars/kstars/imagesequence.h @@ -28,7 +28,7 @@ public: ~imagesequence(); -bool updatetqStatus(); +bool updateStatus(); private: KStars *ksw; diff --git a/kstars/kstars/imgsequencedlgui.ui b/kstars/kstars/imgsequencedlgui.ui index 14bb6a94..a3f57deb 100644 --- a/kstars/kstars/imgsequencedlgui.ui +++ b/kstars/kstars/imgsequencedlgui.ui @@ -64,7 +64,7 @@ <property name="name"> <cstring>currentImgCountOUT</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> @@ -89,7 +89,7 @@ <property name="name"> <cstring>fullImgCountOUT</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -168,7 +168,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>270</width> <height>20</height> @@ -460,7 +460,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>81</height> diff --git a/kstars/kstars/indi/apmount.cpp b/kstars/kstars/indi/apmount.cpp index a9857df3..4edae7c4 100644 --- a/kstars/kstars/indi/apmount.cpp +++ b/kstars/kstars/indi/apmount.cpp @@ -729,7 +729,7 @@ void APMount::ISNewSwitch (const char *dev, const char *name, ISState *states, c IUUpdateSwitches(&AlignmentSP, states, names, n); index = getOnSwitch(&AlignmentSP); - if ( ( err = tqsetAlignmentMode(index) < 0) ) + if ( ( err = setAlignmentMode(index) < 0) ) { handleError(&AlignmentSP, err, "Setting tqalignment"); return; diff --git a/kstars/kstars/indi/apogee/ApnCamera.cpp b/kstars/kstars/indi/apogee/ApnCamera.cpp index 431fe392..946c444c 100644 --- a/kstars/kstars/indi/apogee/ApnCamera.cpp +++ b/kstars/kstars/indi/apogee/ApnCamera.cpp @@ -45,7 +45,7 @@ bool CApnCamera::Expose( double Duration, bool Light ) unsigned short TotalVPixels; - while ( read_ImagingtqStatus() != Apn_Status_Flushing ) + while ( read_ImagingStatus() != Apn_Status_Flushing ) { Sleep( 20 ); } @@ -296,7 +296,7 @@ unsigned short CApnCamera::GetExposurePixelsV() double CApnCamera::read_InputVoltage() { - UpdateGeneraltqStatus(); + UpdateGeneralStatus(); return m_pvtInputVoltage; } @@ -329,7 +329,7 @@ unsigned short CApnCamera::read_FirmwareVersion() bool CApnCamera::read_ShutterState() { - UpdateGeneraltqStatus(); + UpdateGeneralStatus(); return m_pvtShutterState; } @@ -559,15 +559,15 @@ void CApnCamera::write_DataBits( Apn_Resolution BitResolution ) } } -Apn_tqStatus CApnCamera::read_ImagingtqStatus() +Apn_Status CApnCamera::read_ImagingStatus() { bool Exposing, Active, Done, Flushing, WaitOnTrigger; bool DataHalted, RamError; - UpdateGeneraltqStatus(); + UpdateGeneralStatus(); - // Update the ImagingtqStatus + // Update the ImagingStatus Exposing = false; Active = false; Done = false; @@ -599,42 +599,42 @@ Apn_tqStatus CApnCamera::read_ImagingtqStatus() if ( RamError ) { - m_pvtImagingtqStatus = Apn_Status_PatternError; + m_pvtImagingStatus = Apn_Status_PatternError; } else { if ( DataHalted ) { - m_pvtImagingtqStatus = Apn_Status_DataError; + m_pvtImagingStatus = Apn_Status_DataError; } else { if ( WaitOnTrigger ) { - m_pvtImagingtqStatus = Apn_Status_WaitingOnTrigger; + m_pvtImagingStatus = Apn_Status_WaitingOnTrigger; } else { if ( Done && m_pvtImageInProgress ) { m_pvtImageReady = true; - m_pvtImagingtqStatus = Apn_Status_ImageReady; + m_pvtImagingStatus = Apn_Status_ImageReady; } else { if ( Active ) { if ( Exposing ) - m_pvtImagingtqStatus = Apn_Status_Exposing; + m_pvtImagingStatus = Apn_Status_Exposing; else - m_pvtImagingtqStatus = Apn_Status_ImagingActive; + m_pvtImagingStatus = Apn_Status_ImagingActive; } else { if ( Flushing ) - m_pvtImagingtqStatus = Apn_Status_Flushing; + m_pvtImagingStatus = Apn_Status_Flushing; else - m_pvtImagingtqStatus = Apn_Status_Idle; + m_pvtImagingStatus = Apn_Status_Idle; } } } @@ -642,7 +642,7 @@ Apn_tqStatus CApnCamera::read_ImagingtqStatus() } /* - switch( m_pvtImagingtqStatus ) + switch( m_pvtImagingStatus ) { case Apn_Status_DataError: OutputDebugString( "ImagingStatus: Apn_Status_DataError" ); @@ -674,7 +674,7 @@ Apn_tqStatus CApnCamera::read_ImagingtqStatus() } */ - return m_pvtImagingtqStatus; + return m_pvtImagingStatus; } Apn_LedMode CApnCamera::read_LedMode() @@ -763,16 +763,16 @@ void CApnCamera::write_CoolerEnable( bool CoolerEnable ) m_pvtCoolerEnable = CoolerEnable; } -Apn_CoolertqStatus CApnCamera::read_CoolertqStatus() +Apn_CoolerStatus CApnCamera::read_CoolerStatus() { bool CoolerAtTemp; bool CoolerActive; bool CoolerTempRevised; - UpdateGeneraltqStatus(); + UpdateGeneralStatus(); - // Update CoolertqStatus + // Update CoolerStatus CoolerActive = false; CoolerAtTemp = false; CoolerTempRevised = false; @@ -789,25 +789,25 @@ Apn_CoolertqStatus CApnCamera::read_CoolertqStatus() // Now derive our cooler state if ( !CoolerActive ) { - m_pvtCoolertqStatus = Apn_CoolerStatus_Off; + m_pvtCoolerStatus = Apn_CoolerStatus_Off; } else { if ( CoolerTempRevised ) { - m_pvtCoolertqStatus = Apn_CoolerStatus_Revision; + m_pvtCoolerStatus = Apn_CoolerStatus_Revision; } else { if ( CoolerAtTemp ) - m_pvtCoolertqStatus = Apn_CoolerStatus_AtSetPoint; + m_pvtCoolerStatus = Apn_CoolerStatus_AtSetPoint; else - m_pvtCoolertqStatus = Apn_CoolerStatus_RampingToSetPoint; + m_pvtCoolerStatus = Apn_CoolerStatus_RampingToSetPoint; } } - return m_pvtCoolertqStatus; + return m_pvtCoolerStatus; } double CApnCamera::read_CoolerSetPoint() @@ -874,14 +874,14 @@ void CApnCamera::write_CoolerBackoffPoint( double BackoffPoint ) double CApnCamera::read_CoolerDrive() { - UpdateGeneraltqStatus(); + UpdateGeneralStatus(); return m_pvtCoolerDrive; } double CApnCamera::read_TempCCD() { - // UpdateGeneraltqStatus(); + // UpdateGeneralStatus(); unsigned short TempReg; unsigned short TempAvg; @@ -910,7 +910,7 @@ double CApnCamera::read_TempCCD() double CApnCamera::read_TempHeatsink() { - // UpdateGeneraltqStatus(); + // UpdateGeneralStatus(); unsigned short TempReg; unsigned short TempAvg; @@ -1782,8 +1782,8 @@ long CApnCamera::InitDefaults() Write( FPGA_REG_TEMP_RAMP_DOWN_A, m_ApnSensorInfo->m_TempRampRateOne ); Write( FPGA_REG_TEMP_RAMP_DOWN_B, m_ApnSensorInfo->m_TempRampRateTwo ); // the collor code not only determines the m_pvtCoolerEnable state, but - // also implicitly calls UpdateGeneraltqStatus() as part of read_CoolertqStatus() - if ( read_CoolertqStatus() == Apn_CoolerStatus_Off ) + // also implicitly calls UpdateGeneralStatus() as part of read_CoolerStatus() + if ( read_CoolerStatus() == Apn_CoolerStatus_Off ) m_pvtCoolerEnable = false; else m_pvtCoolerEnable = true; @@ -1827,7 +1827,7 @@ long CApnCamera::WriteTwelveBitOffset() return 0; } -void CApnCamera::UpdateGeneraltqStatus() +void CApnCamera::UpdateGeneralStatus() { unsigned short StatusReg; unsigned short HeatsinkTempReg; diff --git a/kstars/kstars/indi/apogee/ApnCamera.h b/kstars/kstars/indi/apogee/ApnCamera.h index 90f49ff2..b0e6af03 100644 --- a/kstars/kstars/indi/apogee/ApnCamera.h +++ b/kstars/kstars/indi/apogee/ApnCamera.h @@ -129,7 +129,7 @@ public: void write_DataBits( Apn_Resolution BitResolution ); - Apn_tqStatus read_ImagingtqStatus(); + Apn_Status read_ImagingStatus(); Apn_LedMode read_LedMode(); void write_LedMode( Apn_LedMode LedMode ); @@ -138,7 +138,7 @@ public: bool read_CoolerEnable(); void write_CoolerEnable( bool CoolerEnable ); - Apn_CoolertqStatus read_CoolertqStatus(); + Apn_CoolerStatus read_CoolerStatus(); double read_CoolerSetPoint(); void write_CoolerSetPoint( double SetPoint ); double read_CoolerBackoffPoint(); @@ -231,7 +231,7 @@ public: long InitTwelveBitAD(); long WriteTwelveBitOffset(); - void UpdateGeneraltqStatus(); + void UpdateGeneralStatus(); // Internal private variables bool m_ResetVerticalArrays; @@ -264,8 +264,8 @@ public: double m_pvtCoolerBackoffPoint; - Apn_CoolertqStatus m_pvtCoolertqStatus; - Apn_tqStatus m_pvtImagingtqStatus; + Apn_CoolerStatus m_pvtCoolerStatus; + Apn_Status m_pvtImagingStatus; bool m_pvtShutterState; bool m_pvtImageInProgress; bool m_pvtImageReady; diff --git a/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp b/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp index 095dcf0a..cce9ba37 100644 --- a/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp +++ b/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp @@ -16,14 +16,14 @@ bool CApnCamera::read_Present() { // OutputDebugString( "read_Present()" ); - USHORT AptqStatus; + USHORT ApStatus; USHORT DatumA; USHORT DatumB; char szMsg[80]; DatumA = 0x0; DatumB = 0x0; - AptqStatus = 0; + ApStatus = 0; Write( FPGA_REG_SCRATCH, 0x8086 ); Read( FPGA_REG_SCRATCH, DatumA ); diff --git a/kstars/kstars/indi/apogee/ApnCamera_NET.cpp b/kstars/kstars/indi/apogee/ApnCamera_NET.cpp index 9113ae8f..0f739121 100644 --- a/kstars/kstars/indi/apogee/ApnCamera_NET.cpp +++ b/kstars/kstars/indi/apogee/ApnCamera_NET.cpp @@ -92,7 +92,7 @@ bool CApnCamera::GetImageData( unsigned short *pImageBuffer, while ( !ImageReady() ) { Sleep( 50 ); - read_ImagingtqStatus(); + read_ImagingStatus(); } Width = m_pvtWidth; diff --git a/kstars/kstars/indi/apogee/ApnCamera_USB.cpp b/kstars/kstars/indi/apogee/ApnCamera_USB.cpp index 1661d028..a6bbad42 100644 --- a/kstars/kstars/indi/apogee/ApnCamera_USB.cpp +++ b/kstars/kstars/indi/apogee/ApnCamera_USB.cpp @@ -76,7 +76,7 @@ bool CApnCamera::GetImageData( unsigned short *pImageBuffer, while ( !ImageReady() ) { Sleep( 50 ); - read_ImagingtqStatus(); + read_ImagingStatus(); } Width = m_pvtWidth; @@ -161,7 +161,7 @@ long CApnCamera::PostStopExposure( bool DigitizeData ) while ( !ImageReady() ) { Sleep( 50 ); - read_ImagingtqStatus(); + read_ImagingStatus(); } pRequestData = new USHORT[m_pvtWidth*m_pvtHeight]; diff --git a/kstars/kstars/indi/apogee/Apogee.h b/kstars/kstars/indi/apogee/Apogee.h index 70c1c359..d97740b2 100644 --- a/kstars/kstars/indi/apogee/Apogee.h +++ b/kstars/kstars/indi/apogee/Apogee.h @@ -29,7 +29,7 @@ #define Apn_CameraMode_ExternalTrigger 3 #define Apn_CameraMode_ExternalShutter 4 -#define Apn_tqStatus int +#define Apn_Status int #define Apn_Status_DataError -2 #define Apn_Status_PatternError -1 #define Apn_Status_Idle 0 @@ -54,7 +54,7 @@ #define Apn_LedState_ExtStartReadout 6 #define Apn_LedState_AtTemp 7 -#define Apn_CoolertqStatus int +#define Apn_CoolerStatus int #define Apn_CoolerStatus_Off 0 #define Apn_CoolerStatus_RampingToSetPoint 1 #define Apn_CoolerStatus_AtSetPoint 2 @@ -67,7 +67,7 @@ #define Apn_FanMode_High 3 -#define Camera_tqStatus int +#define Camera_Status int #define Camera_Status_Idle 0 #define Camera_Status_Waiting 1 #define Camera_Status_Exposing 2 @@ -76,7 +76,7 @@ #define Camera_Status_ImageReady 5 #define Camera_Status_Flushing 6 -#define Camera_CoolertqStatus int +#define Camera_CoolerStatus int #define Camera_CoolerStatus_Off 0 #define Camera_CoolerStatus_RampingToSetPoint 1 #define Camera_CoolerStatus_Correcting 2 diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp index 0481ecfc..45c16e13 100644 --- a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp @@ -56,8 +56,8 @@ CCameraIO::CCameraIO() m_WaitingforLine = false; m_WaitingforTrigger = false; - m_tqStatus = Camera_Status_Idle; - m_CoolertqStatus = Camera_CoolerStatus_Off; + m_Status = Camera_Status_Idle; + m_CoolerStatus = Camera_CoolerStatus_Off; m_ExposureBinX = 0; m_ExposureBinY = 0; @@ -240,7 +240,7 @@ bool CCameraIO::FilterHome() // Check for strobe unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( val & RegBit_GotTrigger ) { // Cycle all the way around if it's on the first time @@ -268,13 +268,13 @@ bool CCameraIO::FilterHome() Sleep ( STEP_DELAY ); val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( val & RegBit_GotTrigger ) { Sleep ( 10 ); val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( val & RegBit_GotTrigger ) { // Restore normal priority @@ -502,12 +502,12 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize int i; unsigned short BIC = m_ExposureBIC + m_ExposureStartX; - // Update internal variables in case application did not poll read_tqStatus + // Update internal variables in case application did not poll read_Status m_WaitingforTrigger = false; m_WaitingforLine = false; if ( m_WaitingforImage ) - { // In case application did not poll read_tqStatus + { // In case application did not poll read_Status m_WaitingforImage = false; ///////////////////////////////////// @@ -516,7 +516,7 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_FrameDone ) != 0 ) break; if ( clock() > StopTime ) return false; // Timed out @@ -553,7 +553,7 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_LineDone ) != 0 ) break; // Line done if ( clock() > StopTime ) @@ -679,7 +679,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize ) int i; if ( m_WaitingforLine ) - { // In case application did not poll read_tqStatus + { // In case application did not poll read_Status m_WaitingforLine = false; ///////////////////////////////////// @@ -688,7 +688,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize ) while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_LineDone ) != 0 ) break; // Line done if ( clock() > StopTime ) @@ -763,10 +763,10 @@ bool CCameraIO::Snap( double Duration, bool Light, unsigned short* pImageData, s if ( m_WaitingforTrigger ) { - Camera_tqStatus stat; + Camera_Status stat; while ( true ) { // This will wait forever if no trigger happens - stat = read_tqStatus(); + stat = read_Status(); if ( stat == Camera_Status_Exposing ) break; Sleep( 220 ); // dont bog down the CPU while polling } @@ -778,7 +778,7 @@ bool CCameraIO::Snap( double Duration, bool Light, unsigned short* pImageData, s clock_t StopTime = clock() + long( ( 1.2 * Duration + m_Timeout ) * CLOCKS_PER_SEC ); while ( true ) { - Camera_tqStatus stat = read_tqStatus(); + Camera_Status stat = read_Status(); if ( stat == Camera_Status_ImageReady ) break; if ( clock() > StopTime ) return false; // Timed out, no image available @@ -791,43 +791,43 @@ bool CCameraIO::Snap( double Duration, bool Light, unsigned short* pImageData, s //////////////////////////////////////////////////////////// // Camera Settings -Camera_tqStatus CCameraIO::read_tqStatus() +Camera_Status CCameraIO::read_Status() { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( val & RegBit_Exposing ) //11.0 { ATLTRACE( "Exposing\r\n" ); m_WaitingforTrigger = false; - m_tqStatus = Camera_Status_Exposing; + m_Status = Camera_Status_Exposing; } else if ( m_WaitingforTrigger ) - m_tqStatus = Camera_Status_Waiting; + m_Status = Camera_Status_Waiting; else if ( m_WaitingforImage && ( val & RegBit_FrameDone ) ) //11.11 { ATLTRACE( "ImageReady\r\n" ); m_WaitingforImage = false; - m_tqStatus = Camera_Status_ImageReady; + m_Status = Camera_Status_ImageReady; } else if ( m_WaitingforLine && ( val & RegBit_LineDone ) ) //11.1 { ATLTRACE( "LineReady\r\n" ); m_WaitingforLine = false; - m_tqStatus = Camera_Status_LineReady; + m_Status = Camera_Status_LineReady; } else if ( m_WaitingforImage || m_WaitingforLine ) { ATLTRACE( "Flushing\r\n" ); - m_tqStatus = Camera_Status_Flushing; + m_Status = Camera_Status_Flushing; } else - m_tqStatus = Camera_Status_Idle; + m_Status = Camera_Status_Idle; - return m_tqStatus; + return m_Status; } bool CCameraIO::read_Present() @@ -839,13 +839,13 @@ bool CCameraIO::read_Present() bool FailedLoopback = false; unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( !( val & RegBit_LoopbackTest ) ) FailedLoopback = true; m_RegShadow[ Reg_BICCounter ] &= ~RegBit_LoopbackTest; // clear bit to 0 Write( Reg_BICCounter, m_RegShadow[ Reg_BICCounter ] ); - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( val & RegBit_LoopbackTest ) FailedLoopback = true; */ @@ -884,7 +884,7 @@ bool CCameraIO::read_Present() bool CCameraIO::read_Shutter() { unsigned short regval = 0; - Read( Reg_tqStatus, regval ); + Read( Reg_Status, regval ); if ( !( regval & RegBit_Exposing ) ) { // We are not exposing, but might have finnshed an exposure // and have not called GetImage yet, so update our internal variable @@ -917,7 +917,7 @@ void CCameraIO::write_ForceShutterOpen( bool val ) m_RegShadow[ Reg_Command ] &= ~RegBit_ShutterOverride; // clear bit to 0 unsigned short regval = 0; - Read( Reg_tqStatus, regval ); + Read( Reg_Status, regval ); if ( ( regval & RegBit_Exposing ) ) { // Shutter will remain open if a Light frame is being taken @@ -1076,7 +1076,7 @@ void CCameraIO::write_CoolerSetPoint( double val ) Write( Reg_TempSetPoint, m_RegShadow[ Reg_TempSetPoint ] ); } -Camera_CoolertqStatus CCameraIO::read_CoolertqStatus() +Camera_CoolerStatus CCameraIO::read_CoolerStatus() { unsigned short val = 0; Read( Reg_CommandReadback, val ); @@ -1084,34 +1084,34 @@ Camera_CoolertqStatus CCameraIO::read_CoolertqStatus() if ( val & RegBit_CoolerEnable ) //12.15 { unsigned short val2 = 0; - Read( Reg_tqStatus, val2 ); + Read( Reg_Status, val2 ); if ( val & RegBit_CoolerShutdown ) //12.8 { if ( val2 & RegBit_ShutdownComplete ) //11.6 - m_CoolertqStatus = Camera_CoolerStatus_AtAmbient; + m_CoolerStatus = Camera_CoolerStatus_AtAmbient; else - m_CoolertqStatus = Camera_CoolerStatus_RampingToAmbient; + m_CoolerStatus = Camera_CoolerStatus_RampingToAmbient; } else { if ( val2 & RegBit_TempAtMax ) //11.5 - m_CoolertqStatus = Camera_CoolerStatus_AtMax; + m_CoolerStatus = Camera_CoolerStatus_AtMax; else if ( val2 & RegBit_TempAtMin ) //11.4 - m_CoolertqStatus = Camera_CoolerStatus_AtMin; + m_CoolerStatus = Camera_CoolerStatus_AtMin; else if ( val2 & RegBit_TempAtSetPoint ) //11.7 - m_CoolertqStatus = Camera_CoolerStatus_AtSetPoint; + m_CoolerStatus = Camera_CoolerStatus_AtSetPoint; // Check against last known cooler status - else if ( m_CoolertqStatus == Camera_CoolerStatus_AtSetPoint ) - m_CoolertqStatus = Camera_CoolerStatus_Correcting; + else if ( m_CoolerStatus == Camera_CoolerStatus_AtSetPoint ) + m_CoolerStatus = Camera_CoolerStatus_Correcting; else - m_CoolertqStatus = Camera_CoolerStatus_RampingToSetPoint; + m_CoolerStatus = Camera_CoolerStatus_RampingToSetPoint; } } else - m_CoolertqStatus = Camera_CoolerStatus_Off; + m_CoolerStatus = Camera_CoolerStatus_Off; - return m_CoolertqStatus; + return m_CoolerStatus; } Camera_CoolerMode CCameraIO::read_CoolerMode() @@ -1319,7 +1319,7 @@ void CCameraIO::Flush( short Rows ) while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_FrameDone ) != 0 ) break; if ( clock() > StopTime ) break; // Timed out diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.h b/kstars/kstars/indi/apogee/CameraIO_Linux.h index e614aee1..e61ad838 100644 --- a/kstars/kstars/indi/apogee/CameraIO_Linux.h +++ b/kstars/kstars/indi/apogee/CameraIO_Linux.h @@ -104,8 +104,8 @@ const long Reg_TempData = 9; // Register 10 const unsigned short RegBitShift_TempData = 0; // Bit 0 const unsigned short RegBitMask_TempData = 0xFF; // 8 bits -const long RegISA_tqStatus = 0x006; // Register 11 in firmware -const long Reg_tqStatus = 10; // Register 11 +const long RegISA_Status = 0x006; // Register 11 in firmware +const long Reg_Status = 10; // Register 11 const unsigned short RegBit_Exposing = 0x1; // Bit 0 const unsigned short RegBit_LineDone = 0x2; // Bit 1 const unsigned short RegBit_CacheReadOK = 0x4; // Bit 2 @@ -139,7 +139,7 @@ const long RegPCI_BICCounter = 0x01C; // Register 8 in PCI fir const long RegPCI_BICCounterRead = 0x03C; const long RegPCI_ImageData = 0x000; // Register 9 in PCI firmware const long RegPCI_TempData = 0x004; // Register 10 in PCI firmware -const long RegPCI_tqStatus = 0x00C; // Register 11 in firmware +const long RegPCI_Status = 0x00C; // Register 11 in firmware const long RegPCI_CommandReadback = 0x010; // Register 12 in PCI firmware @@ -161,7 +161,7 @@ public: //////////////////////////////////////////////////////////// // Camera Settings - Camera_tqStatus read_tqStatus(); // Current camera state + Camera_Status read_Status(); // Current camera state // <0: error codes // 0: idle // 1: flushing @@ -223,7 +223,7 @@ public: double read_CoolerSetPoint(); // Returns/sets setpoint temperature in degrees void write_CoolerSetPoint( double val ); // Celcius. - Camera_CoolertqStatus read_CoolertqStatus(); // Returns current cooler status + Camera_CoolerStatus read_CoolerStatus(); // Returns current cooler status Camera_CoolerMode read_CoolerMode(); // Returns/sets current cooler operation mode. void write_CoolerMode( Camera_CoolerMode val ); @@ -300,7 +300,7 @@ public: // The Duration parameter is the exposure time in seconds. The Light parameter controls // the status of the shutter during the exposure, Light = True opens the shutter, Light - // = False closes the shutter. Returns immediately after invocation, poll the CameratqStatus + // = False closes the shutter. Returns immediately after invocation, poll the CameraStatus // property to determine the start time of a triggered exposure and the end of an exposure. bool Expose( double Duration, bool Light ); @@ -314,7 +314,7 @@ public: // Drift scan methods // Begins clocking and digitization of a single line of data begining with a vertical clock - // sequence and ending with a buffer full of line data. Poll the CameratqStatus property to + // sequence and ending with a buffer full of line data. Poll the CameraStatus property to // determine when the data is ready for download. bool DigitizeLine(); @@ -346,7 +346,7 @@ public: short m_FilterStepPos; // Current filter position in our internal array bool m_Shutter; // Last known shutter state - Camera_tqStatus m_tqStatus; // Last known camera status + Camera_Status m_Status; // Last known camera status Camera_Interface m_Interface; // String acronyms may be used in INI file. // 0 or ISA: Industry Standard Architecture bus @@ -356,7 +356,7 @@ public: Camera_SensorType m_SensorType; // 0 or CCD: Charge Coupled Device // 1 or CMOS: Complementary Metal-Oxide-Silicon - Camera_CoolertqStatus m_CoolertqStatus; // Last known cooler status. + Camera_CoolerStatus m_CoolerStatus; // Last known cooler status. unsigned int m_IRTQMask; // Set of IRQs masked on user request // 0: Off // 1: Ramping to set point // 2: Correcting diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp index bbff2080..16a6bb72 100644 --- a/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp @@ -145,8 +145,8 @@ long CCameraIO::Read( unsigned short reg, unsigned short& val ) case Reg_TempData: realreg = RegISA_TempData; break; - case Reg_tqStatus: - realreg = RegISA_tqStatus; + case Reg_Status: + realreg = RegISA_Status; break; case Reg_CommandReadback: realreg = RegISA_CommandReadback; @@ -212,7 +212,7 @@ long CCameraIO::ReadLine( long SkipPixels, long Pixels,unsigned short* pLineBuff while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done if ( clock() > StopTime ) return 1; // Timed out @@ -301,7 +301,7 @@ long CCameraIO::InternalReadLine( bool KeepData, long SkipC, long XEnd, unsigned while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done clock_t CurrentTime = clock(); diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp index 15c139dd..a83a594e 100644 --- a/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp @@ -199,8 +199,8 @@ long CCameraIO::Read( unsigned short reg, unsigned short& val ) case Reg_TempData: RegNumber = RegPCI_TempData; break; - case Reg_tqStatus: - RegNumber = RegPCI_tqStatus; + case Reg_Status: + RegNumber = RegPCI_Status; break; case Reg_CommandReadback: RegNumber = RegPCI_CommandReadback; @@ -266,7 +266,7 @@ long CCameraIO::ReadLine( long SkipPixels, long Pixels,unsigned short* pLineBuff while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done if ( clock() > StopTime ) return 1; // Timed out @@ -355,7 +355,7 @@ long CCameraIO::InternalReadLine( bool KeepData, long SkipC, long XEnd, unsigned while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done clock_t CurrentTime = clock(); diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp index bb143e55..7025d9ce 100644 --- a/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp @@ -147,8 +147,8 @@ long CCameraIO::Read( unsigned short reg, unsigned short& val ) case Reg_TempData: realreg = RegISA_TempData; break; - case Reg_tqStatus: - realreg = RegISA_tqStatus; + case Reg_Status: + realreg = RegISA_Status; break; case Reg_CommandReadback: realreg = RegISA_CommandReadback; @@ -216,7 +216,7 @@ long CCameraIO::ReadLine( long SkipPixels, long Pixels,unsigned short* pLineBuff while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done if ( clock() > StopTime ) return 1; // Timed out @@ -307,7 +307,7 @@ long CCameraIO::InternalReadLine( bool KeepData, long SkipC, long XEnd, unsigned while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done clock_t CurrentTime = clock(); diff --git a/kstars/kstars/indi/apogee/CameraIO_PCI.cpp b/kstars/kstars/indi/apogee/CameraIO_PCI.cpp index ba9ce96d..3e6cc43e 100644 --- a/kstars/kstars/indi/apogee/CameraIO_PCI.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_PCI.cpp @@ -65,8 +65,8 @@ long CCameraIO_PCI::Read(unsigned short reg, unsigned short& val) case Reg_TempData: RegNumber = RegPCI_TempData; break; - case Reg_tqStatus: - RegNumber = RegPCI_tqStatus; + case Reg_Status: + RegNumber = RegPCI_Status; break; case Reg_CommandReadback: RegNumber = RegPCI_CommandReadback; @@ -268,7 +268,7 @@ long CCameraIO_PCI::ReadLine( long SkipPixels, long Pixels, unsigned short* pLin while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done if ( clock() > StopTime ) return 1; // Timed out diff --git a/kstars/kstars/indi/apogee_ppi.cpp b/kstars/kstars/indi/apogee_ppi.cpp index e6edfbbb..38c909b2 100644 --- a/kstars/kstars/indi/apogee_ppi.cpp +++ b/kstars/kstars/indi/apogee_ppi.cpp @@ -393,7 +393,7 @@ void ApogeeCam::ISNewNumber (const char */*dev*/, const char *name, double value void ApogeeCam::ISPoll() { static int mtc=5; - int readtqStatus=0; + int readStatus=0; double ccdTemp; if (!isCCDConnected()) @@ -407,16 +407,16 @@ void ApogeeCam::ISPoll() case IPS_BUSY: - readtqStatus = cam->read_tqStatus(); - if (readtqStatus < 0) + readStatus = cam->read_Status(); + if (readStatus < 0) { - IDLog("Error in exposure! Read status: %d\n", readtqStatus); + IDLog("Error in exposure! Read status: %d\n", readStatus); ExposeTimeNP.s = IPS_ALERT; ExposeTimeN[0].value = 0; - IDSetNumber(&ExposeTimeNP, "Error in exposure procedure. Read states: %d", readtqStatus); + IDSetNumber(&ExposeTimeNP, "Error in exposure procedure. Read states: %d", readStatus); return; } - else if (readtqStatus == Camera_Status_ImageReady) + else if (readStatus == Camera_Status_ImageReady) { ExposeTimeN[0].value = 0; ExposeTimeNP.s = IPS_OK; diff --git a/kstars/kstars/indi/fli/libfli.c b/kstars/kstars/indi/fli/libfli.c index f089403c..701115b2 100644 --- a/kstars/kstars/indi/fli/libfli.c +++ b/kstars/kstars/indi/fli/libfli.c @@ -489,7 +489,7 @@ LIBFLIAPI FLIGetVisibleArea(flidev_t dev, long* ul_x, long* ul_y, @see FLIExposeFrame @see FLICancelExposure - @see FLIGetExposuretqStatus + @see FLIGetExposureStatus */ LIBFLIAPI FLISetExposureTime(flidev_t dev, long exptime) { @@ -626,7 +626,7 @@ LIBFLIAPI FLISetFrameType(flidev_t dev, fliframe_t frametype) @return Non-zero on failure. @see FLIExposeFrame - @see FLIGetExposuretqStatus + @see FLIGetExposureStatus @see FLISetExposureTime */ LIBFLIAPI FLICancelExposure(flidev_t dev) @@ -652,7 +652,7 @@ LIBFLIAPI FLICancelExposure(flidev_t dev) @see FLICancelExposure @see FLISetExposureTime */ -LIBFLIAPI FLIGetExposuretqStatus(flidev_t dev, long *timeleft) +LIBFLIAPI FLIGetExposureStatus(flidev_t dev, long *timeleft) { CHKDEVICE(dev); @@ -752,7 +752,7 @@ LIBFLIAPI FLIGrabRow(flidev_t dev, void *buff, size_t width) @see FLISetBitDepth @see FLIGrabFrame @see FLICancelExposure - @see FLIGetExposuretqStatus + @see FLIGetExposureStatus */ LIBFLIAPI FLIExposeFrame(flidev_t dev) { diff --git a/kstars/kstars/indi/fli/libfli.h b/kstars/kstars/indi/fli/libfli.h index ca6a7200..351a9e8e 100644 --- a/kstars/kstars/indi/fli/libfli.h +++ b/kstars/kstars/indi/fli/libfli.h @@ -176,7 +176,7 @@ LIBFLIAPI FLISetHBin(flidev_t dev, long hbin); LIBFLIAPI FLISetVBin(flidev_t dev, long vbin); LIBFLIAPI FLISetFrameType(flidev_t dev, fliframe_t frametype); LIBFLIAPI FLICancelExposure(flidev_t dev); -LIBFLIAPI FLIGetExposuretqStatus(flidev_t dev, long *timeleft); +LIBFLIAPI FLIGetExposureStatus(flidev_t dev, long *timeleft); LIBFLIAPI FLISetTemperature(flidev_t dev, double temperature); LIBFLIAPI FLIGetTemperature(flidev_t dev, double *temperature); LIBFLIAPI FLIGrabRow(flidev_t dev, void *buff, size_t width); diff --git a/kstars/kstars/indi/fli_ccd.c b/kstars/kstars/indi/fli_ccd.c index eaa356a1..70a1aceb 100644 --- a/kstars/kstars/indi/fli_ccd.c +++ b/kstars/kstars/indi/fli_ccd.c @@ -610,7 +610,7 @@ void ISPoll(void *p) break; case IPS_BUSY: - if ( (err = FLIGetExposuretqStatus(fli_dev, &timeleft))) + if ( (err = FLIGetExposureStatus(fli_dev, &timeleft))) { ExposeTimeNP.s = IPS_IDLE; ExposeTimeN[0].value = 0; diff --git a/kstars/kstars/indi/lx200_16.cpp b/kstars/kstars/indi/lx200_16.cpp index a376b0d9..fe37df18 100644 --- a/kstars/kstars/indi/lx200_16.cpp +++ b/kstars/kstars/indi/lx200_16.cpp @@ -304,7 +304,7 @@ void LX200_16::handleAltAzSlew() case IPS_BUSY: - if ( (err = getHomeSearchtqStatus(&searchResult)) < 0) + if ( (err = getHomeSearchStatus(&searchResult)) < 0) { handleError(&HomeSearchSw, err, "Home search"); return; diff --git a/kstars/kstars/indi/lx200driver.c b/kstars/kstars/indi/lx200driver.c index bd85ba88..45eef056 100644 --- a/kstars/kstars/indi/lx200driver.c +++ b/kstars/kstars/indi/lx200driver.c @@ -78,8 +78,8 @@ int getCalenderDate(char *date); int getSiteName(char *siteName, int siteNum); /* Get Number of Bars */ int getNumberOfBars(int *value); -/* Get Home Search tqStatus */ -int getHomeSearchtqStatus(int *status); +/* Get Home Search Status */ +int getHomeSearchStatus(int *status); /* Get OTA Temperature */ int getOTATemp(double * value); /* Get time format: 12 or 24 */ @@ -99,7 +99,7 @@ int setStandardProcedure(char * writeData); /* Set Slew Mode */ int setSlewMode(int slewMode); /* Set Alignment mode */ -int tqsetAlignmentMode(unsigned int alignMode); +int setAlignmentMode(unsigned int alignMode); /* Set Object RA */ int setObjectRA(double ra); /* set Object DEC */ @@ -203,7 +203,7 @@ int testTelescope() int testAP() { int i=0; - char tqcurrentDate[64]; + char currentDate[64]; fprintf(stderr, "Testing telescope's connection...\n"); @@ -211,7 +211,7 @@ int testAP() / We're going to request the calander date */ for (i=0; i < 2; i++) { - if (!getCalenderDate(tqcurrentDate)) + if (!getCalenderDate(currentDate)) return 0; usleep(50000); @@ -534,7 +534,7 @@ int getNumberOfBars(int *value) return 0; } -int getHomeSearchtqStatus(int *status) +int getHomeSearchStatus(int *status) { char tempString[16]; @@ -726,7 +726,7 @@ int setCommandXYZ(int x, int y, int z, const char *cmd) return (setStandardProcedure(tempString)); } -int tqsetAlignmentMode(unsigned int alignMode) +int setAlignmentMode(unsigned int alignMode) { fprintf(stderr , "Set tqalignment mode %d\n", alignMode); diff --git a/kstars/kstars/indi/lx200driver.h b/kstars/kstars/indi/lx200driver.h index 529dfa02..06b8017f 100644 --- a/kstars/kstars/indi/lx200driver.h +++ b/kstars/kstars/indi/lx200driver.h @@ -157,8 +157,8 @@ int getCalenderDate(char *date); int getSiteName(char *siteName, int siteNum); /* Get Number of Bars */ int getNumberOfBars(int *value); -/* Get Home Search tqStatus */ -int getHomeSearchtqStatus(int *status); +/* Get Home Search Status */ +int getHomeSearchStatus(int *status); /* Get OTA Temperature */ int getOTATemp(double * value); /* Get time format: 12 or 24 */ @@ -178,7 +178,7 @@ int setStandardProcedure(char * writeData); /* Set Slew Mode */ int setSlewMode(int slewMode); /* Set Alignment mode */ -int tqsetAlignmentMode(unsigned int alignMode); +int setAlignmentMode(unsigned int alignMode); /* Set Object RA */ int setObjectRA(double ra); /* set Object DEC */ diff --git a/kstars/kstars/indi/lx200generic.cpp b/kstars/kstars/indi/lx200generic.cpp index 3e6e398a..975641fd 100644 --- a/kstars/kstars/indi/lx200generic.cpp +++ b/kstars/kstars/indi/lx200generic.cpp @@ -907,7 +907,7 @@ void LX200Generic::ISNewSwitch (const char *dev, const char *name, ISState *stat IUUpdateSwitches(&AlignmentSw, states, names, n); index = getOnSwitch(&AlignmentSw); - if ( ( err = tqsetAlignmentMode(index) < 0) ) + if ( ( err = setAlignmentMode(index) < 0) ) { handleError(&AlignmentSw, err, "Setting tqalignment"); return; diff --git a/kstars/kstars/indi/lx200gps.cpp b/kstars/kstars/indi/lx200gps.cpp index 0bdb2efc..451a7269 100644 --- a/kstars/kstars/indi/lx200gps.cpp +++ b/kstars/kstars/indi/lx200gps.cpp @@ -139,7 +139,7 @@ void LX200GPS::ISNewNumber (const char *dev, const char *name, double values[], return; } - /* GPS tqStatus Update */ + /* GPS Status Update */ if (!strcmp(name,GPSStatusSw.name)) { if (checkPower(&GPSStatusSw)) diff --git a/kstars/kstars/indi/sbigccd.cpp b/kstars/kstars/indi/sbigccd.cpp index 9eef1a42..fb35cf59 100644 --- a/kstars/kstars/indi/sbigccd.cpp +++ b/kstars/kstars/indi/sbigccd.cpp @@ -326,7 +326,7 @@ void SBIGCam::ISStaticPoll(void *p) void SBIGCam::ISPoll() { static int mtc=5; - int readtqStatus=0; + int readStatus=0; double ccdTemp (0); switch (ExposeTimeNP.s) @@ -340,8 +340,8 @@ void SBIGCam::ISPoll() // JM: Here we check the status of the camera (whether it's still capturing an image or has finished that) // ISPoll is called once per second. e.g. below for how we do this for Apogee Cameras /* - readtqStatus = cam->read_tqStatus(); - if (readtqStatus < 0) + readStatus = cam->read_Status(); + if (readStatus < 0) { IDLog("Error in exposure!\n"); ExposeTimeNP.s = IPS_IDLE; @@ -349,7 +349,7 @@ void SBIGCam::ISPoll() IDSetNumber(&ExposeTimeNP, "Error in exposure procedure."); return; } - else if (readtqStatus == Camera_Status_ImageReady) + else if (readStatus == Camera_Status_ImageReady) { ExposeTimeN[0].value = 0; ExposeTimeNP.s = IPS_OK; diff --git a/kstars/kstars/indiconf.ui b/kstars/kstars/indiconf.ui index cd8917e4..afb72e3b 100644 --- a/kstars/kstars/indiconf.ui +++ b/kstars/kstars/indiconf.ui @@ -66,13 +66,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>28</width> <height>28</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>28</width> <height>28</height> @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -238,7 +238,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>200</width> <height>21</height> @@ -372,7 +372,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp index 5814989b..070e55dd 100644 --- a/kstars/kstars/indidriver.cpp +++ b/kstars/kstars/indidriver.cpp @@ -102,11 +102,11 @@ INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent ) TQObject::connect(clientListView, TQT_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(ClientprocessRightButton( TQListViewItem *, const TQPoint &, int ))); -TQObject::connect(ClientpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processHosttqStatus(int))); +TQObject::connect(ClientpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processHostStatus(int))); TQObject::connect(localListView, TQT_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(LocalprocessRightButton( TQListViewItem *, const TQPoint &, int ))); -TQObject::connect(LocalpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processDevicetqStatus(int))); +TQObject::connect(LocalpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processDeviceStatus(int))); TQObject::connect(ksw->getINDIMenu(), TQT_SIGNAL(driverDisconnected(int)), this, TQT_SLOT(shutdownHost(int))); @@ -183,22 +183,22 @@ void INDIDriver::LocalprocessRightButton( TQListViewItem *item, const TQPoint &p void INDIDriver::activateRunService() { - processDevicetqStatus(0); + processDeviceStatus(0); } void INDIDriver::activateStopService() { - processDevicetqStatus(1); + processDeviceStatus(1); } void INDIDriver::activateHostConnection() { - processHosttqStatus(0); + processHostStatus(0); } void INDIDriver::activateHostDisconnection() { - processHosttqStatus(1); + processHostStatus(1); } void INDIDriver::updateLocalButtons() @@ -244,7 +244,7 @@ for (uint i=0; i < ksw->data()->INDIHostsList.count(); i++) } -void INDIDriver::processDevicetqStatus(int id) +void INDIDriver::processDeviceStatus(int id) { if (localListView->selectedItem() == NULL) return; @@ -301,7 +301,7 @@ void INDIDriver::processDevicetqStatus(int id) } } -void INDIDriver::processHosttqStatus(int id) +void INDIDriver::processHostStatus(int id) { int mgrID; bool toConnect = (id == 0); diff --git a/kstars/kstars/indidriver.h b/kstars/kstars/indidriver.h index 9cddeb99..6994b775 100644 --- a/kstars/kstars/indidriver.h +++ b/kstars/kstars/indidriver.h @@ -132,8 +132,8 @@ public slots: void updateMenuActions(); void ClientprocessRightButton( TQListViewItem *, const TQPoint &, int ); void LocalprocessRightButton( TQListViewItem *, const TQPoint &, int ); - void processDevicetqStatus(int); - void processHosttqStatus(int); + void processDeviceStatus(int); + void processHostStatus(int); void addINDIHost(); void modifyINDIHost(); void removeINDIHost(); diff --git a/kstars/kstars/indielement.cpp b/kstars/kstars/indielement.cpp index ed1834c0..1a20771f 100644 --- a/kstars/kstars/indielement.cpp +++ b/kstars/kstars/indielement.cpp @@ -110,7 +110,7 @@ label_w->setMaximumWidth(ELEMENT_LABEL_WIDTH); label_w->setFrameShape( KSqueezedTextLabel::Box ); label_w->setPaletteBackgroundColor( TQColor( 224, 232, 238 ) ); label_w->setTextFormat( TQLabel::RichText ); -label_w->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) ); +label_w->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) ); if (label.length() > MAX_LABEL_LENGTH) { @@ -295,9 +295,9 @@ connect(slider_w, TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(sliderChanged(int //kdDebug() << "For element " << label << " we have step of " << step << endl; if (length == ELEMENT_FULL_WIDTH) - spin_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) ); + spin_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) ); else - spin_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) ); + spin_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) ); spin_w->setMinimumWidth( (int) (length * 0.45) ); slider_w->setMinimumWidth( (int) (length * 0.55) ); @@ -359,7 +359,7 @@ void INDI_E::setMax (double inMax) void INDI_E::setupElementWrite(int length) { write_w = new KLineEdit( pp->pg->propertyContainer); - write_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, write_w->sizePolicy().hasHeightForWidth() )); + write_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, write_w->sizePolicy().hasHeightForWidth() )); write_w->setMinimumWidth( length ); write_w->setMaximumWidth( length); @@ -377,7 +377,7 @@ void INDI_E::setupElementRead(int length) read_w->setFrameShape( KLineEdit::GroupBoxPanel ); read_w->setFrameShadow( KLineEdit::Plain ); read_w->setCursorPosition( 0 ); - read_w->tqsetAlignment( int( KLineEdit::AlignHCenter ) ); + read_w->setAlignment( int( KLineEdit::AlignHCenter ) ); read_w->setReadOnly( TRUE ); read_w->setText(text); @@ -388,7 +388,7 @@ void INDI_E::setupElementRead(int length) void INDI_E::setupBrowseButton() { browse_w = new KPushButton("...", pp->pg->propertyContainer); - browse_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, browse_w->sizePolicy().hasHeightForWidth() ) ); + browse_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, browse_w->sizePolicy().hasHeightForWidth() ) ); browse_w->setMinimumWidth( MIN_SET_WIDTH ); browse_w->setMaximumWidth( MAX_SET_WIDTH ); diff --git a/kstars/kstars/indihostconf.ui b/kstars/kstars/indihostconf.ui index e91f64bf..91ad8cf5 100644 --- a/kstars/kstars/indihostconf.ui +++ b/kstars/kstars/indihostconf.ui @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>35</height> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kstars/kstars/indimenu.cpp b/kstars/kstars/indimenu.cpp index fb5b4c73..44f7bdea 100644 --- a/kstars/kstars/indimenu.cpp +++ b/kstars/kstars/indimenu.cpp @@ -82,7 +82,7 @@ INDIMenu::~INDIMenu() ** Traverse the drivers list, check for updated drivers and take ** appropriate action *********************************************************************/ -void INDIMenu::updatetqStatus() +void INDIMenu::updateStatus() { INDIDriver *drivers = ksw->getINDIDriver(); diff --git a/kstars/kstars/indimenu.h b/kstars/kstars/indimenu.h index 7ed8986d..abb2cfe9 100644 --- a/kstars/kstars/indimenu.h +++ b/kstars/kstars/indimenu.h @@ -67,7 +67,7 @@ class INDIMenu : public KDialogBase TQPtrList<DeviceManager> mgr; - void updatetqStatus(); + void updateStatus(); //bool removeDevice(TQString devName); void removeDeviceMgr(int mgrID); void setCustomLabel(TQString deviceName); diff --git a/kstars/kstars/indiproperty.cpp b/kstars/kstars/indiproperty.cpp index 9c2fd658..b37756f2 100644 --- a/kstars/kstars/indiproperty.cpp +++ b/kstars/kstars/indiproperty.cpp @@ -438,12 +438,12 @@ void INDI_P::addGUI (XMLEle *root) else label_w = new TQLabel(label, pg->propertyContainer); - label_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, label_w->sizePolicy().hasHeightForWidth() ) ); + label_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, label_w->sizePolicy().hasHeightForWidth() ) ); label_w->setFrameShape( TQLabel::GroupBoxPanel ); label_w->setMinimumWidth(PROPERTY_LABEL_WIDTH); label_w->setMaximumWidth(PROPERTY_LABEL_WIDTH); label_w->setTextFormat( TQLabel::RichText ); - label_w->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignHCenter) ); + label_w->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignHCenter) ); PHBox->addWidget(label_w); @@ -600,7 +600,7 @@ int INDI_P::buildNumberGUI (XMLEle *root, char errmsg[]) void INDI_P::setupSetButton(TQString caption) { set_w = new TQPushButton(caption, pg->propertyContainer); - set_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, set_w->sizePolicy().hasHeightForWidth() ) ); + set_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, set_w->sizePolicy().hasHeightForWidth() ) ); set_w->setMinimumWidth( MIN_SET_WIDTH ); set_w->setMaximumWidth( MAX_SET_WIDTH ); diff --git a/kstars/kstars/ksnewstuff.cpp b/kstars/kstars/ksnewstuff.cpp index 7539ddc4..3c14c73f 100644 --- a/kstars/kstars/ksnewstuff.cpp +++ b/kstars/kstars/ksnewstuff.cpp @@ -62,7 +62,7 @@ bool KSNewStuff::install( const TQString &fileName ) archiveDir->copyTo(destDir); archive.close(); - kapp->tqprocessEvents(10000); + kapp->processEvents(10000); //read the new data into the program //this return might be the result of checking if everything is installed ok @@ -87,7 +87,7 @@ void KSNewStuff::updateData( const TQString &path ) { prog.setMinimumDuration( 0 /*millisec*/ ); prog.progressBar()->setTotalSteps( 0 ); //show generic progress activity prog.show(); - kapp->tqprocessEvents(1000); + kapp->processEvents(1000); //First, remove the existing NGC/IC objects from the ObjectNameList. for ( DeepSkyObject *o = ks->data()->deepSkyList.first(); o; o = ks->data()->deepSkyList.next() ) { @@ -166,7 +166,7 @@ void KSNewStuff::updateData( const TQString &path ) { ks->setCursor(TQCursor(TQt::ArrowCursor)); } -void KSNewStuff::slotProcessEvents() { kapp->tqprocessEvents( 500 ); } +void KSNewStuff::slotProcessEvents() { kapp->processEvents( 500 ); } #include "ksnewstuff.moc" diff --git a/kstars/kstars/kspopupmenu.cpp b/kstars/kstars/kspopupmenu.cpp index 33282ab0..6f10b09b 100644 --- a/kstars/kstars/kspopupmenu.cpp +++ b/kstars/kstars/kspopupmenu.cpp @@ -237,7 +237,7 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr if ( s1 == i18n( "star" ) || s1 == i18n( "Empty sky" ) ) showLabel = false; pmTitle = new TQLabel( s1, this ); - pmTitle->tqsetAlignment( AlignCenter ); + pmTitle->setAlignment( AlignCenter ); TQPalette pal( pmTitle->palette() ); pal.setColor( TQPalette::Normal, TQColorGroup::Background, pal.color( TQPalette::Normal, TQColorGroup::Base ) ); pal.setColor( TQPalette::Normal, TQColorGroup::Foreground, pal.color( TQPalette::Normal, TQColorGroup::Text ) ); @@ -246,38 +246,38 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr if ( ! s2.isEmpty() ) { pmTitle2 = new TQLabel( s2, this ); - pmTitle2->tqsetAlignment( AlignCenter ); + pmTitle2->setAlignment( AlignCenter ); pmTitle2->setPalette( pal ); insertItem( pmTitle2 ); } if ( ! s3.isEmpty() ) { pmType = new TQLabel( s3, this ); - pmType->tqsetAlignment( AlignCenter ); + pmType->setAlignment( AlignCenter ); pmType->setPalette( pal ); insertItem( pmType ); } TQString c = obj->constellation( ksw->data()->csegmentList, ksw->data()->cnameList ); pmConstellation = new TQLabel( c, this ); - pmConstellation->tqsetAlignment( AlignCenter ); + pmConstellation->setAlignment( AlignCenter ); pmConstellation->setPalette( pal ); insertItem( pmConstellation ); //Insert Rise/Set/Transit labels if ( showRiseSet && obj ) { pmRiseTime = new TQLabel( i18n( "Rise time: 00:00" ), this ); - pmRiseTime->tqsetAlignment( AlignCenter ); + pmRiseTime->setAlignment( AlignCenter ); pmRiseTime->setPalette( pal ); TQFont rsFont = pmRiseTime->font(); rsFont.setPointSize( rsFont.pointSize() - 2 ); pmRiseTime->setFont( rsFont ); pmSetTime = new TQLabel( i18n( "the time at which an object falls below the horizon", "Set time:" ) + " 00:00", this ); - pmSetTime->tqsetAlignment( AlignCenter ); + pmSetTime->setAlignment( AlignCenter ); pmSetTime->setPalette( pal ); pmSetTime->setFont( rsFont ); pmTransitTime = new TQLabel( i18n( "Transit time: 00:00" ), this ); - pmTransitTime->tqsetAlignment( AlignCenter ); + pmTransitTime->setAlignment( AlignCenter ); pmTransitTime->setPalette( pal ); pmTransitTime->setFont( rsFont ); insertSeparator(); diff --git a/kstars/kstars/kstars.cpp b/kstars/kstars/kstars.cpp index 6cde713d..999a0bfc 100644 --- a/kstars/kstars/kstars.cpp +++ b/kstars/kstars/kstars.cpp @@ -184,9 +184,9 @@ void KStars::applyConfig() { //color scheme pd->kstarsData->colorScheme()->loadFromConfig( kapp->config() ); if ( Options::darkAppColors() ) { - TQApplication::tqsetPalette( DarkPalette, true ); + TQApplication::setPalette( DarkPalette, true ); } else { - TQApplication::tqsetPalette( OriginalPalette, true ); + TQApplication::setPalette( OriginalPalette, true ); } //Infoboxes, toolbars, statusbars diff --git a/kstars/kstars/kstars.h b/kstars/kstars/kstars.h index 569c70f7..1665423c 100644 --- a/kstars/kstars/kstars.h +++ b/kstars/kstars/kstars.h @@ -625,7 +625,7 @@ class KStars : public KMainWindow, virtual public KStarsInterface void initFOV(); /** - *Initialize tqStatus bar. + *Initialize Status bar. */ void initStatusBar(); diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp index 4768f703..0ab9935a 100644 --- a/kstars/kstars/kstarsactions.cpp +++ b/kstars/kstars/kstarsactions.cpp @@ -227,7 +227,7 @@ void KStars::slotImageSequence() if (indiseq == NULL) indiseq = new imagesequence(this); - if (indiseq->updatetqStatus()) + if (indiseq->updateStatus()) indiseq->show(); } @@ -248,7 +248,7 @@ void KStars::slotINDIPanel() { if (indimenu == NULL) indimenu = new INDIMenu(this); - indimenu->updatetqStatus(); + indimenu->updateStatus(); } void KStars::slotINDIDriver() { @@ -569,7 +569,7 @@ void KStars::slotRunScript() { p << f.name(); p.start( KProcess::DontCare ); - while ( p.isRunning() ) kapp->tqprocessEvents( 50 ); //otherwise tempfile may get deleted before script completes. + while ( p.isRunning() ) kapp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes. } } @@ -595,7 +595,7 @@ void KStars::slotPrint() { //Set Time to CPU clock void KStars::slotSetTimeToNow() { - data()->changeDateTime( geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ) ); + data()->changeDateTime( geo()->LTtoUT( KStarsDateTime::currentDateTime() ) ); if ( Options::useAltAz() ) { map()->focus()->HorizontalToEquatorial( LST(), geo()->lat() ); @@ -914,11 +914,11 @@ void KStars::slotTipOfDay() { // Toggle to and from full screen mode void KStars::slotFullScreen() { - if ( tqtopLevelWidget()->isFullScreen() ) { - tqtopLevelWidget()->showNormal(); + if ( topLevelWidget()->isFullScreen() ) { + topLevelWidget()->showNormal(); } else { - tqtopLevelWidget()->showFullScreen(); + topLevelWidget()->showFullScreen(); } } diff --git a/kstars/kstars/kstarsdatetime.cpp b/kstars/kstars/kstarsdatetime.cpp index 25c3be0b..6b406f44 100644 --- a/kstars/kstars/kstarsdatetime.cpp +++ b/kstars/kstars/kstarsdatetime.cpp @@ -55,10 +55,10 @@ KStarsDateTime::KStarsDateTime( long double _jd ) : ExtDateTime() { setDJD( _jd ); } -KStarsDateTime KStarsDateTime::tqcurrentDateTime() { - KStarsDateTime dt( ExtDate::tqcurrentDate(), TQTime::currentTime() ); +KStarsDateTime KStarsDateTime::currentDateTime() { + KStarsDateTime dt( ExtDate::currentDate(), TQTime::currentTime() ); if ( dt.time().hour()==0 && dt.time().minute()==0 ) // midnight or right after? - dt.setDate( ExtDate::tqcurrentDate() ); // fetch date again + dt.setDate( ExtDate::currentDate() ); // fetch date again return dt; } diff --git a/kstars/kstars/kstarsdatetime.h b/kstars/kstars/kstarsdatetime.h index dec5daa0..c7ada867 100644 --- a/kstars/kstars/kstarsdatetime.h +++ b/kstars/kstars/kstarsdatetime.h @@ -134,7 +134,7 @@ public: *@return the date and time according to the CPU clock (note that this is not *necessarily UT) */ - static KStarsDateTime tqcurrentDateTime(); + static KStarsDateTime currentDateTime(); /** *@return the julian day as a long double, including the time as the fractional portion. diff --git a/kstars/kstars/kstarsdcop.cpp b/kstars/kstars/kstarsdcop.cpp index 8649ccba..f41472d0 100644 --- a/kstars/kstars/kstarsdcop.cpp +++ b/kstars/kstars/kstarsdcop.cpp @@ -376,12 +376,12 @@ void KStars::loadColorScheme( const TQString _name ) { if ( Options::darkAppColors() == false && filename == "night.colors" ) { Options::setDarkAppColors( true ); OriginalPalette = TQApplication::palette(); - TQApplication::tqsetPalette( DarkPalette, true ); + TQApplication::setPalette( DarkPalette, true ); } if ( Options::darkAppColors() && filename != "night.colors" ) { Options::setDarkAppColors( false ); - TQApplication::tqsetPalette( OriginalPalette, true ); + TQApplication::setPalette( OriginalPalette, true ); } map()->forceUpdate(); @@ -421,7 +421,7 @@ void KStars::exportImage( const TQString url, int w, int h ) { else { kdWarning() << i18n( "Could not parse image format of %1; assuming PNG." ).tqarg( fname ) << endl; } map()->exportSkyImage( TQT_TQPAINTDEVICE(&skyimage) ); - kapp->tqprocessEvents(10000); + kapp->processEvents(10000); //skyImage is the size of the sky map. The requested image size is w x h. //If w x h is smaller than the skymap, then we simply crop the image. @@ -523,7 +523,7 @@ void KStars::startINDI (TQString deviceName, bool useLocal) if (indidriver->isDeviceRunning(deviceName)) { indidriver->localListView->setSelected(driverItem, true); - indidriver->processDevicetqStatus(1); + indidriver->processDeviceStatus(1); } // Set custome label for device @@ -538,7 +538,7 @@ void KStars::startINDI (TQString deviceName, bool useLocal) indidriver->serverR->setChecked(true); // Run it - indidriver->processDevicetqStatus(0); + indidriver->processDeviceStatus(0); } @@ -558,7 +558,7 @@ void KStars::shutdownINDI (TQString deviceName) return; } - indidriver->processDevicetqStatus(1); + indidriver->processDeviceStatus(1); } diff --git a/kstars/kstars/kstarssplash.cpp b/kstars/kstars/kstarssplash.cpp index 29198caa..defd0007 100644 --- a/kstars/kstars/kstarssplash.cpp +++ b/kstars/kstars/kstarssplash.cpp @@ -59,15 +59,15 @@ KStarsSplash::KStarsSplash( TQWidget *parent, const char* name ) pal.setColor( TQPalette::Normal, TQColorGroup::Foreground, TQColor( "White" ) ); pal.setColor( TQPalette::Inactive, TQColorGroup::Foreground, TQColor( "White" ) ); label->setPalette( pal ); - label->tqsetAlignment( AlignHCenter ); + label->setAlignment( AlignHCenter ); label->setText( i18n( "Welcome to KStars. Please stand by while loading..." ) ); topLayout->addWidget( label ); //initialize the progress message label - textCurrenttqStatus = new TQLabel( page, "label2" ); - textCurrenttqStatus->setPalette( pal ); - textCurrenttqStatus->tqsetAlignment( AlignHCenter ); - topLayout->addWidget( textCurrenttqStatus ); + textCurrentStatus = new TQLabel( page, "label2" ); + textCurrentStatus->setPalette( pal ); + textCurrentStatus->setAlignment( AlignHCenter ); + topLayout->addWidget( textCurrentStatus ); topLayout->activate(); disableResize(); @@ -81,7 +81,7 @@ KStarsSplash::~KStarsSplash() { void KStarsSplash::paintEvent( TQPaintEvent* ) { bitBlt( Banner, 0, 0, splashImage, 0, 0, -1, -1 ); label->tqrepaint(); // standard text label - textCurrenttqStatus->tqrepaint(); // status text label + textCurrentStatus->tqrepaint(); // status text label } void KStarsSplash::closeEvent( TQCloseEvent *e ) { @@ -90,7 +90,7 @@ void KStarsSplash::closeEvent( TQCloseEvent *e ) { } void KStarsSplash::setMessage( TQString s ) { - textCurrenttqStatus->setText( s ); + textCurrentStatus->setText( s ); tqrepaint(); // tqrepaint splash screen /** *Flush all event data. This is needed because events will buffered and diff --git a/kstars/kstars/kstarssplash.h b/kstars/kstars/kstarssplash.h index 8d9b2236..443eb1b6 100644 --- a/kstars/kstars/kstarssplash.h +++ b/kstars/kstars/kstarssplash.h @@ -66,7 +66,7 @@ class KStarsSplash : public KDialogBase void closeWindow(); private: - TQLabel *textCurrenttqStatus, *label; + TQLabel *textCurrentStatus, *label; TQWidget *Banner; TQPixmap *splashImage; }; diff --git a/kstars/kstars/kswizardui.ui b/kstars/kstars/kswizardui.ui index 53d6871f..12c189a2 100644 --- a/kstars/kstars/kswizardui.ui +++ b/kstars/kstars/kswizardui.ui @@ -35,7 +35,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>360</height> @@ -79,7 +79,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>189</height> @@ -145,7 +145,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>360</height> @@ -197,7 +197,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -239,7 +239,7 @@ country.</p> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -314,7 +314,7 @@ country.</p> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -333,7 +333,7 @@ country.</p> <property name="name"> <cstring>LatBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>0</height> @@ -366,7 +366,7 @@ country.</p> <property name="name"> <cstring>LongBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>0</height> @@ -386,7 +386,7 @@ country.</p> <property name="name"> <cstring>CityListBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>180</width> <height>0</height> @@ -428,7 +428,7 @@ country.</p> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>360</height> @@ -472,7 +472,7 @@ country.</p> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -507,7 +507,7 @@ can also control telescopes remotely over the Internet.</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -535,7 +535,7 @@ You can always set up devices later using the <b>Devices</b> menu.</ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -560,7 +560,7 @@ You can always set up devices later using the <b>Devices</b> menu.</ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -592,7 +592,7 @@ and other astronomical devices such as CCD cameras and focusers.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -611,7 +611,7 @@ and other astronomical devices such as CCD cameras and focusers.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>117</height> @@ -649,7 +649,7 @@ and other astronomical devices such as CCD cameras and focusers.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>360</height> @@ -693,7 +693,7 @@ and other astronomical devices such as CCD cameras and focusers.</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -735,7 +735,7 @@ button to proceed. </p> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -760,7 +760,7 @@ button to proceed. </p> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -785,7 +785,7 @@ button to proceed. </p> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -804,7 +804,7 @@ button to proceed. </p> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>90</height> diff --git a/kstars/kstars/main.cpp b/kstars/kstars/main.cpp index b96756c4..0a83531e 100644 --- a/kstars/kstars/main.cpp +++ b/kstars/kstars/main.cpp @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) KStarsData *dat = new KStarsData(); TQObject::connect( dat, TQT_SIGNAL( progressText(TQString) ), dat, TQT_SLOT( slotConsoleMessage(TQString) ) ); dat->initialize(); - while (!dat->startupComplete) { kapp->tqprocessEvents(50); } + while (!dat->startupComplete) { kapp->processEvents(50); } //Set Geographic Location dat->setLocationFromOptions(); @@ -128,10 +128,10 @@ int main(int argc, char *argv[]) kdWarning() << " 25 Feb 1950 ; 25 Feb 1950 05:30:00" << endl; kdWarning() << i18n( "Using CPU date/time instead." ) << endl; - kdt = dat->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); + kdt = dat->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); } } else { - kdt = dat->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); + kdt = dat->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); } dat->clock()->setUTC( kdt ); @@ -160,10 +160,10 @@ int main(int argc, char *argv[]) dat->setFullTimeUpdate(); dat->updateTime(dat->geo(), map ); - kapp->tqprocessEvents(100000); + kapp->processEvents(100000); map->setMapGeometry(); map->exportSkyImage( TQT_TQPAINTDEVICE(&sky) ); - kapp->tqprocessEvents(100000); + kapp->processEvents(100000); if ( ! sky.save( fname, format ) ) kdWarning() << i18n( "Unable to save image: %1 " ).tqarg( fname ) << endl; else kdDebug() << i18n( "Saved to file: %1" ).tqarg( fname ) << endl; diff --git a/kstars/kstars/mapcanvas.cpp b/kstars/kstars/mapcanvas.cpp index 928623f8..85dbd1ca 100644 --- a/kstars/kstars/mapcanvas.cpp +++ b/kstars/kstars/mapcanvas.cpp @@ -31,7 +31,7 @@ MapCanvas::MapCanvas(TQWidget *parent, const char *name ) : TQWidget(parent,name setBackgroundMode( TQWidget::NoBackground ); Canvas = new TQPixmap(); bgImage = new TQPixmap(); - LocationDialog *ld = (LocationDialog *)tqtopLevelWidget(); + LocationDialog *ld = (LocationDialog *)topLevelWidget(); KStars *ks = (KStars *)ld->parent(); TQString bgFile = ks->data()->stdDirs->findResource( "data", "kstars/geomap.png" ); bgImage->load( bgFile, "PNG" ); @@ -57,7 +57,7 @@ void MapCanvas::setGeometry( const TQRect &r ) { } void MapCanvas::mousePressEvent( TQMouseEvent *e ) { - LocationDialog *ld = (LocationDialog *)tqtopLevelWidget(); + LocationDialog *ld = (LocationDialog *)topLevelWidget(); //Determine Lat/Long corresponding to event press int lng = ( e->x() - origin.x() ); @@ -68,7 +68,7 @@ void MapCanvas::mousePressEvent( TQMouseEvent *e ) { void MapCanvas::paintEvent( TQPaintEvent * ) { TQPainter pcanvas; - LocationDialog *ld = (LocationDialog *)tqtopLevelWidget(); + LocationDialog *ld = (LocationDialog *)topLevelWidget(); KStars *ks = (KStars *)ld->parent(); //prepare the canvas diff --git a/kstars/kstars/newfovui.ui b/kstars/kstars/newfovui.ui index 649c04e9..cc7728af 100644 --- a/kstars/kstars/newfovui.ui +++ b/kstars/kstars/newfovui.ui @@ -244,7 +244,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -269,7 +269,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>152</width> <height>20</height> @@ -333,7 +333,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>180</width> <height>20</height> @@ -350,7 +350,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>22</height> @@ -367,7 +367,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>22</height> @@ -441,7 +441,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo <property name="name"> <cstring>textLabel6_2_3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>60</width> <height>0</height> @@ -578,7 +578,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo <property name="name"> <cstring>textLabel6_2_3_4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>60</width> <height>0</height> @@ -645,7 +645,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>51</height> @@ -670,7 +670,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>281</width> <height>21</height> @@ -742,7 +742,7 @@ You can either enter a value directly, or use the "Eyepiece" or "Camera" Tabs to <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>298</width> <height>20</height> @@ -872,7 +872,7 @@ Circle, Square, Crosshairs, Bullseye.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>80</height> diff --git a/kstars/kstars/opsadvancedui.ui b/kstars/kstars/opsadvancedui.ui index 86527bf2..cea4b508 100644 --- a/kstars/kstars/opsadvancedui.ui +++ b/kstars/kstars/opsadvancedui.ui @@ -117,7 +117,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -175,7 +175,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -224,7 +224,7 @@ <property name="name"> <cstring>kcfg_MagLimitHideStar</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -258,7 +258,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>240</width> <height>20</height> @@ -409,7 +409,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kstars/kstars/opscatalogui.ui b/kstars/kstars/opscatalogui.ui index 28866b7a..d7012f99 100644 --- a/kstars/kstars/opscatalogui.ui +++ b/kstars/kstars/opscatalogui.ui @@ -132,7 +132,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>65</width> <height>20</height> @@ -149,7 +149,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>65</width> <height>20</height> @@ -168,7 +168,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -223,7 +223,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -250,7 +250,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -291,7 +291,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -423,7 +423,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>68</height> @@ -522,7 +522,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>65</width> <height>20</height> @@ -539,7 +539,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>65</width> <height>20</height> @@ -560,7 +560,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kstars/kstars/opscolorsui.ui b/kstars/kstars/opscolorsui.ui index 94cc9e70..1c08c304 100644 --- a/kstars/kstars/opscolorsui.ui +++ b/kstars/kstars/opscolorsui.ui @@ -185,7 +185,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -216,7 +216,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -233,7 +233,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -250,7 +250,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kstars/kstars/opsguidesui.ui b/kstars/kstars/opsguidesui.ui index 40075880..8294be8b 100644 --- a/kstars/kstars/opsguidesui.ui +++ b/kstars/kstars/opsguidesui.ui @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -252,7 +252,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> diff --git a/kstars/kstars/opssolarsystemui.ui b/kstars/kstars/opssolarsystemui.ui index dc872a3b..05cc5c28 100644 --- a/kstars/kstars/opssolarsystemui.ui +++ b/kstars/kstars/opssolarsystemui.ui @@ -230,7 +230,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>100</width> <height>20</height> @@ -263,7 +263,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -307,7 +307,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -492,7 +492,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kstars/kstars/simclock.h b/kstars/kstars/simclock.h index a4b16787..d652c304 100644 --- a/kstars/kstars/simclock.h +++ b/kstars/kstars/simclock.h @@ -40,7 +40,7 @@ class SimClock : public TQObject, public SimClockInterface { * @param parent parent object for the clock * @param when the date/time to which the SimClock should be initialized in UTC */ - SimClock(TQObject *parent = 0, const KStarsDateTime &when = KStarsDateTime::tqcurrentDateTime() ); + SimClock(TQObject *parent = 0, const KStarsDateTime &when = KStarsDateTime::currentDateTime() ); /** * Constructor * @param old a SimClock to initialize from. diff --git a/kstars/kstars/skymap.cpp b/kstars/kstars/skymap.cpp index 4dab3cee..976bcfb9 100644 --- a/kstars/kstars/skymap.cpp +++ b/kstars/kstars/skymap.cpp @@ -74,7 +74,7 @@ SkyMap::SkyMap(KStarsData *d, TQWidget *parent, const char *name ) setBackgroundMode( TQWidget::NoBackground ); setFocusPolicy( TQ_StrongFocus ); setMinimumSize( 380, 250 ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); setMouseTracking (true); //Generate MouseMove events! midMouseButtonDown = false; @@ -925,7 +925,7 @@ void SkyMap::slewFocus( void ) { fadeTransientLabel(); forceUpdate(); - kapp->tqprocessEvents(10); //keep up with other stuff + kapp->processEvents(10); //keep up with other stuff if ( Options::useAltAz() ) { dX = destination()->az()->Degrees() - focus()->az()->Degrees(); diff --git a/kstars/kstars/skymapdraw.cpp b/kstars/kstars/skymapdraw.cpp index 77f17268..ab83a8c6 100644 --- a/kstars/kstars/skymapdraw.cpp +++ b/kstars/kstars/skymapdraw.cpp @@ -299,7 +299,7 @@ void SkyMap::drawMilkyWay( TQPainter& psky, double scale ) } if ( ptsCount && partVisible ) { - psky.tqdrawPolygon( ( const TQPointArray ) *pts, false, 0, ptsCount ); + psky.drawPolygon( ( const TQPointArray ) *pts, false, 0, ptsCount ); } } else { TQPoint o = getXY( data->MilkyWay[j].at(0), Options::useAltAz(), Options::useRefraction(), scale ); @@ -905,7 +905,7 @@ void SkyMap::drawHorizon( TQPainter& psky, double scale ) } //Draw the Horizon polygon - psky.tqdrawPolygon( ( const TQPointArray ) *pts, false, 0, ptsCount ); + psky.drawPolygon( ( const TQPointArray ) *pts, false, 0, ptsCount ); //remove all items in points list for ( register unsigned int i=0; i<points.count(); ++i ) { diff --git a/kstars/kstars/streamformui.ui b/kstars/kstars/streamformui.ui index 5e222427..86088d12 100644 --- a/kstars/kstars/streamformui.ui +++ b/kstars/kstars/streamformui.ui @@ -31,13 +31,13 @@ <property name="name"> <cstring>playB</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -57,13 +57,13 @@ <property name="name"> <cstring>captureB</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -97,7 +97,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>300</width> <height>21</height> diff --git a/kstars/kstars/telescopepropui.ui b/kstars/kstars/telescopepropui.ui index bcff2bd6..6968b989 100644 --- a/kstars/kstars/telescopepropui.ui +++ b/kstars/kstars/telescopepropui.ui @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>236</width> <height>20</height> @@ -101,7 +101,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>130</width> <height>0</height> @@ -242,7 +242,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>190</height> diff --git a/kstars/kstars/telescopewizard.ui b/kstars/kstars/telescopewizard.ui index fa67eea5..d9bfbddb 100644 --- a/kstars/kstars/telescopewizard.ui +++ b/kstars/kstars/telescopewizard.ui @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>500</width> <height>300</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>800</width> <height>300</height> @@ -74,7 +74,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>56</width> <height>11</height> @@ -181,7 +181,7 @@ Please select your telescope model from the list below. Click next after selecti <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>25</height> @@ -211,7 +211,7 @@ Please select your telescope model from the list below. Click next after selecti <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>196</width> <height>16</height> @@ -230,7 +230,7 @@ Please select your telescope model from the list below. Click next after selecti <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>25</height> @@ -320,7 +320,7 @@ Verify if the following time, date, and location settings are correct. If any of <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -486,7 +486,7 @@ Verify if the following time, date, and location settings are correct. If any of <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -538,7 +538,7 @@ Enter the port number your telescope is connected to. If you only have one seria <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>25</height> @@ -576,7 +576,7 @@ Enter the port number your telescope is connected to. If you only have one seria <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>141</width> <height>16</height> @@ -595,7 +595,7 @@ Enter the port number your telescope is connected to. If you only have one seria <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>25</height> diff --git a/kstars/kstars/telescopewizardprocess.cpp b/kstars/kstars/telescopewizardprocess.cpp index d29c6ba2..0355d7c0 100644 --- a/kstars/kstars/telescopewizardprocess.cpp +++ b/kstars/kstars/telescopewizardprocess.cpp @@ -106,7 +106,7 @@ telescopeWizardProcess::~telescopeWizardProcess() { if (progressScan) if (progressScan->wasCancelled()) - indidriver->processDevicetqStatus(1); + indidriver->processDeviceStatus(1); Options::setIndiMessages( INDIMessageBar ); @@ -237,7 +237,7 @@ int telescopeWizardProcess::establishLink() if (indidriver->isDeviceRunning(telescopeCombo->currentText())) { indidriver->localListView->setSelected(driverItem, true); - indidriver->processDevicetqStatus(1); + indidriver->processDeviceStatus(1); } // Set custome label for device @@ -248,7 +248,7 @@ int telescopeWizardProcess::establishLink() // Make sure we start is locally indidriver->localR->setChecked(true); // Run it - indidriver->processDevicetqStatus(0); + indidriver->processDeviceStatus(0); if (!indidriver->isDeviceRunning(telescopeCombo->currentText())) return (3); @@ -274,7 +274,7 @@ void telescopeWizardProcess::processPort() if (timeOutCount >= TIMEOUT_THRESHHOLD) { - indidriver->processDevicetqStatus(1); + indidriver->processDeviceStatus(1); Reset(); KMessageBox::error(0, i18n("Error: connection timeout. Unable to communicate with an INDI server")); close(); @@ -335,7 +335,7 @@ void telescopeWizardProcess::scanPorts() { KMessageBox::sorry(0, i18n("Sorry. KStars failed to detect any attached telescopes, please check your settings and try again.")); linkRejected = true; - indidriver->processDevicetqStatus(1); + indidriver->processDeviceStatus(1); Reset(); return; } diff --git a/kstars/kstars/thumbnailpicker.cpp b/kstars/kstars/thumbnailpicker.cpp index 5a4887a9..e39ceb19 100644 --- a/kstars/kstars/thumbnailpicker.cpp +++ b/kstars/kstars/thumbnailpicker.cpp @@ -176,7 +176,7 @@ void ThumbnailPicker::downloadReady(KIO::Job *job) { //Add image to list //If image is taller than desktop, rescale it. - //I tried to use kapp->style().tqpixelMetric( TQStyle::PM_TitleBarHeight ) + //I tried to use kapp->style().pixelMetric( TQStyle::PM_TitleBarHeight ) //for the titlebar height, but this returned zero. //Hard-coding 25 instead :( if ( tmp.exists() ) { @@ -195,7 +195,7 @@ void ThumbnailPicker::downloadReady(KIO::Job *job) { // this returns zero... // //DEBUG -// kdDebug() << "Title bar height: " << kapp->style().tqpixelMetric( TQStyle::PM_TitleBarHeight ) << endl; +// kdDebug() << "Title bar height: " << kapp->style().pixelMetric( TQStyle::PM_TitleBarHeight ) << endl; if ( h > hDesk ) im = im.smoothScale( w*hDesk/h, hDesk ); diff --git a/kstars/kstars/thumbnailpickerui.ui b/kstars/kstars/thumbnailpickerui.ui index 591f7cdc..1058ee6c 100644 --- a/kstars/kstars/thumbnailpickerui.ui +++ b/kstars/kstars/thumbnailpickerui.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -80,7 +80,7 @@ <property name="name"> <cstring>ImageList</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>0</height> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>53</width> <height>20</height> @@ -169,13 +169,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>200</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>200</width> <height>200</height> @@ -200,7 +200,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>53</width> <height>20</height> @@ -227,7 +227,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -270,7 +270,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -289,7 +289,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>233</height> diff --git a/kstars/kstars/timebox.cpp b/kstars/kstars/timebox.cpp index b3dabc31..d95927c5 100644 --- a/kstars/kstars/timebox.cpp +++ b/kstars/kstars/timebox.cpp @@ -159,9 +159,9 @@ ExtDate timeBox::createDate (bool */*ok*/) if ( !date.isValid() ) { kdDebug() << k_funcinfo << "Invalid date" << endl; - showDate(ExtDate::tqcurrentDate()); + showDate(ExtDate::currentDate()); entry = text().stripWhiteSpace(); - return ExtDate::tqcurrentDate(); + return ExtDate::currentDate(); } else { return date; } diff --git a/kstars/kstars/timedialog.cpp b/kstars/kstars/timedialog.cpp index d3ff7ecb..f68d56dc 100644 --- a/kstars/kstars/timedialog.cpp +++ b/kstars/kstars/timedialog.cpp @@ -112,7 +112,7 @@ void TimeDialog::keyReleaseEvent( TQKeyEvent *kev ) { void TimeDialog::setNow( void ) { - KStarsDateTime dt( KStarsDateTime::tqcurrentDateTime() ); + KStarsDateTime dt( KStarsDateTime::currentDateTime() ); dPicker->setDate( dt.date() ); TQTime t = dt.time(); diff --git a/kstars/kstars/tools/altvstime.cpp b/kstars/kstars/tools/altvstime.cpp index c271319d..39013999 100644 --- a/kstars/kstars/tools/altvstime.cpp +++ b/kstars/kstars/tools/altvstime.cpp @@ -53,7 +53,7 @@ AltVsTime::AltVsTime( TQWidget* parent) : View = new AVTPlotWidget( -12.0, 12.0, -90.0, 90.0, page ); View->setMinimumSize( 400, 400 ); - View->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); + View->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); View->setXAxisType( KStarsPlotWidget::TIME ); View->setYAxisType( KStarsPlotWidget::ANGLE ); View->setShowGrid( false ); @@ -468,7 +468,7 @@ void AltVsTime::setLSTLimits(void) { void AltVsTime::showCurrentDate (void) { - KStarsDateTime dt = KStarsDateTime::tqcurrentDateTime(); + KStarsDateTime dt = KStarsDateTime::currentDateTime(); if ( dt.time() > TQTime( 12, 0, 0 ) ) dt = dt.addDays( 1 ); avtUI->dateBox->setDate( dt.date() ); } diff --git a/kstars/kstars/tools/altvstimeui.ui b/kstars/kstars/tools/altvstimeui.ui index 323c9fd7..2738dbb8 100644 --- a/kstars/kstars/tools/altvstimeui.ui +++ b/kstars/kstars/tools/altvstimeui.ui @@ -150,13 +150,13 @@ <property name="name"> <cstring>epochName</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>80</width> <height>32767</height> @@ -228,7 +228,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -260,7 +260,7 @@ <property name="name"> <cstring>PlotList</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -303,7 +303,7 @@ <property name="name"> <cstring>dateBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -320,7 +320,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>257</width> <height>20</height> @@ -421,7 +421,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -446,7 +446,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kstars/kstars/tools/argchangeviewoption.ui b/kstars/kstars/tools/argchangeviewoption.ui index 1da77198..aac25fe2 100644 --- a/kstars/kstars/tools/argchangeviewoption.ui +++ b/kstars/kstars/tools/argchangeviewoption.ui @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>160</width> <height>20</height> @@ -122,7 +122,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kstars/kstars/tools/argexportimage.ui b/kstars/kstars/tools/argexportimage.ui index 9228373b..085646f6 100644 --- a/kstars/kstars/tools/argexportimage.ui +++ b/kstars/kstars/tools/argexportimage.ui @@ -36,7 +36,7 @@ <property name="name"> <cstring>ExportFileName</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>160</width> <height>0</height> @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -223,8 +223,8 @@ <property type="Bool">enabled</property> <property type="Rect">tqgeometry</property> <property type="SizePolicy">sizePolicy</property> - <property type="Size">tqminimumSize</property> - <property type="Size">tqmaximumSize</property> + <property type="Size">minimumSize</property> + <property type="Size">maximumSize</property> <property type="Size">sizeIncrement</property> <property type="Size">baseSize</property> <property type="Color">paletteForegroundColor</property> diff --git a/kstars/kstars/tools/arglooktoward.ui b/kstars/kstars/tools/arglooktoward.ui index ea505d2c..c8d47e35 100644 --- a/kstars/kstars/tools/arglooktoward.ui +++ b/kstars/kstars/tools/arglooktoward.ui @@ -125,7 +125,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -144,7 +144,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/tools/argprintimage.ui b/kstars/kstars/tools/argprintimage.ui index 362e8289..dc50ac07 100644 --- a/kstars/kstars/tools/argprintimage.ui +++ b/kstars/kstars/tools/argprintimage.ui @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>70</height> diff --git a/kstars/kstars/tools/argsetactionindi.ui b/kstars/kstars/tools/argsetactionindi.ui index 9e8465ad..b299ce35 100644 --- a/kstars/kstars/tools/argsetactionindi.ui +++ b/kstars/kstars/tools/argsetactionindi.ui @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>21</height> @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> diff --git a/kstars/kstars/tools/argsetaltaz.ui b/kstars/kstars/tools/argsetaltaz.ui index 1c373ebb..52a7aebf 100644 --- a/kstars/kstars/tools/argsetaltaz.ui +++ b/kstars/kstars/tools/argsetaltaz.ui @@ -100,7 +100,7 @@ The azimuth is one of the coordinates in the horizontal coordinate system. It i <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/tools/argsetccdtempindi.ui b/kstars/kstars/tools/argsetccdtempindi.ui index ba6eed5a..17eb9e8a 100644 --- a/kstars/kstars/tools/argsetccdtempindi.ui +++ b/kstars/kstars/tools/argsetccdtempindi.ui @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>27</width> <height>21</height> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> diff --git a/kstars/kstars/tools/argsetcolor.ui b/kstars/kstars/tools/argsetcolor.ui index e2e2f2e2..326a15bf 100644 --- a/kstars/kstars/tools/argsetcolor.ui +++ b/kstars/kstars/tools/argsetcolor.ui @@ -66,7 +66,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -92,7 +92,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -182,8 +182,8 @@ <property type="Bool">enabled</property> <property type="Rect">tqgeometry</property> <property type="SizePolicy">sizePolicy</property> - <property type="Size">tqminimumSize</property> - <property type="Size">tqmaximumSize</property> + <property type="Size">minimumSize</property> + <property type="Size">maximumSize</property> <property type="Size">sizeIncrement</property> <property type="Size">baseSize</property> <property type="Color">paletteForegroundColor</property> diff --git a/kstars/kstars/tools/argsetfilternumindi.ui b/kstars/kstars/tools/argsetfilternumindi.ui index dbb9aff4..a5681d90 100644 --- a/kstars/kstars/tools/argsetfilternumindi.ui +++ b/kstars/kstars/tools/argsetfilternumindi.ui @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>27</width> <height>21</height> @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> diff --git a/kstars/kstars/tools/argsetfocusspeedindi.ui b/kstars/kstars/tools/argsetfocusspeedindi.ui index 07c37429..012ca14f 100644 --- a/kstars/kstars/tools/argsetfocusspeedindi.ui +++ b/kstars/kstars/tools/argsetfocusspeedindi.ui @@ -26,7 +26,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> @@ -43,7 +43,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>45</width> <height>21</height> diff --git a/kstars/kstars/tools/argsetfocustimeoutindi.ui b/kstars/kstars/tools/argsetfocustimeoutindi.ui index 63d2e9c3..0247bd6e 100644 --- a/kstars/kstars/tools/argsetfocustimeoutindi.ui +++ b/kstars/kstars/tools/argsetfocustimeoutindi.ui @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>27</width> <height>21</height> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> diff --git a/kstars/kstars/tools/argsetframetypeindi.ui b/kstars/kstars/tools/argsetframetypeindi.ui index 31e7cf34..61dd9e9c 100644 --- a/kstars/kstars/tools/argsetframetypeindi.ui +++ b/kstars/kstars/tools/argsetframetypeindi.ui @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>56</width> <height>21</height> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> diff --git a/kstars/kstars/tools/argsetgeolocation.ui b/kstars/kstars/tools/argsetgeolocation.ui index 5318e530..1456e43d 100644 --- a/kstars/kstars/tools/argsetgeolocation.ui +++ b/kstars/kstars/tools/argsetgeolocation.ui @@ -117,7 +117,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>49</width> <height>20</height> @@ -152,7 +152,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>49</width> <height>20</height> @@ -171,7 +171,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/tools/argsetgeolocationindi.ui b/kstars/kstars/tools/argsetgeolocationindi.ui index 127d7b8f..9e7a5f6e 100644 --- a/kstars/kstars/tools/argsetgeolocationindi.ui +++ b/kstars/kstars/tools/argsetgeolocationindi.ui @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>23</height> diff --git a/kstars/kstars/tools/argsetlocaltime.ui b/kstars/kstars/tools/argsetlocaltime.ui index 623d263d..ef804797 100644 --- a/kstars/kstars/tools/argsetlocaltime.ui +++ b/kstars/kstars/tools/argsetlocaltime.ui @@ -39,7 +39,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>20</height> @@ -69,7 +69,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kstars/kstars/tools/argsetportindi.ui b/kstars/kstars/tools/argsetportindi.ui index 8472c2d0..215de8cc 100644 --- a/kstars/kstars/tools/argsetportindi.ui +++ b/kstars/kstars/tools/argsetportindi.ui @@ -62,7 +62,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> diff --git a/kstars/kstars/tools/argsetradec.ui b/kstars/kstars/tools/argsetradec.ui index e47fd936..f5d7eee0 100644 --- a/kstars/kstars/tools/argsetradec.ui +++ b/kstars/kstars/tools/argsetradec.ui @@ -100,7 +100,7 @@ Right Ascension is one of the coordinates in the Equatorial coordinate system. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/tools/argsetscopeactionindi.ui b/kstars/kstars/tools/argsetscopeactionindi.ui index 3aea9afe..559083d2 100644 --- a/kstars/kstars/tools/argsetscopeactionindi.ui +++ b/kstars/kstars/tools/argsetscopeactionindi.ui @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>56</width> <height>21</height> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> diff --git a/kstars/kstars/tools/argsettargetcoordindi.ui b/kstars/kstars/tools/argsettargetcoordindi.ui index a047a74b..0876841e 100644 --- a/kstars/kstars/tools/argsettargetcoordindi.ui +++ b/kstars/kstars/tools/argsettargetcoordindi.ui @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>24</height> diff --git a/kstars/kstars/tools/argsettargetnameindi.ui b/kstars/kstars/tools/argsettargetnameindi.ui index 344ebd59..ed1bb8b8 100644 --- a/kstars/kstars/tools/argsettargetnameindi.ui +++ b/kstars/kstars/tools/argsettargetnameindi.ui @@ -88,7 +88,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>52</width> <height>20</height> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>8</height> diff --git a/kstars/kstars/tools/argsettrack.ui b/kstars/kstars/tools/argsettrack.ui index b6467496..e163e972 100644 --- a/kstars/kstars/tools/argsettrack.ui +++ b/kstars/kstars/tools/argsettrack.ui @@ -50,7 +50,7 @@ If unchecked, then Tracking will be forced off, even if an object has been cente <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -69,7 +69,7 @@ If unchecked, then Tracking will be forced off, even if an object has been cente <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/tools/argsetutcindi.ui b/kstars/kstars/tools/argsetutcindi.ui index 7a9d5f6a..8c79ee06 100644 --- a/kstars/kstars/tools/argsetutcindi.ui +++ b/kstars/kstars/tools/argsetutcindi.ui @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> diff --git a/kstars/kstars/tools/argshutdownindi.ui b/kstars/kstars/tools/argshutdownindi.ui index d09a9ce5..77a1053e 100644 --- a/kstars/kstars/tools/argshutdownindi.ui +++ b/kstars/kstars/tools/argshutdownindi.ui @@ -59,7 +59,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>33</height> diff --git a/kstars/kstars/tools/argstartexposureindi.ui b/kstars/kstars/tools/argstartexposureindi.ui index 7b6d0a78..163b2ae3 100644 --- a/kstars/kstars/tools/argstartexposureindi.ui +++ b/kstars/kstars/tools/argstartexposureindi.ui @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>27</width> <height>21</height> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> diff --git a/kstars/kstars/tools/argstartfocusindi.ui b/kstars/kstars/tools/argstartfocusindi.ui index 8f014162..e4a39111 100644 --- a/kstars/kstars/tools/argstartfocusindi.ui +++ b/kstars/kstars/tools/argstartfocusindi.ui @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>56</width> <height>21</height> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> diff --git a/kstars/kstars/tools/argstartindi.ui b/kstars/kstars/tools/argstartindi.ui index 540441b0..308c2c79 100644 --- a/kstars/kstars/tools/argstartindi.ui +++ b/kstars/kstars/tools/argstartindi.ui @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/tools/argswitchindi.ui b/kstars/kstars/tools/argswitchindi.ui index f998c4be..6e83732e 100644 --- a/kstars/kstars/tools/argswitchindi.ui +++ b/kstars/kstars/tools/argswitchindi.ui @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>33</height> diff --git a/kstars/kstars/tools/argtimescale.ui b/kstars/kstars/tools/argtimescale.ui index cd55da63..dd5a9181 100644 --- a/kstars/kstars/tools/argtimescale.ui +++ b/kstars/kstars/tools/argtimescale.ui @@ -39,7 +39,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>150</width> <height>20</height> @@ -58,7 +58,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/tools/argwaitfor.ui b/kstars/kstars/tools/argwaitfor.ui index 77ea5077..523ddbeb 100644 --- a/kstars/kstars/tools/argwaitfor.ui +++ b/kstars/kstars/tools/argwaitfor.ui @@ -53,7 +53,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/tools/argwaitforkey.ui b/kstars/kstars/tools/argwaitforkey.ui index 82876087..40459a55 100644 --- a/kstars/kstars/tools/argwaitforkey.ui +++ b/kstars/kstars/tools/argwaitforkey.ui @@ -55,7 +55,7 @@ Only simple keys can currently be used; you cannot use modifier keys such as Ctr <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -74,7 +74,7 @@ Only simple keys can currently be used; you cannot use modifier keys such as Ctr <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/tools/argzoom.ui b/kstars/kstars/tools/argzoom.ui index 5d1ea8e8..20e6f2a0 100644 --- a/kstars/kstars/tools/argzoom.ui +++ b/kstars/kstars/tools/argzoom.ui @@ -56,7 +56,7 @@ The Zoom level specifies the number of pixels which span one radian of arc. Rea <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -75,7 +75,7 @@ The Zoom level specifies the number of pixels which span one radian of arc. Rea <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/tools/astrocalc.cpp b/kstars/kstars/tools/astrocalc.cpp index bf477300..3383a1b8 100644 --- a/kstars/kstars/tools/astrocalc.cpp +++ b/kstars/kstars/tools/astrocalc.cpp @@ -374,7 +374,7 @@ void AstroCalc::genVlsrFrame(void) rightPanel = Vlsr; } -TQSize AstroCalc::tqsizeHint() const +TQSize AstroCalc::sizeHint() const { return TQSize(640,430); } diff --git a/kstars/kstars/tools/astrocalc.h b/kstars/kstars/tools/astrocalc.h index fe8b5f49..44daeeb5 100644 --- a/kstars/kstars/tools/astrocalc.h +++ b/kstars/kstars/tools/astrocalc.h @@ -120,7 +120,7 @@ TQ_OBJECT void delRightPanel(void); /**@returns suggested size of calculator window. */ - TQSize tqsizeHint() const; + TQSize sizeHint() const; public slots: /**Determine which item is selected in the function menu TQListBox. diff --git a/kstars/kstars/tools/jmoontool.cpp b/kstars/kstars/tools/jmoontool.cpp index 90303b38..7d7add93 100644 --- a/kstars/kstars/tools/jmoontool.cpp +++ b/kstars/kstars/tools/jmoontool.cpp @@ -49,14 +49,14 @@ JMoonTool::JMoonTool(TQWidget *parent, const char *name) TQLabel *labGn = new TQLabel( "Ganymede", page ); TQLabel *labCa = new TQLabel( "Callisto", page ); - labIo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - labEu->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - labGn->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - labCa->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - labIo->tqsetAlignment( AlignHCenter ); - labEu->tqsetAlignment( AlignHCenter ); - labGn->tqsetAlignment( AlignHCenter ); - labCa->tqsetAlignment( AlignHCenter ); + labIo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + labEu->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + labGn->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + labCa->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + labIo->setAlignment( AlignHCenter ); + labEu->setAlignment( AlignHCenter ); + labGn->setAlignment( AlignHCenter ); + labCa->setAlignment( AlignHCenter ); labIo->setPaletteForegroundColor( colIo ); labEu->setPaletteForegroundColor( colEu ); diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp index 3b5e4524..027172a3 100644 --- a/kstars/kstars/tools/lcgenerator.cpp +++ b/kstars/kstars/tools/lcgenerator.cpp @@ -72,7 +72,7 @@ void LCGenerator::createGUI() StarInfoBox->tqlayout()->setSpacing( 6 ); StarInfoBox->tqlayout()->setMargin( 11 ); StarInfoBoxLayout = new TQVBoxLayout( StarInfoBox->tqlayout() ); - StarInfoBoxLayout->tqsetAlignment( TQt::AlignTop ); + StarInfoBoxLayout->setAlignment( TQt::AlignTop ); DesignHLayout = new TQHBoxLayout( 0, 0, 6, "DesignHLayout"); @@ -128,7 +128,7 @@ void LCGenerator::createGUI() DataSelectBox->tqlayout()->setSpacing( 6 ); DataSelectBox->tqlayout()->setMargin( 11 ); DataSelectBoxLayout = new TQVBoxLayout( DataSelectBox->tqlayout() ); - DataSelectBoxLayout->tqsetAlignment( TQt::AlignTop ); + DataSelectBoxLayout->setAlignment( TQt::AlignTop ); VisualCheck = new TQCheckBox( DataSelectBox, "VisualCheck" ); VisualCheck->setChecked( TRUE ); diff --git a/kstars/kstars/tools/modcalcangdistdlg.ui b/kstars/kstars/tools/modcalcangdistdlg.ui index 77b92b4b..589490b3 100644 --- a/kstars/kstars/tools/modcalcangdistdlg.ui +++ b/kstars/kstars/tools/modcalcangdistdlg.ui @@ -57,7 +57,7 @@ <property name="name"> <cstring>ra0Box</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -71,7 +71,7 @@ <property name="name"> <cstring>dec0Box</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -114,7 +114,7 @@ <property name="name"> <cstring>ra1Box</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -128,7 +128,7 @@ <property name="name"> <cstring>dec1Box</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>145</width> <height>20</height> @@ -201,7 +201,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>146</width> <height>20</height> @@ -226,7 +226,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>145</width> <height>20</height> @@ -256,7 +256,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>102</width> <height>20</height> @@ -275,7 +275,7 @@ <property name="name"> <cstring>distBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -295,7 +295,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>20</height> @@ -314,7 +314,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>171</height> @@ -541,7 +541,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -574,7 +574,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -593,7 +593,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/kstars/kstars/tools/modcalcapcoord.cpp b/kstars/kstars/tools/modcalcapcoord.cpp index 17dfb81f..6eecfe6b 100644 --- a/kstars/kstars/tools/modcalcapcoord.cpp +++ b/kstars/kstars/tools/modcalcapcoord.cpp @@ -64,7 +64,7 @@ void modCalcApCoord::showCurrentTime (void) { KStars *ks = (KStars*) parent()->parent()->parent(); - KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); datBox->setDate( dt.date() ); timBox->setTime( dt.time() ); } @@ -98,7 +98,7 @@ void modCalcApCoord::slotClearCoords(){ rafBox->clearFields(); decfBox->clearFields(); epoch0Name->setText(""); - datBox->setDate(ExtDate::tqcurrentDate()); + datBox->setDate(ExtDate::currentDate()); timBox->setTime(TQTime(0,0,0)); } diff --git a/kstars/kstars/tools/modcalcapcoorddlg.ui b/kstars/kstars/tools/modcalcapcoorddlg.ui index 9953b588..ae08f3a5 100644 --- a/kstars/kstars/tools/modcalcapcoorddlg.ui +++ b/kstars/kstars/tools/modcalcapcoorddlg.ui @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -98,7 +98,7 @@ <property name="name"> <cstring>datBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -125,7 +125,7 @@ <property name="name"> <cstring>ra0Box</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -139,7 +139,7 @@ <property name="name"> <cstring>dec0Box</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -208,7 +208,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> @@ -233,7 +233,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>20</height> @@ -258,7 +258,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>20</height> @@ -288,7 +288,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>102</width> <height>20</height> @@ -323,7 +323,7 @@ <property name="name"> <cstring>rafBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -337,7 +337,7 @@ <property name="name"> <cstring>decfBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -359,7 +359,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>20</height> @@ -378,7 +378,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>70</height> @@ -440,7 +440,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -457,7 +457,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -526,7 +526,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -641,7 +641,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -674,7 +674,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -693,7 +693,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> diff --git a/kstars/kstars/tools/modcalcazel.cpp b/kstars/kstars/tools/modcalcazel.cpp index 818488f5..b405175b 100644 --- a/kstars/kstars/tools/modcalcazel.cpp +++ b/kstars/kstars/tools/modcalcazel.cpp @@ -81,7 +81,7 @@ void modCalcAzel::showCurrentDateTime (void) { KStars *ks = (KStars*) parent()->parent()->parent(); - KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); datBox->setDate( dt.date() ); timBox->setTime( dt.time() ); @@ -179,7 +179,7 @@ void modCalcAzel::slotClearCoords() elBox->clearFields(); epochName->setText(""); - datBox->setDate(ExtDate::tqcurrentDate()); + datBox->setDate(ExtDate::currentDate()); timBox->setTime(TQTime(0,0,0)); } diff --git a/kstars/kstars/tools/modcalcazeldlg.ui b/kstars/kstars/tools/modcalcazeldlg.ui index 1b4b9d2d..5b2dc953 100644 --- a/kstars/kstars/tools/modcalcazeldlg.ui +++ b/kstars/kstars/tools/modcalcazeldlg.ui @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -132,7 +132,7 @@ <property name="name"> <cstring>longBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -154,7 +154,7 @@ <property name="name"> <cstring>latBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -218,13 +218,13 @@ <property name="name"> <cstring>Compute</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>25</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>120</width> <height>32767</height> @@ -238,13 +238,13 @@ <property name="name"> <cstring>Clear</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>25</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>120</width> <height>32767</height> @@ -290,7 +290,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -312,7 +312,7 @@ <property name="name"> <cstring>decBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -334,7 +334,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -361,7 +361,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -383,7 +383,7 @@ <property name="name"> <cstring>azBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -413,7 +413,7 @@ <property name="name"> <cstring>elBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -437,7 +437,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>77</height> @@ -557,7 +557,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -574,7 +574,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -615,7 +615,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -632,7 +632,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -649,7 +649,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -677,7 +677,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -713,7 +713,7 @@ <property name="name"> <cstring>dateBoxBatch</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -817,7 +817,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -850,7 +850,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -869,7 +869,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> diff --git a/kstars/kstars/tools/modcalcdaylength.cpp b/kstars/kstars/tools/modcalcdaylength.cpp index 08f836d2..97346c94 100644 --- a/kstars/kstars/tools/modcalcdaylength.cpp +++ b/kstars/kstars/tools/modcalcdaylength.cpp @@ -40,7 +40,7 @@ modCalcDayLength::~modCalcDayLength() {} void modCalcDayLength::showCurrentDate (void) { - KStarsDateTime dt( KStarsDateTime::tqcurrentDateTime() ); + KStarsDateTime dt( KStarsDateTime::currentDateTime() ); datBox->setDate( dt.date() ); } @@ -71,7 +71,7 @@ void modCalcDayLength::slotClearCoords(){ elTransitBox->clearFields(); // reset to current date - datBox->setDate(ExtDate::tqcurrentDate()); + datBox->setDate(ExtDate::currentDate()); // reset times to 00:00:00 setTimeBox->clearFields(); diff --git a/kstars/kstars/tools/modcalcdaylengthdlg.ui b/kstars/kstars/tools/modcalcdaylengthdlg.ui index 458c7442..cb14f3d5 100644 --- a/kstars/kstars/tools/modcalcdaylengthdlg.ui +++ b/kstars/kstars/tools/modcalcdaylengthdlg.ui @@ -56,7 +56,7 @@ <property name="name"> <cstring>latBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>16</height> @@ -78,7 +78,7 @@ <property name="name"> <cstring>longBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>16</height> @@ -100,7 +100,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>60</width> <height>20</height> @@ -127,7 +127,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>0</height> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -174,7 +174,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>21</height> @@ -199,7 +199,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -224,7 +224,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> @@ -264,7 +264,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>20</height> @@ -294,7 +294,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>20</height> @@ -332,7 +332,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>20</height> @@ -354,7 +354,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>20</height> @@ -384,7 +384,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -427,7 +427,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -457,7 +457,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -479,7 +479,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -499,7 +499,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -518,7 +518,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -537,7 +537,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>110</height> diff --git a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui index 3430d683..ac400e73 100644 --- a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui +++ b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui @@ -58,7 +58,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>97</width> <height>21</height> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>96</width> <height>21</height> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>97</width> <height>21</height> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> @@ -166,7 +166,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> @@ -191,7 +191,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>21</height> @@ -231,7 +231,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -261,7 +261,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -318,7 +318,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -372,7 +372,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -394,7 +394,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -416,7 +416,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>230</width> <height>20</height> @@ -437,7 +437,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>110</height> @@ -486,7 +486,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -503,7 +503,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -548,7 +548,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -565,7 +565,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -742,7 +742,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -775,7 +775,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -794,7 +794,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>16</height> diff --git a/kstars/kstars/tools/modcalcequinox.cpp b/kstars/kstars/tools/modcalcequinox.cpp index 45f66940..416f47e7 100644 --- a/kstars/kstars/tools/modcalcequinox.cpp +++ b/kstars/kstars/tools/modcalcequinox.cpp @@ -56,7 +56,7 @@ int modCalcEquinox::getYear (TQString eName) void modCalcEquinox::showCurrentYear (void) { - KStarsDateTime dt( KStarsDateTime::tqcurrentDateTime() ); + KStarsDateTime dt( KStarsDateTime::currentDateTime() ); yearEdit->setText( TQString( "%1").tqarg( dt.date().year() ) ); } diff --git a/kstars/kstars/tools/modcalcequinoxdlg.ui b/kstars/kstars/tools/modcalcequinoxdlg.ui index 2c459b93..91d918ab 100644 --- a/kstars/kstars/tools/modcalcequinoxdlg.ui +++ b/kstars/kstars/tools/modcalcequinoxdlg.ui @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>21</height> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -133,7 +133,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>31</height> @@ -160,7 +160,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> @@ -185,7 +185,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -210,7 +210,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>21</height> @@ -271,7 +271,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>237</height> @@ -334,7 +334,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>111</width> <height>21</height> @@ -446,7 +446,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -479,7 +479,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -498,7 +498,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>71</height> diff --git a/kstars/kstars/tools/modcalcgalcoorddlg.ui b/kstars/kstars/tools/modcalcgalcoorddlg.ui index e1741cb4..76c1c91a 100644 --- a/kstars/kstars/tools/modcalcgalcoorddlg.ui +++ b/kstars/kstars/tools/modcalcgalcoorddlg.ui @@ -58,7 +58,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>97</width> <height>21</height> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>96</width> <height>21</height> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>97</width> <height>21</height> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> @@ -166,7 +166,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> @@ -191,7 +191,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>21</height> @@ -231,7 +231,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -261,7 +261,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -318,7 +318,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>15</width> <height>20</height> @@ -372,7 +372,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -394,7 +394,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -420,7 +420,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>160</height> @@ -469,7 +469,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -486,7 +486,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -601,7 +601,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -618,7 +618,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -725,7 +725,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -758,7 +758,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -777,7 +777,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>71</height> diff --git a/kstars/kstars/tools/modcalcgeoddlg.ui b/kstars/kstars/tools/modcalcgeoddlg.ui index bb74be14..7e31adde 100644 --- a/kstars/kstars/tools/modcalcgeoddlg.ui +++ b/kstars/kstars/tools/modcalcgeoddlg.ui @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -178,7 +178,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>21</height> @@ -262,7 +262,7 @@ <property name="name"> <cstring>lonGeoBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>70</width> <height>0</height> @@ -276,7 +276,7 @@ <property name="name"> <cstring>latGeoBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>70</width> <height>0</height> @@ -332,7 +332,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>120</height> @@ -600,7 +600,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -633,7 +633,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -652,7 +652,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> diff --git a/kstars/kstars/tools/modcalcjd.cpp b/kstars/kstars/tools/modcalcjd.cpp index 7fb71c4c..8b87b998 100644 --- a/kstars/kstars/tools/modcalcjd.cpp +++ b/kstars/kstars/tools/modcalcjd.cpp @@ -95,7 +95,7 @@ void modCalcJD::slotClearTime (void) { JdName->setText (""); MjdName->setText (""); - datBox->setDate( ExtDate::tqcurrentDate() ); + datBox->setDate( ExtDate::currentDate() ); timBox->setTime(TQTime(0,0,0)); } @@ -103,7 +103,7 @@ void modCalcJD::showCurrentTime (void) { KStars *ks = (KStars*) parent()->parent()->parent(); - KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); datBox->setDate( dt.date() ); timBox->setTime( dt.time() ); computeFromCalendar(); diff --git a/kstars/kstars/tools/modcalcjddlg.ui b/kstars/kstars/tools/modcalcjddlg.ui index c94441cc..66839f81 100644 --- a/kstars/kstars/tools/modcalcjddlg.ui +++ b/kstars/kstars/tools/modcalcjddlg.ui @@ -129,7 +129,7 @@ <property name="name"> <cstring>JdName</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>130</width> <height>0</height> @@ -161,7 +161,7 @@ <property name="name"> <cstring>MjdName</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>130</width> <height>0</height> @@ -193,7 +193,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -212,7 +212,7 @@ <property name="name"> <cstring>timBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -229,7 +229,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -256,7 +256,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -300,7 +300,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>23</width> <height>20</height> @@ -333,7 +333,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>39</width> <height>21</height> @@ -352,13 +352,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>25</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>30</height> @@ -378,7 +378,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>37</width> <height>20</height> @@ -397,13 +397,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>25</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>30</height> @@ -423,7 +423,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>38</width> <height>20</height> @@ -442,7 +442,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/kstars/kstars/tools/modcalcplanets.cpp b/kstars/kstars/tools/modcalcplanets.cpp index 8273f6be..42545737 100644 --- a/kstars/kstars/tools/modcalcplanets.cpp +++ b/kstars/kstars/tools/modcalcplanets.cpp @@ -51,7 +51,7 @@ modCalcPlanets::~modCalcPlanets(){ void modCalcPlanets::showCurrentDateTime (void) { KStars *ks = (KStars*) parent()->parent()->parent(); // TQSplitter->AstroCalc->KStars - KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); dateBox->setDate( dt.date() ); timeBox->setTime( dt.time() ); diff --git a/kstars/kstars/tools/modcalcplanetsdlg.ui b/kstars/kstars/tools/modcalcplanetsdlg.ui index 2f25aa40..0f781ad1 100644 --- a/kstars/kstars/tools/modcalcplanetsdlg.ui +++ b/kstars/kstars/tools/modcalcplanetsdlg.ui @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>21</height> @@ -148,7 +148,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -177,7 +177,7 @@ <property name="name"> <cstring>dateBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>0</height> @@ -199,7 +199,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -234,7 +234,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -261,7 +261,7 @@ <property name="name"> <cstring>longBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -283,7 +283,7 @@ <property name="name"> <cstring>latBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -305,7 +305,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -347,7 +347,7 @@ <property name="name"> <cstring>raBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -374,7 +374,7 @@ <property name="name"> <cstring>decBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -393,7 +393,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -433,7 +433,7 @@ <property name="name"> <cstring>altBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -452,7 +452,7 @@ <property name="name"> <cstring>azBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -471,7 +471,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -513,7 +513,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -535,7 +535,7 @@ <property name="name"> <cstring>helLongBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -554,7 +554,7 @@ <property name="name"> <cstring>helLatBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -581,7 +581,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -616,7 +616,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -638,7 +638,7 @@ <property name="name"> <cstring>geoLongBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -649,7 +649,7 @@ <property name="name"> <cstring>geoLatBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -676,7 +676,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -703,7 +703,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>111</width> <height>20</height> @@ -728,7 +728,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>21</height> @@ -753,7 +753,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>20</height> @@ -772,7 +772,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>60</height> @@ -829,7 +829,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -857,7 +857,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -882,7 +882,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -1159,7 +1159,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -1192,7 +1192,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -1211,7 +1211,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/kstars/kstars/tools/modcalcprec.cpp b/kstars/kstars/tools/modcalcprec.cpp index 05ef4718..10665daa 100644 --- a/kstars/kstars/tools/modcalcprec.cpp +++ b/kstars/kstars/tools/modcalcprec.cpp @@ -63,7 +63,7 @@ TQString modCalcPrec:: showCurrentEpoch () { } double modCalcPrec::setCurrentEpoch () { - return KStarsDateTime::tqcurrentDateTime().epoch(); + return KStarsDateTime::currentDateTime().epoch(); } double modCalcPrec::getEpoch (TQString eName) { diff --git a/kstars/kstars/tools/modcalcprecdlg.ui b/kstars/kstars/tools/modcalcprecdlg.ui index 3811922b..57f720ba 100644 --- a/kstars/kstars/tools/modcalcprecdlg.ui +++ b/kstars/kstars/tools/modcalcprecdlg.ui @@ -55,7 +55,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>98</width> <height>20</height> @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>98</width> <height>20</height> @@ -167,7 +167,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>20</height> @@ -192,7 +192,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -217,7 +217,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>21</height> @@ -236,7 +236,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -264,7 +264,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>20</height> @@ -323,7 +323,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>20</height> @@ -342,7 +342,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>70</height> @@ -567,7 +567,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -600,7 +600,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -619,7 +619,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>30</height> diff --git a/kstars/kstars/tools/modcalcsidtime.cpp b/kstars/kstars/tools/modcalcsidtime.cpp index d973d902..987087ba 100644 --- a/kstars/kstars/tools/modcalcsidtime.cpp +++ b/kstars/kstars/tools/modcalcsidtime.cpp @@ -99,7 +99,7 @@ dms modCalcSidTime::getLongitude( void ) } void modCalcSidTime::slotClearFields(){ - datBox->setDate(ExtDate::tqcurrentDate()); + datBox->setDate(ExtDate::currentDate()); TQTime time(0,0,0); UtBox->setTime(time); StBox->setTime(time); diff --git a/kstars/kstars/tools/modcalcsidtimedlg.ui b/kstars/kstars/tools/modcalcsidtimedlg.ui index 055446fd..37c5e7cd 100644 --- a/kstars/kstars/tools/modcalcsidtimedlg.ui +++ b/kstars/kstars/tools/modcalcsidtimedlg.ui @@ -111,7 +111,7 @@ <property name="name"> <cstring>longBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -125,7 +125,7 @@ <property name="name"> <cstring>datBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>21</height> @@ -182,7 +182,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>21</height> @@ -207,7 +207,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -245,7 +245,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -275,7 +275,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -305,7 +305,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -335,7 +335,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -356,7 +356,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>204</height> @@ -391,7 +391,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -452,7 +452,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -474,7 +474,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -501,7 +501,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -559,7 +559,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -663,7 +663,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -696,7 +696,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -715,7 +715,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>16</height> diff --git a/kstars/kstars/tools/modcalcvlsr.cpp b/kstars/kstars/tools/modcalcvlsr.cpp index 5a499c5c..fe5ca2e8 100644 --- a/kstars/kstars/tools/modcalcvlsr.cpp +++ b/kstars/kstars/tools/modcalcvlsr.cpp @@ -143,7 +143,7 @@ void modCalcVlsr::showCurrentDateTime (void) { KStars *ks = (KStars*) parent()->parent()->parent(); - KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); datBox->setDate( dt.date() ); timBox->setTime( dt.time() ); @@ -212,7 +212,7 @@ void modCalcVlsr::slotClearCoords() vGeoBox->setText(""); vTopoBox->setText(""); - datBox->setDate(ExtDate::tqcurrentDate()); + datBox->setDate(ExtDate::currentDate()); timBox->setTime(TQTime(0,0,0)); } diff --git a/kstars/kstars/tools/modcalcvlsrdlg.ui b/kstars/kstars/tools/modcalcvlsrdlg.ui index e096407d..ce0a1693 100644 --- a/kstars/kstars/tools/modcalcvlsrdlg.ui +++ b/kstars/kstars/tools/modcalcvlsrdlg.ui @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -93,7 +93,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -155,7 +155,7 @@ <property name="name"> <cstring>heightBox</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>1000</width> <height>32767</height> @@ -169,7 +169,7 @@ <property name="name"> <cstring>longBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -207,7 +207,7 @@ <property name="name"> <cstring>latBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -239,7 +239,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>120</width> <height>31</height> @@ -272,7 +272,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -294,7 +294,7 @@ <property name="name"> <cstring>decBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -316,7 +316,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -343,7 +343,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>100</width> <height>20</height> @@ -435,7 +435,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>21</height> @@ -510,13 +510,13 @@ <property name="name"> <cstring>Compute</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>25</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>120</width> <height>32767</height> @@ -530,13 +530,13 @@ <property name="name"> <cstring>Clear</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>25</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>120</width> <height>32767</height> @@ -558,7 +558,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -675,7 +675,7 @@ <property name="name"> <cstring>dateBoxBatch</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -689,7 +689,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -706,7 +706,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -736,7 +736,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -764,7 +764,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -953,7 +953,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -986,7 +986,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -1005,7 +1005,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> diff --git a/kstars/kstars/tools/observinglistui.ui b/kstars/kstars/tools/observinglistui.ui index 57a1403b..07922d8e 100644 --- a/kstars/kstars/tools/observinglistui.ui +++ b/kstars/kstars/tools/observinglistui.ui @@ -39,13 +39,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -73,13 +73,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -107,13 +107,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -141,13 +141,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -173,7 +173,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>350</width> <height>20</height> @@ -192,13 +192,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -350,7 +350,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -488,7 +488,7 @@ <verstretch>4</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>100</height> @@ -534,13 +534,13 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>100</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>160</height> diff --git a/kstars/kstars/tools/obslistwizardui.ui b/kstars/kstars/tools/obslistwizardui.ui index b5bb1eaf..cf4ed2d9 100644 --- a/kstars/kstars/tools/obslistwizardui.ui +++ b/kstars/kstars/tools/obslistwizardui.ui @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>90</height> @@ -371,7 +371,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -393,7 +393,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -455,7 +455,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -477,7 +477,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -496,7 +496,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>215</height> @@ -574,7 +574,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -596,7 +596,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -629,7 +629,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>170</height> @@ -669,7 +669,7 @@ <property name="name"> <cstring>Date</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>160</width> <height>0</height> @@ -686,7 +686,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -752,7 +752,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -780,7 +780,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -799,7 +799,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>176</height> @@ -861,7 +861,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>295</width> <height>20</height> @@ -895,7 +895,7 @@ have &no magnitude</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>179</height> diff --git a/kstars/kstars/tools/optionstreeview.ui b/kstars/kstars/tools/optionstreeview.ui index 4a9e11e3..5e4e66b2 100644 --- a/kstars/kstars/tools/optionstreeview.ui +++ b/kstars/kstars/tools/optionstreeview.ui @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> diff --git a/kstars/kstars/tools/planetviewer.cpp b/kstars/kstars/tools/planetviewer.cpp index d036b925..bde44c2c 100644 --- a/kstars/kstars/tools/planetviewer.cpp +++ b/kstars/kstars/tools/planetviewer.cpp @@ -233,7 +233,7 @@ PVPlotWidget::PVPlotWidget( double x1, double x2, double y1, double y2, TQWidget mouseButtonDown(false), oldx(0), oldy(0) { setFocusPolicy( TQ_StrongFocus ); setMouseTracking (true); - pv = (PlanetViewer*)tqtopLevelWidget(); + pv = (PlanetViewer*)topLevelWidget(); } PVPlotWidget::PVPlotWidget( TQWidget *parent, const char *name ) : @@ -241,7 +241,7 @@ PVPlotWidget::PVPlotWidget( TQWidget *parent, const char *name ) : mouseButtonDown(false), oldx(0), oldy(0) { setFocusPolicy( TQ_StrongFocus ); setMouseTracking (true); - pv = (PlanetViewer*)tqtopLevelWidget(); + pv = (PlanetViewer*)topLevelWidget(); } PVPlotWidget::~ PVPlotWidget() {} @@ -416,7 +416,7 @@ void PVPlotWidget::mouseMoveEvent( TQMouseEvent *e ) { setLimits( xc - 0.5*dataWidth(), xc + 0.5*dataWidth(), yc - 0.5*dataHeight(), yc + 0.5*dataHeight() ); update(); - kapp->tqprocessEvents(20); + kapp->processEvents(20); } oldx = e->x(); diff --git a/kstars/kstars/tools/planetviewerui.ui b/kstars/kstars/tools/planetviewerui.ui index d2ac73a7..acd5a81c 100644 --- a/kstars/kstars/tools/planetviewerui.ui +++ b/kstars/kstars/tools/planetviewerui.ui @@ -44,7 +44,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>34</width> <height>34</height> @@ -69,7 +69,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>120</width> <height>20</height> diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp index 183b22d4..ff9d48f5 100644 --- a/kstars/kstars/tools/scriptbuilder.cpp +++ b/kstars/kstars/tools/scriptbuilder.cpp @@ -903,7 +903,7 @@ void ScriptBuilder::slotRunScript() { if ( ! p.start( KProcess::DontCare ) ) kdDebug() << "Process did not start." << endl; - while ( p.isRunning() ) kapp->tqprocessEvents( 50 ); //otherwise tempfile may get deleted before script completes. + while ( p.isRunning() ) kapp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes. //delete temp file if ( f.exists() ) f.remove(); @@ -920,7 +920,7 @@ void ScriptBuilder::writeScript( TQTextStream &ostream ) { ostream << "#!/bin/bash" << endl; ostream << "#KStars DCOP script: " << currentScriptName << endl; ostream << "#by " << currentAuthor << endl; - ostream << "#last modified: " << KStarsDateTime::tqcurrentDateTime().toString() << endl; + ostream << "#last modified: " << KStarsDateTime::currentDateTime().toString() << endl; ostream << "#" << endl; ostream << "KSTARS=`dcopfind -a 'kstars*'`" << endl; ostream << "MAIN=KStarsInterface" << endl; @@ -1322,7 +1322,7 @@ void ScriptBuilder::slotArgWidget() { if (ok) month = sf->argVal(1).toInt(&ok); if (ok) day = sf->argVal(2).toInt(&ok); if (ok) argSetLocalTime->DateBox->setDate( ExtDate( year, month, day ) ); - else argSetLocalTime->DateBox->setDate( ExtDate::tqcurrentDate() ); + else argSetLocalTime->DateBox->setDate( ExtDate::currentDate() ); hour = sf->argVal(3).toInt(&ok); if ( sf->argVal(3).isEmpty() ) ok = false; diff --git a/kstars/kstars/tools/scriptbuilderui.ui b/kstars/kstars/tools/scriptbuilderui.ui index 7b6d8feb..aecbe3e9 100644 --- a/kstars/kstars/tools/scriptbuilderui.ui +++ b/kstars/kstars/tools/scriptbuilderui.ui @@ -39,13 +39,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -73,13 +73,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -107,13 +107,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -141,13 +141,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -167,13 +167,13 @@ <property name="name"> <cstring>RunButton</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -199,7 +199,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>490</width> <height>20</height> @@ -277,13 +277,13 @@ <property name="name"> <cstring>AddButton</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -304,13 +304,13 @@ <property name="name"> <cstring>RemoveButton</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -330,13 +330,13 @@ <property name="name"> <cstring>CopyButton</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -356,13 +356,13 @@ <property name="name"> <cstring>UpButton</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -382,13 +382,13 @@ <property name="name"> <cstring>DownButton</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -414,7 +414,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>118</height> @@ -437,7 +437,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>140</height> @@ -602,7 +602,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>20</height> diff --git a/kstars/kstars/tools/scriptnamedialog.ui b/kstars/kstars/tools/scriptnamedialog.ui index fb176c14..c19007a9 100644 --- a/kstars/kstars/tools/scriptnamedialog.ui +++ b/kstars/kstars/tools/scriptnamedialog.ui @@ -91,7 +91,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>330</width> <height>20</height> diff --git a/kstars/kstars/tools/wutdialogui.ui b/kstars/kstars/tools/wutdialogui.ui index 2bdeb50e..77d52ee5 100644 --- a/kstars/kstars/tools/wutdialogui.ui +++ b/kstars/kstars/tools/wutdialogui.ui @@ -47,7 +47,7 @@ <property name="name"> <cstring>LocationLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -106,7 +106,7 @@ <property name="name"> <cstring>DateLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>108</width> <height>20</height> @@ -241,7 +241,7 @@ <property name="name"> <cstring>SunRiseLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -261,7 +261,7 @@ <property name="name"> <cstring>MoonRiseLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -281,7 +281,7 @@ <property name="name"> <cstring>MoonSetLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -301,7 +301,7 @@ <property name="name"> <cstring>SunSetLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -321,7 +321,7 @@ <property name="name"> <cstring>NightDurationLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -341,7 +341,7 @@ <property name="name"> <cstring>MoonIllumLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -377,7 +377,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>164</width> <height>12</height> @@ -402,7 +402,7 @@ <property name="name"> <cstring>ObjectListBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -478,7 +478,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -519,7 +519,7 @@ <property name="name"> <cstring>CategoryListBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> |