diff options
Diffstat (limited to 'kstars')
225 files changed, 1729 insertions, 1729 deletions
diff --git a/kstars/kstars/addcatdialog.cpp b/kstars/kstars/addcatdialog.cpp index 07af36ff..5f24caef 100644 --- a/kstars/kstars/addcatdialog.cpp +++ b/kstars/kstars/addcatdialog.cpp @@ -99,14 +99,14 @@ void AddCatDialog::slotHelp() { * Right Ascension: colon-delimited hh:mm:ss.s or floating-point value * Declination: colon-delimited dd:mm:ss.s or floating-point value * Object type: integer value, one of [ 0,1,2,3,4,5,6,7,8 ] - * Common name: string value (if it contains a space, it *must* be enclosed in quotes!) + * Common name: string value (if it tqcontains a space, it *must* be enclosed in quotes!) * Magnitude: floating-point value * Major axis: floating-point value (length of major axis in arcmin) * Minor axis: floating-point value (length of minor axis in arcmin) * Position angle: floating-point value (position angle, in degrees) */ bool AddCatDialog::validateDataFile() { - KStars *ksw = (KStars*) topLevelWidget()->parent(); + KStars *ksw = (KStars*) tqtopLevelWidget()->parent(); //Create the catalog file contents: first the header CatalogContents = writeCatalogHeader(); @@ -201,8 +201,8 @@ void AddCatDialog::slotPreviewCatalog() { void AddCatDialog::slotCreateCatalog() { if ( validateDataFile() ) { - //CatalogContents now contains the text for the catalog file, - //and objList contains the parsed objects + //CatalogContents now tqcontains the text for the catalog file, + //and objList tqcontains the parsed objects //Warn user if file exists! if ( TQFile::exists( acd->CatalogURL->url() ) ) diff --git a/kstars/kstars/addcatdialogui.ui b/kstars/kstars/addcatdialogui.ui index 39488947..e76026a0 100644 --- a/kstars/kstars/addcatdialogui.ui +++ b/kstars/kstars/addcatdialogui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AddCatDialogUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -75,7 +75,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <vbox> <property name="name"> @@ -109,7 +109,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> @@ -145,7 +145,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout27</cstring> + <cstring>tqlayout27</cstring> </property> <grid> <property name="name"> @@ -177,7 +177,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> @@ -218,7 +218,7 @@ </widget> <widget class="QLayoutWidget" row="1" column="2"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> @@ -234,7 +234,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -258,7 +258,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> @@ -308,7 +308,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -350,7 +350,7 @@ <tabstop>CatalogName</tabstop> <tabstop>CatalogURL</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/addlinkdialogui.ui b/kstars/kstars/addlinkdialogui.ui index 3e5bdf53..9f1cb5e4 100644 --- a/kstars/kstars/addlinkdialogui.ui +++ b/kstars/kstars/addlinkdialogui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AddLinkDialogUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -47,7 +47,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> @@ -86,7 +86,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>450</width> <height>0</height> @@ -97,7 +97,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -113,7 +113,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -149,5 +149,5 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/ccdpreviewui.ui b/kstars/kstars/ccdpreviewui.ui index 93a4d804..98ca6509 100644 --- a/kstars/kstars/ccdpreviewui.ui +++ b/kstars/kstars/ccdpreviewui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>CCDPreviewForm</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -31,13 +31,13 @@ <property name="name"> <cstring>playB</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -57,13 +57,13 @@ <property name="name"> <cstring>captureB</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -97,7 +97,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>300</width> <height>21</height> @@ -118,7 +118,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>160</width> <height>120</height> @@ -133,7 +133,7 @@ </widget> <widget class="QLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout19</cstring> + <cstring>tqlayout19</cstring> </property> <hbox> <property name="name"> @@ -141,7 +141,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <vbox> <property name="name"> @@ -237,7 +237,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <vbox> <property name="name"> @@ -317,7 +317,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <hbox> <property name="name"> @@ -325,7 +325,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <vbox> <property name="name"> @@ -351,7 +351,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -363,7 +363,7 @@ <property name="text"> <string>--</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="toolTip" stdset="0"> @@ -374,7 +374,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> @@ -425,7 +425,7 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/ccdpreviewwg.cpp b/kstars/kstars/ccdpreviewwg.cpp index 18ee3892..71f89b17 100644 --- a/kstars/kstars/ccdpreviewwg.cpp +++ b/kstars/kstars/ccdpreviewwg.cpp @@ -168,8 +168,8 @@ void CCDPreviewWG::setCtrl(int wd, int ht,int po, int bpp,unsigned long mgd) for (i=0;i<streamFrame->totalBaseCount;i++) { streamFrame->streamBuffer[i]=0; } - resize(wd + layout()->margin() * 2 , ht + playB->height() + brightnessLabel->height() - + contrastLabel->height() + gammaLabel->height() + focalEdit->height() + FWHMLabel->height() + layout()->margin() * 2 + layout()->spacing()*6); + resize(wd + tqlayout()->margin() * 2 , ht + playB->height() + brightnessLabel->height() + + contrastLabel->height() + gammaLabel->height() + focalEdit->height() + FWHMLabel->height() + tqlayout()->margin() * 2 + tqlayout()->spacing()*6); streamFrame->resize(wd, ht); } @@ -204,7 +204,7 @@ void CCDPreviewWG::updateFWHM() void CCDPreviewWG::resizeEvent(TQResizeEvent *ev) { - streamFrame->resize(ev->size().width() - layout()->margin() * 2, ev->size().height() - playB->height() - layout()->margin() * 2 - layout()->spacing()); + streamFrame->resize(ev->size().width() - tqlayout()->margin() * 2, ev->size().height() - playB->height() - tqlayout()->margin() * 2 - tqlayout()->spacing()); } void CCDPreviewWG::playPressed() @@ -284,9 +284,9 @@ CCDVideoWG::CCDVideoWG(TQWidget * parent, const char * name) : TQFrame(parent, n displayBuffer = NULL; grayTable=new QRgb[256]; for (int i=0;i<256;i++) { - grayTable[i]=qRgb(i,i,i); + grayTable[i]=tqRgb(i,i,i); } - grayTable[255]=qRgb(255,0,0); + grayTable[255]=tqRgb(255,0,0); } CCDVideoWG::~CCDVideoWG() @@ -375,7 +375,7 @@ void CCDVideoWG::redrawVideoWG(void) if (val>255.0) { val=255.0; } - val=qRound(val*(254.0/255.0)); + val=tqRound(val*(254.0/255.0)); displayBuffer[Width*y+x]=(int) val; } else { diff --git a/kstars/kstars/colorscheme.cpp b/kstars/kstars/colorscheme.cpp index 5449c48e..308a875a 100644 --- a/kstars/kstars/colorscheme.cpp +++ b/kstars/kstars/colorscheme.cpp @@ -172,7 +172,7 @@ TQString ColorScheme::nameFromKey( const TQString &key ) const { } void ColorScheme::setColor( const TQString &key, const TQString &color ) { - //We can blindly insert() the new value; if the key exists, the old value is replaced + //We can blindly insert() the new value; if the key exists, the old value is tqreplaced Palette.insert( key, color ); } @@ -191,7 +191,7 @@ bool ColorScheme::load( const TQString &filename ) { bool ok(false); int newmode = line.left(1).toInt( &ok ); if ( ok ) setStarColorMode( newmode ); - if ( line.contains(':') ) { + if ( line.tqcontains(':') ) { int newintens = line.mid( line.find(':')+1, 2 ).toInt( &ok ); if ( ok ) setStarColorIntensity( newintens ); } @@ -201,7 +201,7 @@ bool ColorScheme::load( const TQString &filename ) { while ( !stream.eof() ) { line = stream.readLine(); - if ( line.contains(':')==1 ) { //the new color preset format contains a ":" in each line, followed by the name of the color + if ( line.tqcontains(':')==1 ) { //the new color preset format tqcontains a ":" in each line, followed by the name of the color ++inew; if ( iold ) return false; //we read at least one line without a colon...file is corrupted. @@ -209,11 +209,11 @@ bool ColorScheme::load( const TQString &filename ) { TQString tkey = line.mid( line.find(':')+1 ).stripWhiteSpace(); TQString tname = line.left( line.find(':')-1 ); - if ( KeyName.contains( tkey ) ) { + if ( KeyName.tqcontains( tkey ) ) { setColor( tkey, tname ); } else { //attempt to translate from old color ID TQString k( line.mid( 5 ).stripWhiteSpace() + "Color" ); - if ( KeyName.contains( k ) ) { + if ( KeyName.tqcontains( k ) ) { setColor( k, tname ); } else { kdWarning() << "Could not use the key \"" << tkey << @@ -243,12 +243,12 @@ bool ColorScheme::load( const TQString &filename ) { bool ColorScheme::save( const TQString &name ) { TQFile file; - //Construct a file name from the scheme name. Make lowercase, replace spaces with "-", + //Construct a file name from the scheme name. Make lowercase, tqreplace spaces with "-", //and append ".colors". TQString filename = name.lower().stripWhiteSpace(); if ( !filename.isEmpty() ) { for( unsigned int i=0; i<filename.length(); ++i) - if ( filename.at(i)==' ' ) filename.replace( i, 1, "-" ); + if ( filename.at(i)==' ' ) filename.tqreplace( i, 1, "-" ); filename = filename.append( ".colors" ); file.setName( locateLocal( "appdata", filename ) ); //determine filename in local user KDE directory tree. diff --git a/kstars/kstars/colorscheme.h b/kstars/kstars/colorscheme.h index e61c455b..5c053434 100644 --- a/kstars/kstars/colorscheme.h +++ b/kstars/kstars/colorscheme.h @@ -53,7 +53,7 @@ class ColorScheme { */ ~ColorScheme(); - /**@return true if the Palette contains the given key name + /**@return true if the Palette tqcontains the given key name */ bool hasColorNamed( const TQString &name ) const { return ( ! Palette[ name ].isEmpty() ); } diff --git a/kstars/kstars/conbridlg.cpp b/kstars/kstars/conbridlg.cpp index ec9aa240..4b57b431 100644 --- a/kstars/kstars/conbridlg.cpp +++ b/kstars/kstars/conbridlg.cpp @@ -231,7 +231,7 @@ void ContrastBrightnessDlg::setBrightness(int brightnessValue) } -TQSize ContrastBrightnessDlg::sizeHint() const +TQSize ContrastBrightnessDlg::tqsizeHint() const { return TQSize(400,130); } diff --git a/kstars/kstars/conbridlg.h b/kstars/kstars/conbridlg.h index 62193855..25db7dac 100644 --- a/kstars/kstars/conbridlg.h +++ b/kstars/kstars/conbridlg.h @@ -33,7 +33,7 @@ class ContrastBrightnessDlg : public KDialogBase { ContrastBrightnessDlg(TQWidget *parent=0); ~ContrastBrightnessDlg(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; void range(int min, int max, int & num); void range(float min, float max, float & num); diff --git a/kstars/kstars/contrastbrightnessgui.ui b/kstars/kstars/contrastbrightnessgui.ui index b05db5b3..7d209a1c 100644 --- a/kstars/kstars/contrastbrightnessgui.ui +++ b/kstars/kstars/contrastbrightnessgui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ConBriForm</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -118,7 +118,7 @@ <slot>setValue(int)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kstars/kstars/deepskyobject.cpp b/kstars/kstars/deepskyobject.cpp index 280729e5..5e0597f5 100644 --- a/kstars/kstars/deepskyobject.cpp +++ b/kstars/kstars/deepskyobject.cpp @@ -88,7 +88,7 @@ void DeepSkyObject::setCatalog( const TQString &cat ) { TQImage* DeepSkyObject::readImage( void ) { TQFile file; if ( Image==0 ) { //Image not currently set; try to load it from disk. - TQString fname = name().lower().replace( TQRegExp(" "), "" ) + ".png"; + TQString fname = name().lower().tqreplace( TQRegExp(" "), "" ) + ".png"; if ( KSUtils::openDataFile( file, fname ) ) { file.close(); diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp index 4bbb6a91..df452a4d 100644 --- a/kstars/kstars/detaildialog.cpp +++ b/kstars/kstars/detaildialog.cpp @@ -313,7 +313,7 @@ void DetailDialog::createPositionTab( const KStarsDateTime &ut, GeoLocation *geo //because we don't want a thousands-place separator! TQString sEpoch = TQString::number( ut.epoch(), 'f', 1 ); //Replace the decimal point with localized decimal symbol - sEpoch.replace( ".", KGlobal::locale()->decimalSymbol() ); + sEpoch.tqreplace( ".", KGlobal::locale()->decimalSymbol() ); Pos->RALabel->setText( i18n( "RA (%1):" ).arg( sEpoch ) ); Pos->DecLabel->setText( i18n( "Dec (%1):" ).arg( sEpoch ) ); @@ -556,7 +556,7 @@ void DetailDialog::editLinkDialog() editLinkField = new TQLineEdit(editFrame, "lineedit"); editLinkField->setMinimumWidth(300); editLinkField->home(false); - editLinkLayout = new TQHBoxLayout(editFrame, 6, 6, "editlinklayout"); + editLinkLayout = new TQHBoxLayout(editFrame, 6, 6, "editlinktqlayout"); editLinkLayout->addWidget(editLinkURL); editLinkLayout->addWidget(editLinkField); @@ -1040,7 +1040,7 @@ void DetailDialog::showThumbnail() { //If no image found, load "no image" image //If that isn't found, make it blank. TQFile file; - TQString fname = "thumb-" + selectedObject->name().lower().replace( TQRegExp(" "), "" ) + ".png"; + TQString fname = "thumb-" + selectedObject->name().lower().tqreplace( TQRegExp(" "), "" ) + ".png"; if ( KSUtils::openDataFile( file, fname ) ) { file.close(); Thumbnail->load( file.name(), "PNG" ); @@ -1060,7 +1060,7 @@ void DetailDialog::updateThumbnail() { if ( tp.exec() == TQDialog::Accepted ) { TQString fname = locateLocal( "appdata", "thumb-" - + selectedObject->name().lower().replace( TQRegExp(" "), "" ) + ".png" ); + + selectedObject->name().lower().tqreplace( TQRegExp(" "), "" ) + ".png" ); Data->Image->setPixmap( *(tp.image()) ); diff --git a/kstars/kstars/details_data.ui b/kstars/kstars/details_data.ui index 2f7893b0..0abdf111 100644 --- a/kstars/kstars/details_data.ui +++ b/kstars/kstars/details_data.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>DetailsDataUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout67</cstring> + <cstring>tqlayout67</cstring> </property> <vbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="text"> <string><p align="center">Primary Name, Other Names</p></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -76,7 +76,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout20</cstring> + <cstring>tqlayout20</cstring> </property> <vbox> <property name="name"> @@ -84,7 +84,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> @@ -92,7 +92,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout60_2</cstring> + <cstring>tqlayout60_2</cstring> </property> <hbox> <property name="name"> @@ -141,7 +141,7 @@ <property name="text"> <string>in</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -180,7 +180,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>140</width> <height>20</height> @@ -199,7 +199,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -208,7 +208,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout19</cstring> + <cstring>tqlayout19</cstring> </property> <hbox> <property name="name"> @@ -235,7 +235,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>77</width> <height>20</height> @@ -248,7 +248,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout22</cstring> + <cstring>tqlayout22</cstring> </property> <vbox> <property name="name"> @@ -256,7 +256,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout21</cstring> + <cstring>tqlayout21</cstring> </property> <grid> <property name="name"> @@ -345,7 +345,7 @@ <property name="text"> <string>Magnitude:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -377,7 +377,7 @@ <property name="text"> <string>Distance:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -433,7 +433,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -449,7 +449,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>8</height> @@ -458,7 +458,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout36_2</cstring> + <cstring>tqlayout36_2</cstring> </property> <property name="paletteForegroundColor"> <color> @@ -481,7 +481,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -490,7 +490,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout35_2</cstring> + <cstring>tqlayout35_2</cstring> </property> <vbox> <property name="name"> @@ -532,7 +532,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -557,7 +557,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>8</height> @@ -590,7 +590,7 @@ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/details_database.ui b/kstars/kstars/details_database.ui index a32f4b30..6c6c5770 100644 --- a/kstars/kstars/details_database.ui +++ b/kstars/kstars/details_database.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>DetailsDatabaseUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -48,7 +48,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kstars/kstars/details_links.ui b/kstars/kstars/details_links.ui index dbe0b75e..172fb49b 100644 --- a/kstars/kstars/details_links.ui +++ b/kstars/kstars/details_links.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>DetailsLinksUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout79</cstring> + <cstring>tqlayout79</cstring> </property> <vbox> <property name="name"> @@ -66,7 +66,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -75,7 +75,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout80</cstring> + <cstring>tqlayout80</cstring> </property> <vbox> <property name="name"> @@ -115,7 +115,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout91</cstring> + <cstring>tqlayout91</cstring> </property> <hbox> <property name="name"> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -176,7 +176,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistbox.h</includehint> <includehint>klistbox.h</includehint> diff --git a/kstars/kstars/details_log.ui b/kstars/kstars/details_log.ui index 51d337f8..af57230c 100644 --- a/kstars/kstars/details_log.ui +++ b/kstars/kstars/details_log.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>DetailsLogUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -73,5 +73,5 @@ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/details_position.ui b/kstars/kstars/details_position.ui index f2e96b9b..efe24f89 100644 --- a/kstars/kstars/details_position.ui +++ b/kstars/kstars/details_position.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>DetailsPositionUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout56</cstring> + <cstring>tqlayout56</cstring> </property> <vbox> <property name="name"> @@ -70,7 +70,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout54</cstring> + <cstring>tqlayout54</cstring> </property> <hbox> <property name="name"> @@ -78,7 +78,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout50</cstring> + <cstring>tqlayout50</cstring> </property> <grid> <property name="name"> @@ -154,7 +154,7 @@ <property name="text"> <string>Dec (2000.0):</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -178,7 +178,7 @@ <property name="text"> <string>RA (2000.0):</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -194,7 +194,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>90</width> <height>16</height> @@ -203,7 +203,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout50_2</cstring> + <cstring>tqlayout50_2</cstring> </property> <grid> <property name="name"> @@ -279,7 +279,7 @@ <property name="text"> <string>Altitude:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -303,7 +303,7 @@ <property name="text"> <string>Azimuth:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -321,7 +321,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -330,7 +330,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout55</cstring> + <cstring>tqlayout55</cstring> </property> <hbox> <property name="name"> @@ -338,7 +338,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout53</cstring> + <cstring>tqlayout53</cstring> </property> <hbox> <property name="name"> @@ -364,7 +364,7 @@ <property name="text"> <string>Hour angle:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -405,7 +405,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>170</width> <height>20</height> @@ -414,7 +414,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout52</cstring> + <cstring>tqlayout52</cstring> </property> <hbox> <property name="name"> @@ -440,7 +440,7 @@ <property name="text"> <string>Airmass:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -487,7 +487,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -496,7 +496,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout76</cstring> + <cstring>tqlayout76</cstring> </property> <vbox> <property name="name"> @@ -545,7 +545,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout142</cstring> + <cstring>tqlayout142</cstring> </property> <hbox> <property name="name"> @@ -553,7 +553,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout141</cstring> + <cstring>tqlayout141</cstring> </property> <grid> <property name="name"> @@ -629,7 +629,7 @@ <property name="text"> <string>Set time:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -653,7 +653,7 @@ <property name="text"> <string>Transit time:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -677,7 +677,7 @@ <property name="text"> <string>Rise time:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -718,7 +718,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>83</width> <height>20</height> @@ -727,7 +727,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout140</cstring> + <cstring>tqlayout140</cstring> </property> <grid> <property name="name"> @@ -778,7 +778,7 @@ <property name="text"> <string>Azimuth at set:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -802,7 +802,7 @@ <property name="text"> <string>Altitude at transit:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -876,7 +876,7 @@ <property name="text"> <string>Azimuth at rise:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -894,7 +894,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -909,7 +909,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint> diff --git a/kstars/kstars/devicemanager.cpp b/kstars/kstars/devicemanager.cpp index 0f95455c..80ea0947 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::fromLatin1(errmsg)); + KMessageBox::error(0, TQString::tqfromLatin1(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::currentDateTime().toString("yyyy/mm/dd - h:m:s ap ")); + txt_w->insert( KStarsDateTime::tqcurrentDateTime().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 54dc4b3f..c619aa4e 100644 --- a/kstars/kstars/devmanager.ui +++ b/kstars/kstars/devmanager.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>devManager</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -51,7 +51,7 @@ </column> <column> <property name="text"> - <string>Status</string> + <string>tqStatus</string> </property> <property name="clickable"> <bool>true</bool> @@ -104,7 +104,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>125</height> @@ -126,7 +126,7 @@ <property name="name"> <cstring>serverLogText</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>90</height> @@ -178,7 +178,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -216,7 +216,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>20</height> @@ -241,7 +241,7 @@ <widget class="KListView"> <column> <property name="text"> - <string>Status</string> + <string>tqStatus</string> </property> <property name="clickable"> <bool>true</bool> @@ -278,7 +278,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout5_2</cstring> + <cstring>tqlayout5_2</cstring> </property> <vbox> <property name="name"> @@ -366,7 +366,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -380,7 +380,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -396,7 +396,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>289</width> <height>20</height> @@ -426,7 +426,7 @@ <slot>close()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/dms.cpp b/kstars/kstars/dms.cpp index 724f9af2..3f2f43b0 100644 --- a/kstars/kstars/dms.cpp +++ b/kstars/kstars/dms.cpp @@ -59,19 +59,19 @@ bool dms::setFromString( const TQString &str, bool isDeg ) { //remove any instances of unit characters. //h, d, m, s, ', ", or the degree symbol (ASCII 176) - entry.replace( TQRegExp("h"), "" ); - entry.replace( TQRegExp("d"), "" ); - entry.replace( TQRegExp("m"), "" ); - entry.replace( TQRegExp("s"), "" ); + entry.tqreplace( TQRegExp("h"), "" ); + entry.tqreplace( TQRegExp("d"), "" ); + entry.tqreplace( TQRegExp("m"), "" ); + entry.tqreplace( TQRegExp("s"), "" ); TQString sdeg; sdeg.sprintf("%c", 176); - entry.replace( TQRegExp(sdeg), "" ); - entry.replace( TQRegExp("\'"), "" ); - entry.replace( TQRegExp("\""), "" ); + entry.tqreplace( TQRegExp(sdeg), "" ); + entry.tqreplace( TQRegExp("\'"), "" ); + entry.tqreplace( TQRegExp("\""), "" ); //Account for localized decimal-point settings //TQString::toDouble() requires that the decimal symbol is "." - entry.replace( KGlobal::locale()->decimalSymbol(), "." ); + entry.tqreplace( KGlobal::locale()->decimalSymbol(), "." ); //empty entry returns false if ( entry.isEmpty() ) { @@ -99,7 +99,7 @@ bool dms::setFromString( const TQString &str, bool isDeg ) { TQStringList fields; //check for colon-delimiters or space-delimiters - if ( entry.contains(':') ) + if ( entry.tqcontains(':') ) fields = TQStringList::split( ':', entry ); else fields = TQStringList::split( " ", entry ); diff --git a/kstars/kstars/dmsbox.h b/kstars/kstars/dmsbox.h index c98bc2c1..63a5dcde 100644 --- a/kstars/kstars/dmsbox.h +++ b/kstars/kstars/dmsbox.h @@ -113,7 +113,7 @@ public: */ dms createDms(bool deg=TRUE, bool *ok=0); - /**@return a boolean indicating if object contains degrees or hours + /**@return a boolean indicating if object tqcontains degrees or hours */ bool degType(void) const {return deg;} diff --git a/kstars/kstars/draglistbox.cpp b/kstars/kstars/draglistbox.cpp index 74cd169f..4afd0f7a 100644 --- a/kstars/kstars/draglistbox.cpp +++ b/kstars/kstars/draglistbox.cpp @@ -36,7 +36,7 @@ void DragListBox::dragEnterEvent( TQDragEnterEvent *evt ) evt->accept(); } -bool DragListBox::contains( const TQString &s ) const { +bool DragListBox::tqcontains( const TQString &s ) const { for ( uint i=0; i<count(); ++i ) if ( text(i) == s ) return true; diff --git a/kstars/kstars/draglistbox.h b/kstars/kstars/draglistbox.h index 7e4a31cb..33e4e7a0 100644 --- a/kstars/kstars/draglistbox.h +++ b/kstars/kstars/draglistbox.h @@ -42,7 +42,7 @@ public: ~DragListBox(); int ignoreIndex() const { return IgnoreIndex; } - bool contains( const TQString &s ) const; + bool tqcontains( const TQString &s ) const; void dragEnterEvent( TQDragEnterEvent *evt ); void dropEvent( TQDropEvent *evt ); diff --git a/kstars/kstars/filesource.cpp b/kstars/kstars/filesource.cpp index 8e38d9a4..8a1854a4 100644 --- a/kstars/kstars/filesource.cpp +++ b/kstars/kstars/filesource.cpp @@ -27,7 +27,7 @@ FileSource::FileSource(KStarsData *ksdata, float magnitude) // kdDebug() << "count()=" << data->starList.count() << endl; fileNumber = ksdata->starList.count() / 1000 + 1; lineNumber = ksdata->starList.count() % 1000; - // the first file contains 12 comment lines at the beginning which must skipped + // the first file tqcontains 12 comment lines at the beginning which must skipped if (fileNumber == 1) { lineNumber += 12; } // kdDebug() << "fileNumber=" << fileNumber << " lineNumber=" << lineNumber << endl; diff --git a/kstars/kstars/finddialog.cpp b/kstars/kstars/finddialog.cpp index 29dfa6cb..ace8c5ed 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->setAlignment( AlignRight ); + filterTypeLabel->tqsetAlignment( AlignRight ); filterTypeLabel->setText( i18n( "Filter by type: " ) ); filterType = new TQComboBox( page, "filterType" ); @@ -73,7 +73,7 @@ FindDialog::FindDialog( TQWidget* parent ) : SearchList->setVScrollBarMode( TQListBox::AlwaysOn ); SearchList->setHScrollBarMode( TQListBox::AlwaysOff ); -//Pack Widgets into layout manager +//Pack Widgets into tqlayout manager hlay->addWidget( filterTypeLabel, 0, 0 ); hlay->addWidget( filterType, 0, 0 ); diff --git a/kstars/kstars/finddialog.h b/kstars/kstars/finddialog.h index 71059da0..cb6b3c70 100644 --- a/kstars/kstars/finddialog.h +++ b/kstars/kstars/finddialog.h @@ -35,7 +35,7 @@ class TQListBoxItem; class SkyObjectNameListItem; /**@class FindDialog - *Dialog window for finding SkyObjects by name. The dialog contains + *Dialog window for finding SkyObjects by name. The dialog tqcontains *a TQListBox showing the list of named objects, a TQLineEdit for filtering *the list by name, and a QCombobox for filtering the list by object type. * diff --git a/kstars/kstars/fitsheaderdialog.ui b/kstars/kstars/fitsheaderdialog.ui index 2a071439..5dd0ea20 100644 --- a/kstars/kstars/fitsheaderdialog.ui +++ b/kstars/kstars/fitsheaderdialog.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>fitsHeaderDialog</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>300</width> <height>20</height> @@ -113,5 +113,5 @@ <slot>close()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/fitsimage.cpp b/kstars/kstars/fitsimage.cpp index d5d5ce3c..ee6d4a5e 100644 --- a/kstars/kstars/fitsimage.cpp +++ b/kstars/kstars/fitsimage.cpp @@ -52,7 +52,7 @@ /* Load info */ typedef struct { - uint replace; /* replacement for blank/NaN-values */ + uint tqreplace; /* tqreplacement for blank/NaN-values */ uint use_datamin;/* Use DATAMIN/MAX-scaling if possible */ uint compose; /* compose images with naxis==3 */ } FITSLoadVals; @@ -76,7 +76,7 @@ FITSImage::FITSImage(TQWidget * parent, const char * name) : TQScrollView(parent currentZoom = 0.0; grayTable=new QRgb[256]; for (int i=0;i<256;i++) - grayTable[i]=qRgb(i,i,i); + grayTable[i]=tqRgb(i,i,i); viewport()->setMouseTracking(true); imgFrame->setMouseTracking(true); @@ -299,7 +299,7 @@ int FITSImage::loadFits (const char *filename) } trans.datamin = 0.0; trans.datamax = 255.0; - trans.replacement = plvals.replace; + trans.tqreplacement = plvals.tqreplace; trans.dsttyp = 'c'; //displayImage->create(width, height, 32); @@ -338,7 +338,7 @@ int FITSImage::loadFits (const char *filename) //for (j=0; j < width; j++) //{ //val = dest[j]; - //displayImage->setPixel(j, i, qRgb(val, val, val)); + //displayImage->setPixel(j, i, tqRgb(val, val, val)); //} for (j = 0 ; j < width; j++) displayImage->setPixel(j, i, dest[j]); diff --git a/kstars/kstars/fitsviewer.cpp b/kstars/kstars/fitsviewer.cpp index 2d0ca2ed..796c798d 100644 --- a/kstars/kstars/fitsviewer.cpp +++ b/kstars/kstars/fitsviewer.cpp @@ -549,7 +549,7 @@ void FITSViewer::fileSave() currentURL = backupCurrent; return; } - if (currentURL.path().contains('.') == 0) currentURL.setPath(currentURL.path() + ".fits"); + if (currentURL.path().tqcontains('.') == 0) currentURL.setPath(currentURL.path() + ".fits"); if (TQFile::exists(currentURL.path())) { @@ -589,7 +589,7 @@ void FITSViewer::fileSave() recordList = record[j]; if ( (index = recordList.find("BITPIX")) != -1) - recordList.replace(index, FITS_CARD_SIZE, bitpixRec); + recordList.tqreplace(index, FITS_CARD_SIZE, bitpixRec); fwrite(recordList.ascii(), 1, FITS_RECORD_SIZE, ifp->fp); } @@ -918,7 +918,7 @@ void FITSViewer::fitsHeader() if (equal == -1) { - if (property.contains(" ") != FITS_CARD_SIZE) + if (property.tqcontains(" ") != FITS_CARD_SIZE) cards << property << "" << ""; recordList.remove(0, FITS_CARD_SIZE); if (property.find("END") != -1) diff --git a/kstars/kstars/focusdialog.cpp b/kstars/kstars/focusdialog.cpp index 4f243f0e..ff639bf1 100644 --- a/kstars/kstars/focusdialog.cpp +++ b/kstars/kstars/focusdialog.cpp @@ -152,7 +152,7 @@ long double FocusDialog::epochToJd (double epoch) { } -TQSize FocusDialog::sizeHint() const +TQSize FocusDialog::tqsizeHint() const { return TQSize(240,210); } diff --git a/kstars/kstars/focusdialog.h b/kstars/kstars/focusdialog.h index 6ca6858d..5b52d83c 100644 --- a/kstars/kstars/focusdialog.h +++ b/kstars/kstars/focusdialog.h @@ -46,7 +46,7 @@ public: SkyPoint* point() const { return Point; } /**@return suggested size of focus window. */ - TQSize sizeHint() const; + TQSize tqsizeHint() 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 f1cc486c..19efb184 100644 --- a/kstars/kstars/focusdialogdlg.ui +++ b/kstars/kstars/focusdialogdlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>FocusDialogDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -155,7 +155,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -204,7 +204,7 @@ <slots> <slot>checkLineEdits()</slot> </slots> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/fov.cpp b/kstars/kstars/fov.cpp index 2820221a..2dc7f02e 100644 --- a/kstars/kstars/fov.cpp +++ b/kstars/kstars/fov.cpp @@ -77,7 +77,7 @@ void FOV::draw( TQPainter &p, float pixelsize ) { int w = p.viewport().width(); int h = p.viewport().height(); - switch ( shape() ) { + switch ( tqshape() ) { case 0: { //Square int s = int( pixelsize ); p.drawRect( (w - s)/2, (h - s)/2, s, s ); diff --git a/kstars/kstars/fov.h b/kstars/kstars/fov.h index 03d2f5c7..f0816a5a 100644 --- a/kstars/kstars/fov.h +++ b/kstars/kstars/fov.h @@ -32,14 +32,14 @@ class FOV { public: FOV(); FOV( TQString name ); //in this case, read params from fov.dat - FOV( TQString name, float size, int shape=0, TQString color="#FFFFFF" ); + FOV( TQString name, float size, int tqshape=0, TQString color="#FFFFFF" ); ~FOV() {} // enum SHAPE { FOV_SQUARE=0, FOV_CIRCLE=1, FOV_CROSSHAIRS=2, FOV_BULLSEYE=3, FOV_UNKNOWN }; TQString name() const { return Name; } void setName( const TQString &n ) { Name = n; } - int shape() const { return Shape; } + int tqshape() const { return Shape; } void setShape( int s ) { Shape = s; } float size() const { return Size; } void setSize( float s ) { Size = s; } diff --git a/kstars/kstars/fovdialog.cpp b/kstars/kstars/fovdialog.cpp index 05080043..580353ef 100644 --- a/kstars/kstars/fovdialog.cpp +++ b/kstars/kstars/fovdialog.cpp @@ -164,14 +164,14 @@ void FOVDialog::slotEditFOV() { newfdlg.ui->FOVName->setText( f->name() ); newfdlg.ui->FOVEdit->setText( KGlobal::locale()->formatNumber( f->size(), 3 ) ); newfdlg.ui->ColorButton->setColor( TQColor( f->color() ) ); - newfdlg.ui->ShapeBox->setCurrentItem( f->shape() ); + newfdlg.ui->ShapeBox->setCurrentItem( f->tqshape() ); newfdlg.slotUpdateFOV(); if ( newfdlg.exec() == TQDialog::Accepted ) { FOV *newfov = new FOV( newfdlg.ui->FOVName->text(), newfdlg.ui->FOVEdit->text().toDouble(), newfdlg.ui->ShapeBox->currentItem(), newfdlg.ui->ColorButton->color().name() ); fov->FOVListBox->changeItem( newfdlg.ui->FOVName->text(), fov->FOVListBox->currentItem() ); - FOVList.replace( fov->FOVListBox->currentItem(), newfov ); + FOVList.tqreplace( fov->FOVListBox->currentItem(), newfov ); } } diff --git a/kstars/kstars/fovdialogui.ui b/kstars/kstars/fovdialogui.ui index 66ae1f5a..e4dc18d5 100644 --- a/kstars/kstars/fovdialogui.ui +++ b/kstars/kstars/fovdialogui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>FOVDialogUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -23,7 +23,7 @@ <property name="name"> <cstring>FOVListBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>160</width> <height>0</height> @@ -38,7 +38,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <vbox> <property name="name"> @@ -55,7 +55,7 @@ <string>Add a new FOV symbol</string> </property> <property name="whatsThis" stdset="0"> - <string>Add a new field-of-view (FOV) symbol to the list. You can define the size, shape, and color of the new symbol.</string> + <string>Add a new field-of-view (FOV) symbol to the list. You can define the size, tqshape, and color of the new symbol.</string> </property> </widget> <spacer> @@ -68,7 +68,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -86,7 +86,7 @@ <string>Modify the highlighted FOV symbol</string> </property> <property name="whatsThis" stdset="0"> - <string>Press this button to modify the highlighted FOV symbol. You can change its size, shape and color.</string> + <string>Press this button to modify the highlighted FOV symbol. You can change its size, tqshape and color.</string> </property> </widget> <widget class="KPushButton"> @@ -113,7 +113,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -132,7 +132,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>80</width> <height>80</height> @@ -169,7 +169,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>60</height> @@ -182,7 +182,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistbox.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/geolocation.h b/kstars/kstars/geolocation.h index c3b6524e..b1fa7e37 100644 --- a/kstars/kstars/geolocation.h +++ b/kstars/kstars/geolocation.h @@ -282,7 +282,7 @@ public: */ void geodToCart (void); -/**The geoid is an elliposid which fits the shape of the Earth. It is +/**The geoid is an elliposid which fits the tqshape of the Earth. It is *characterized by two parameters: the semimajor axis and the *flattening. * diff --git a/kstars/kstars/histdialog.ui b/kstars/kstars/histdialog.ui index 38b268e6..442adf20 100644 --- a/kstars/kstars/histdialog.ui +++ b/kstars/kstars/histdialog.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>histDialog</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>640</width> <height>325</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>640</width> <height>325</height> @@ -44,7 +44,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <vbox> <property name="name"> @@ -70,13 +70,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>500</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>500</width> <height>150</height> @@ -101,7 +101,7 @@ </widget> <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>130</width> <height>20</height> @@ -224,7 +224,7 @@ </widget> <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> @@ -240,7 +240,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>270</width> <height>20</height> @@ -332,7 +332,7 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/imagereductionui.ui b/kstars/kstars/imagereductionui.ui index 218e9ec2..488c48f3 100644 --- a/kstars/kstars/imagereductionui.ui +++ b/kstars/kstars/imagereductionui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>imageReductionUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> @@ -79,7 +79,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>71</width> <height>20</height> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -189,7 +189,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -199,7 +199,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> @@ -257,7 +257,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>71</width> <height>20</height> @@ -354,7 +354,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -367,7 +367,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout14_2</cstring> + <cstring>tqlayout14_2</cstring> </property> <hbox> <property name="name"> @@ -425,7 +425,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout7_2</cstring> + <cstring>tqlayout7_2</cstring> </property> <hbox> <property name="name"> @@ -441,7 +441,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>71</width> <height>20</height> @@ -522,7 +522,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -535,7 +535,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> @@ -551,7 +551,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>210</width> <height>20</height> @@ -607,5 +607,5 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/imagesequence.cpp b/kstars/kstars/imagesequence.cpp index 7ad344da..f43ab5e8 100644 --- a/kstars/kstars/imagesequence.cpp +++ b/kstars/kstars/imagesequence.cpp @@ -79,7 +79,7 @@ imagesequence::~imagesequence() { } -bool imagesequence::updateStatus() +bool imagesequence::updatetqStatus() { bool result; @@ -290,7 +290,7 @@ void imagesequence::stopSequence() if (stdDevCCD) { - stdDevCCD->seqCount = 0; + stdDevCCD->setqCount = 0; stdDevCCD->batchMode = false; stdDevCCD->ISOMode = false; diff --git a/kstars/kstars/imagesequence.h b/kstars/kstars/imagesequence.h index 8d467593..f935908b 100644 --- a/kstars/kstars/imagesequence.h +++ b/kstars/kstars/imagesequence.h @@ -27,7 +27,7 @@ public: ~imagesequence(); -bool updateStatus(); +bool updatetqStatus(); private: KStars *ksw; diff --git a/kstars/kstars/imgsequencedlgui.ui b/kstars/kstars/imgsequencedlgui.ui index 024493fe..a9acfe7d 100644 --- a/kstars/kstars/imgsequencedlgui.ui +++ b/kstars/kstars/imgsequencedlgui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>imgSequenceDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -38,7 +38,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout25</cstring> + <cstring>tqlayout25</cstring> </property> <vbox> <property name="name"> @@ -46,7 +46,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <hbox> <property name="name"> @@ -64,7 +64,7 @@ <property name="name"> <cstring>currentImgCountOUT</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>50</width> <height>0</height> @@ -89,7 +89,7 @@ <property name="name"> <cstring>fullImgCountOUT</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>50</width> <height>0</height> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> @@ -152,7 +152,7 @@ </widget> <widget class="QLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> @@ -168,7 +168,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>270</width> <height>20</height> @@ -221,7 +221,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> @@ -240,7 +240,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout30</cstring> + <cstring>tqlayout30</cstring> </property> <hbox> <property name="name"> @@ -248,7 +248,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout29</cstring> + <cstring>tqlayout29</cstring> </property> <vbox> <property name="name"> @@ -328,7 +328,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout28</cstring> + <cstring>tqlayout28</cstring> </property> <vbox> <property name="name"> @@ -404,7 +404,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> - <cstring>layout29_2</cstring> + <cstring>tqlayout29_2</cstring> </property> <vbox> <property name="name"> @@ -460,7 +460,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>81</height> @@ -483,7 +483,7 @@ <tabstop>stopB</tabstop> <tabstop>closeB</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/indi/apmount.cpp b/kstars/kstars/indi/apmount.cpp index d1c05b66..781e2a07 100644 --- a/kstars/kstars/indi/apmount.cpp +++ b/kstars/kstars/indi/apmount.cpp @@ -728,9 +728,9 @@ void APMount::ISNewSwitch (const char *dev, const char *name, ISState *states, c IUUpdateSwitches(&AlignmentSP, states, names, n); index = getOnSwitch(&AlignmentSP); - if ( ( err = setAlignmentMode(index) < 0) ) + if ( ( err = tqsetAlignmentMode(index) < 0) ) { - handleError(&AlignmentSP, err, "Setting alignment"); + handleError(&AlignmentSP, err, "Setting tqalignment"); return; } diff --git a/kstars/kstars/indi/apogee/ApnCamera.cpp b/kstars/kstars/indi/apogee/ApnCamera.cpp index 4e8c1b00..4ed8d8c6 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_ImagingStatus() != Apn_Status_Flushing ) + while ( read_ImagingtqStatus() != Apn_tqStatus_Flushing ) { Sleep( 20 ); } @@ -128,7 +128,7 @@ bool CApnCamera::Expose( double Duration, bool Light ) PostRoiRows = 1; } - // Set up the geometry for a full frame device + // Set up the tqgeometry for a full frame device if ( m_ApnSensorInfo->m_EnableSingleRowOffset ) { PreRoiVBinning += PreRoiRows; @@ -296,7 +296,7 @@ unsigned short CApnCamera::GetExposurePixelsV() double CApnCamera::read_InputVoltage() { - UpdateGeneralStatus(); + UpdateGeneraltqStatus(); return m_pvtInputVoltage; } @@ -329,7 +329,7 @@ unsigned short CApnCamera::read_FirmwareVersion() bool CApnCamera::read_ShutterState() { - UpdateGeneralStatus(); + UpdateGeneraltqStatus(); return m_pvtShutterState; } @@ -559,15 +559,15 @@ void CApnCamera::write_DataBits( Apn_Resolution BitResolution ) } } -Apn_Status CApnCamera::read_ImagingStatus() +Apn_tqStatus CApnCamera::read_ImagingtqStatus() { bool Exposing, Active, Done, Flushing, WaitOnTrigger; bool DataHalted, RamError; - UpdateGeneralStatus(); + UpdateGeneraltqStatus(); - // Update the ImagingStatus + // Update the ImagingtqStatus Exposing = false; Active = false; Done = false; @@ -576,65 +576,65 @@ Apn_Status CApnCamera::read_ImagingStatus() DataHalted = false; RamError = false; - if ( (m_pvtStatusReg & FPGA_BIT_STATUS_IMAGING_ACTIVE) != 0 ) + if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_IMAGING_ACTIVE) != 0 ) Active = true; - if ( (m_pvtStatusReg & FPGA_BIT_STATUS_IMAGE_EXPOSING) != 0 ) + if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_IMAGE_EXPOSING) != 0 ) Exposing = true; - if ( (m_pvtStatusReg & FPGA_BIT_STATUS_IMAGE_DONE) != 0 ) + if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_IMAGE_DONE) != 0 ) Done = true; - if ( (m_pvtStatusReg & FPGA_BIT_STATUS_FLUSHING) != 0 ) + if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_FLUSHING) != 0 ) Flushing = true; - if ( (m_pvtStatusReg & FPGA_BIT_STATUS_WAITING_TRIGGER) != 0 ) + if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_WAITING_TRIGGER) != 0 ) WaitOnTrigger = true; - if ( (m_pvtStatusReg & FPGA_BIT_STATUS_DATA_HALTED) != 0 ) + if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_DATA_HALTED) != 0 ) DataHalted = true; - if ( (m_pvtStatusReg & FPGA_BIT_STATUS_PATTERN_ERROR) != 0 ) + if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_PATTERN_ERROR) != 0 ) RamError = true; if ( RamError ) { - m_pvtImagingStatus = Apn_Status_PatternError; + m_pvtImagingtqStatus = Apn_tqStatus_PatternError; } else { if ( DataHalted ) { - m_pvtImagingStatus = Apn_Status_DataError; + m_pvtImagingtqStatus = Apn_tqStatus_DataError; } else { if ( WaitOnTrigger ) { - m_pvtImagingStatus = Apn_Status_WaitingOnTrigger; + m_pvtImagingtqStatus = Apn_tqStatus_WaitingOnTrigger; } else { if ( Done && m_pvtImageInProgress ) { m_pvtImageReady = true; - m_pvtImagingStatus = Apn_Status_ImageReady; + m_pvtImagingtqStatus = Apn_tqStatus_ImageReady; } else { if ( Active ) { if ( Exposing ) - m_pvtImagingStatus = Apn_Status_Exposing; + m_pvtImagingtqStatus = Apn_tqStatus_Exposing; else - m_pvtImagingStatus = Apn_Status_ImagingActive; + m_pvtImagingtqStatus = Apn_tqStatus_ImagingActive; } else { if ( Flushing ) - m_pvtImagingStatus = Apn_Status_Flushing; + m_pvtImagingtqStatus = Apn_tqStatus_Flushing; else - m_pvtImagingStatus = Apn_Status_Idle; + m_pvtImagingtqStatus = Apn_tqStatus_Idle; } } } @@ -642,39 +642,39 @@ Apn_Status CApnCamera::read_ImagingStatus() } /* - switch( m_pvtImagingStatus ) + switch( m_pvtImagingtqStatus ) { - case Apn_Status_DataError: - OutputDebugString( "ImagingStatus: Apn_Status_DataError" ); + case Apn_tqStatus_DataError: + OutputDebugString( "ImagingtqStatus: Apn_tqStatus_DataError" ); break; - case Apn_Status_PatternError: - OutputDebugString( "ImagingStatus: Apn_Status_PatternError" ); + case Apn_tqStatus_PatternError: + OutputDebugString( "ImagingtqStatus: Apn_tqStatus_PatternError" ); break; - case Apn_Status_Idle: - OutputDebugString( "ImagingStatus: Apn_Status_Idle" ); + case Apn_tqStatus_Idle: + OutputDebugString( "ImagingtqStatus: Apn_tqStatus_Idle" ); break; - case Apn_Status_Exposing: - OutputDebugString( "ImagingStatus: Apn_Status_Exposing" ); + case Apn_tqStatus_Exposing: + OutputDebugString( "ImagingtqStatus: Apn_tqStatus_Exposing" ); break; - case Apn_Status_ImagingActive: - OutputDebugString( "ImagingStatus: Apn_Status_ImagingActive" ); + case Apn_tqStatus_ImagingActive: + OutputDebugString( "ImagingtqStatus: Apn_tqStatus_ImagingActive" ); break; - case Apn_Status_ImageReady: - OutputDebugString( "ImagingStatus: Apn_Status_ImageReady" ); + case Apn_tqStatus_ImageReady: + OutputDebugString( "ImagingtqStatus: Apn_tqStatus_ImageReady" ); break; - case Apn_Status_Flushing: - OutputDebugString( "ImagingStatus: Apn_Status_Flushing" ); + case Apn_tqStatus_Flushing: + OutputDebugString( "ImagingtqStatus: Apn_tqStatus_Flushing" ); break; - case Apn_Status_WaitingOnTrigger: - OutputDebugString( "ImagingStatus: Apn_Status_WaitingOnTrigger" ); + case Apn_tqStatus_WaitingOnTrigger: + OutputDebugString( "ImagingtqStatus: Apn_tqStatus_WaitingOnTrigger" ); break; default: - OutputDebugString( "ImagingStatus: UNDEFINED!!" ); + OutputDebugString( "ImagingtqStatus: UNDEFINED!!" ); break; } */ - return m_pvtImagingStatus; + return m_pvtImagingtqStatus; } Apn_LedMode CApnCamera::read_LedMode() @@ -763,51 +763,51 @@ void CApnCamera::write_CoolerEnable( bool CoolerEnable ) m_pvtCoolerEnable = CoolerEnable; } -Apn_CoolerStatus CApnCamera::read_CoolerStatus() +Apn_CoolertqStatus CApnCamera::read_CoolertqStatus() { bool CoolerAtTemp; bool CoolerActive; bool CoolerTempRevised; - UpdateGeneralStatus(); + UpdateGeneraltqStatus(); - // Update CoolerStatus + // Update CoolertqStatus CoolerActive = false; CoolerAtTemp = false; CoolerTempRevised = false; - if ( (m_pvtStatusReg & FPGA_BIT_STATUS_TEMP_AT_TEMP) != 0 ) + if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_TEMP_AT_TEMP) != 0 ) CoolerAtTemp = true; - if ( (m_pvtStatusReg & FPGA_BIT_STATUS_TEMP_ACTIVE) != 0 ) + if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_TEMP_ACTIVE) != 0 ) CoolerActive = true; - if ( (m_pvtStatusReg & FPGA_BIT_STATUS_TEMP_REVISION) != 0 ) + if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_TEMP_REVISION) != 0 ) CoolerTempRevised = true; // Now derive our cooler state if ( !CoolerActive ) { - m_pvtCoolerStatus = Apn_CoolerStatus_Off; + m_pvtCoolertqStatus = Apn_CoolertqStatus_Off; } else { if ( CoolerTempRevised ) { - m_pvtCoolerStatus = Apn_CoolerStatus_Revision; + m_pvtCoolertqStatus = Apn_CoolertqStatus_Revision; } else { if ( CoolerAtTemp ) - m_pvtCoolerStatus = Apn_CoolerStatus_AtSetPoint; + m_pvtCoolertqStatus = Apn_CoolertqStatus_AtSetPoint; else - m_pvtCoolerStatus = Apn_CoolerStatus_RampingToSetPoint; + m_pvtCoolertqStatus = Apn_CoolertqStatus_RampingToSetPoint; } } - return m_pvtCoolerStatus; + return m_pvtCoolertqStatus; } double CApnCamera::read_CoolerSetPoint() @@ -874,14 +874,14 @@ void CApnCamera::write_CoolerBackoffPoint( double BackoffPoint ) double CApnCamera::read_CoolerDrive() { - UpdateGeneralStatus(); + UpdateGeneraltqStatus(); return m_pvtCoolerDrive; } double CApnCamera::read_TempCCD() { - // UpdateGeneralStatus(); + // UpdateGeneraltqStatus(); unsigned short TempReg; unsigned short TempAvg; @@ -910,7 +910,7 @@ double CApnCamera::read_TempCCD() double CApnCamera::read_TempHeatsink() { - // UpdateGeneralStatus(); + // UpdateGeneraltqStatus(); 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 UpdateGeneralStatus() as part of read_CoolerStatus() - if ( read_CoolerStatus() == Apn_CoolerStatus_Off ) + // also implicitly calls UpdateGeneraltqStatus() as part of read_CoolertqStatus() + if ( read_CoolertqStatus() == Apn_CoolertqStatus_Off ) m_pvtCoolerEnable = false; else m_pvtCoolerEnable = true; @@ -1827,9 +1827,9 @@ long CApnCamera::WriteTwelveBitOffset() return 0; } -void CApnCamera::UpdateGeneralStatus() +void CApnCamera::UpdateGeneraltqStatus() { - unsigned short StatusReg; + unsigned short tqStatusReg; unsigned short HeatsinkTempReg; unsigned short CcdTempReg; unsigned short CoolerDriveReg; @@ -1840,7 +1840,7 @@ void CApnCamera::UpdateGeneralStatus() // Read the general status register of the device - QueryStatusRegs( StatusReg, + QuerytqStatusRegs( tqStatusReg, HeatsinkTempReg, CcdTempReg, CoolerDriveReg, @@ -1848,7 +1848,7 @@ void CApnCamera::UpdateGeneralStatus() TdiCounterReg, SequenceCounterReg ); - m_pvtStatusReg = StatusReg; + m_pvtqStatusReg = tqStatusReg; HeatsinkTempReg &= FPGA_MASK_TEMP_PARAMS; CcdTempReg &= FPGA_MASK_TEMP_PARAMS; @@ -1869,7 +1869,7 @@ void CApnCamera::UpdateGeneralStatus() m_pvtInputVoltage = VoltageReg * APN_VOLTAGE_RESOLUTION; // Update ShutterState - m_pvtShutterState = ( (m_pvtStatusReg & FPGA_BIT_STATUS_SHUTTER_OPEN) != 0 ); + m_pvtShutterState = ( (m_pvtqStatusReg & FPGA_BIT_STATUS_SHUTTER_OPEN) != 0 ); } diff --git a/kstars/kstars/indi/apogee/ApnCamera.h b/kstars/kstars/indi/apogee/ApnCamera.h index b0e6af03..f1fbef49 100644 --- a/kstars/kstars/indi/apogee/ApnCamera.h +++ b/kstars/kstars/indi/apogee/ApnCamera.h @@ -83,7 +83,7 @@ public: unsigned short val[], unsigned short count ); - long QueryStatusRegs( unsigned short& StatusReg, + long QuerytqStatusRegs( unsigned short& tqStatusReg, unsigned short& HeatsinkTempReg, unsigned short& CcdTempReg, unsigned short& CoolerDriveReg, @@ -129,7 +129,7 @@ public: void write_DataBits( Apn_Resolution BitResolution ); - Apn_Status read_ImagingStatus(); + Apn_tqStatus read_ImagingtqStatus(); Apn_LedMode read_LedMode(); void write_LedMode( Apn_LedMode LedMode ); @@ -138,7 +138,7 @@ public: bool read_CoolerEnable(); void write_CoolerEnable( bool CoolerEnable ); - Apn_CoolerStatus read_CoolerStatus(); + Apn_CoolertqStatus read_CoolertqStatus(); double read_CoolerSetPoint(); void write_CoolerSetPoint( double SetPoint ); double read_CoolerBackoffPoint(); @@ -231,7 +231,7 @@ public: long InitTwelveBitAD(); long WriteTwelveBitOffset(); - void UpdateGeneralStatus(); + void UpdateGeneraltqStatus(); // Internal private variables bool m_ResetVerticalArrays; @@ -264,13 +264,13 @@ public: double m_pvtCoolerBackoffPoint; - Apn_CoolerStatus m_pvtCoolerStatus; - Apn_Status m_pvtImagingStatus; + Apn_CoolertqStatus m_pvtCoolertqStatus; + Apn_tqStatus m_pvtImagingtqStatus; bool m_pvtShutterState; bool m_pvtImageInProgress; bool m_pvtImageReady; - unsigned short m_pvtStatusReg; + unsigned short m_pvtqStatusReg; double m_pvtCoolerDrive; double m_pvtCurrentHeatsinkTemp; diff --git a/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp b/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp index cce9ba37..095dcf0a 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 ApStatus; + USHORT AptqStatus; USHORT DatumA; USHORT DatumB; char szMsg[80]; DatumA = 0x0; DatumB = 0x0; - ApStatus = 0; + AptqStatus = 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 0f739121..9a11d6c4 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_ImagingStatus(); + read_ImagingtqStatus(); } Width = m_pvtWidth; @@ -238,7 +238,7 @@ long CApnCamera::WriteMultiMRMD( unsigned short reg[], unsigned short val[], uns } -long CApnCamera::QueryStatusRegs( unsigned short& StatusReg, +long CApnCamera::QuerytqStatusRegs( unsigned short& tqStatusReg, unsigned short& HeatsinkTempReg, unsigned short& CcdTempReg, unsigned short& CoolerDriveReg, @@ -262,7 +262,7 @@ long CApnCamera::QueryStatusRegs( unsigned short& StatusReg, return 1; } - StatusReg = RegData[0]; + tqStatusReg = RegData[0]; HeatsinkTempReg = RegData[1]; CcdTempReg = RegData[2]; CoolerDriveReg = RegData[3]; diff --git a/kstars/kstars/indi/apogee/ApnCamera_NET.h b/kstars/kstars/indi/apogee/ApnCamera_NET.h index e46d3846..210e8d29 100644 --- a/kstars/kstars/indi/apogee/ApnCamera_NET.h +++ b/kstars/kstars/indi/apogee/ApnCamera_NET.h @@ -61,7 +61,7 @@ public: unsigned short val[], unsigned short count ); - long QueryStatusRegs( unsigned short& StatusReg, + long QuerytqStatusRegs( unsigned short& tqStatusReg, unsigned short& HeatsinkTempReg, unsigned short& CcdTempReg, unsigned short& CoolerDriveReg, diff --git a/kstars/kstars/indi/apogee/ApnCamera_USB.cpp b/kstars/kstars/indi/apogee/ApnCamera_USB.cpp index a6bbad42..090ac3c1 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_ImagingStatus(); + read_ImagingtqStatus(); } Width = m_pvtWidth; @@ -161,7 +161,7 @@ long CApnCamera::PostStopExposure( bool DigitizeData ) while ( !ImageReady() ) { Sleep( 50 ); - read_ImagingStatus(); + read_ImagingtqStatus(); } pRequestData = new USHORT[m_pvtWidth*m_pvtHeight]; @@ -228,7 +228,7 @@ long CApnCamera::WriteMultiMRMD( unsigned short reg[], unsigned short val[], uns } -long CApnCamera::QueryStatusRegs( unsigned short& StatusReg, +long CApnCamera::QuerytqStatusRegs( unsigned short& tqStatusReg, unsigned short& HeatsinkTempReg, unsigned short& CcdTempReg, unsigned short& CoolerDriveReg, @@ -238,7 +238,7 @@ long CApnCamera::QueryStatusRegs( unsigned short& StatusReg, { /*unsigned short stat,heat,ccdt,cool,volt,tdic,sequ;*/ - if ( ApnUsbReadStatusRegs( &StatusReg, + if ( ApnUsbReadtqStatusRegs( &tqStatusReg, &HeatsinkTempReg, &CcdTempReg, &CoolerDriveReg, diff --git a/kstars/kstars/indi/apogee/ApnCamera_USB.h b/kstars/kstars/indi/apogee/ApnCamera_USB.h index 0d4a3d07..c8086c38 100644 --- a/kstars/kstars/indi/apogee/ApnCamera_USB.h +++ b/kstars/kstars/indi/apogee/ApnCamera_USB.h @@ -56,7 +56,7 @@ public: unsigned short val[], unsigned short count ); - long QueryStatusRegs( unsigned short& StatusReg, + long QuerytqStatusRegs( unsigned short& tqStatusReg, unsigned short& HeatsinkTempReg, unsigned short& CcdTempReg, unsigned short& CoolerDriveReg, diff --git a/kstars/kstars/indi/apogee/Apogee.h b/kstars/kstars/indi/apogee/Apogee.h index d97740b2..cee9b37c 100644 --- a/kstars/kstars/indi/apogee/Apogee.h +++ b/kstars/kstars/indi/apogee/Apogee.h @@ -29,15 +29,15 @@ #define Apn_CameraMode_ExternalTrigger 3 #define Apn_CameraMode_ExternalShutter 4 -#define Apn_Status int -#define Apn_Status_DataError -2 -#define Apn_Status_PatternError -1 -#define Apn_Status_Idle 0 -#define Apn_Status_Exposing 1 -#define Apn_Status_ImagingActive 2 -#define Apn_Status_ImageReady 3 -#define Apn_Status_Flushing 4 -#define Apn_Status_WaitingOnTrigger 5 +#define Apn_tqStatus int +#define Apn_tqStatus_DataError -2 +#define Apn_tqStatus_PatternError -1 +#define Apn_tqStatus_Idle 0 +#define Apn_tqStatus_Exposing 1 +#define Apn_tqStatus_ImagingActive 2 +#define Apn_tqStatus_ImageReady 3 +#define Apn_tqStatus_Flushing 4 +#define Apn_tqStatus_WaitingOnTrigger 5 #define Apn_LedMode int #define Apn_LedMode_DisableAll 0 @@ -54,11 +54,11 @@ #define Apn_LedState_ExtStartReadout 6 #define Apn_LedState_AtTemp 7 -#define Apn_CoolerStatus int -#define Apn_CoolerStatus_Off 0 -#define Apn_CoolerStatus_RampingToSetPoint 1 -#define Apn_CoolerStatus_AtSetPoint 2 -#define Apn_CoolerStatus_Revision 3 +#define Apn_CoolertqStatus int +#define Apn_CoolertqStatus_Off 0 +#define Apn_CoolertqStatus_RampingToSetPoint 1 +#define Apn_CoolertqStatus_AtSetPoint 2 +#define Apn_CoolertqStatus_Revision 3 #define Apn_FanMode int #define Apn_FanMode_Off 0 @@ -67,24 +67,24 @@ #define Apn_FanMode_High 3 -#define Camera_Status int -#define Camera_Status_Idle 0 -#define Camera_Status_Waiting 1 -#define Camera_Status_Exposing 2 -#define Camera_Status_Downloading 3 -#define Camera_Status_LineReady 4 -#define Camera_Status_ImageReady 5 -#define Camera_Status_Flushing 6 - -#define Camera_CoolerStatus int -#define Camera_CoolerStatus_Off 0 -#define Camera_CoolerStatus_RampingToSetPoint 1 -#define Camera_CoolerStatus_Correcting 2 -#define Camera_CoolerStatus_RampingToAmbient 3 -#define Camera_CoolerStatus_AtAmbient 4 -#define Camera_CoolerStatus_AtMax 5 -#define Camera_CoolerStatus_AtMin 6 -#define Camera_CoolerStatus_AtSetPoint 7 +#define Camera_tqStatus int +#define Camera_tqStatus_Idle 0 +#define Camera_tqStatus_Waiting 1 +#define Camera_tqStatus_Exposing 2 +#define Camera_tqStatus_Downloading 3 +#define Camera_tqStatus_LineReady 4 +#define Camera_tqStatus_ImageReady 5 +#define Camera_tqStatus_Flushing 6 + +#define Camera_CoolertqStatus int +#define Camera_CoolertqStatus_Off 0 +#define Camera_CoolertqStatus_RampingToSetPoint 1 +#define Camera_CoolertqStatus_Correcting 2 +#define Camera_CoolertqStatus_RampingToAmbient 3 +#define Camera_CoolertqStatus_AtAmbient 4 +#define Camera_CoolertqStatus_AtMax 5 +#define Camera_CoolertqStatus_AtMin 6 +#define Camera_CoolertqStatus_AtSetPoint 7 #define Camera_CoolerMode int #define Camera_CoolerMode_Off 0 diff --git a/kstars/kstars/indi/apogee/ApogeeIoctl.h b/kstars/kstars/indi/apogee/ApogeeIoctl.h index ec0fc580..42ac1d8f 100644 --- a/kstars/kstars/indi/apogee/ApogeeIoctl.h +++ b/kstars/kstars/indi/apogee/ApogeeIoctl.h @@ -4,7 +4,7 @@ // //Portions Copyright (c) 2000 The Random Factory. // -// Define the IOCTL codes we will use. The IOCTL code contains a command +// Define the IOCTL codes we will use. The IOCTL code tqcontains a command // identifier, plus other information about the device, the type of access // with which the file must have been opened, and the type of buffering. // diff --git a/kstars/kstars/indi/apogee/ApogeeUsb.h b/kstars/kstars/indi/apogee/ApogeeUsb.h index f242ea6a..6924ffab 100644 --- a/kstars/kstars/indi/apogee/ApogeeUsb.h +++ b/kstars/kstars/indi/apogee/ApogeeUsb.h @@ -61,7 +61,7 @@ APN_USB_TYPE ApnUsbWriteRegMultiMRMD( unsigned short FpgaReg[], unsigned short RegCount ); -APN_USB_TYPE ApnUsbReadStatusRegs( unsigned short *StatusReg, +APN_USB_TYPE ApnUsbReadtqStatusRegs( unsigned short *tqStatusReg, unsigned short *HeatsinkTempReg, unsigned short *CcdTempReg, unsigned short *CoolerDriveReg, diff --git a/kstars/kstars/indi/apogee/ApogeeUsbLinux.cpp b/kstars/kstars/indi/apogee/ApogeeUsbLinux.cpp index fcedd1d9..2d51d147 100644 --- a/kstars/kstars/indi/apogee/ApogeeUsbLinux.cpp +++ b/kstars/kstars/indi/apogee/ApogeeUsbLinux.cpp @@ -192,7 +192,7 @@ APN_USB_TYPE ApnUsbWriteRegMultiMRMD( unsigned short FpgaReg[], } -APN_USB_TYPE ApnUsbReadStatusRegs( unsigned short *StatusReg, +APN_USB_TYPE ApnUsbReadtqStatusRegs( unsigned short *tqStatusReg, unsigned short *HeatsinkTempReg, unsigned short *CcdTempReg, unsigned short *CoolerDriveReg, @@ -203,15 +203,15 @@ APN_USB_TYPE ApnUsbReadStatusRegs( unsigned short *StatusReg, BOOLEAN Success; /*unsigned int BytesReceived;*/ unsigned short *Data; - unsigned char StatusData[21]; + unsigned char tqStatusData[21]; Success = usb_control_msg(g_hSysDriver, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, VND_APOGEE_STATUS, - 0, 0, (char *)&StatusData, 21, 3000); + 0, 0, (char *)&tqStatusData, 21, 3000); // if ( !Success ) // return APN_USB_ERR_STATUS; - Data = (unsigned short *)StatusData; + Data = (unsigned short *)tqStatusData; *HeatsinkTempReg = Data[0]; *CcdTempReg = Data[1]; @@ -219,11 +219,11 @@ APN_USB_TYPE ApnUsbReadStatusRegs( unsigned short *StatusReg, *VoltageReg = Data[3]; *TdiCounter = Data[4]; *SequenceCounter = Data[5]; - *StatusReg = Data[6]; + *tqStatusReg = Data[6]; - if ( (StatusData[20] & 0x01) != 0 ) + if ( (tqStatusData[20] & 0x01) != 0 ) { - *StatusReg |= 0x8; + *tqStatusReg |= 0x8; } return APN_USB_SUCCESS; diff --git a/kstars/kstars/indi/apogee/ApogeeUsbLinuxForKernel.cpp b/kstars/kstars/indi/apogee/ApogeeUsbLinuxForKernel.cpp index 4cbb77b2..cae78e59 100644 --- a/kstars/kstars/indi/apogee/ApogeeUsbLinuxForKernel.cpp +++ b/kstars/kstars/indi/apogee/ApogeeUsbLinuxForKernel.cpp @@ -213,7 +213,7 @@ APN_USB_TYPE ApnUsbWriteRegMultiMRMD( unsigned short FpgaReg[], } -APN_USB_TYPE ApnUsbReadStatusRegs( unsigned short *StatusReg, +APN_USB_TYPE ApnUsbReadtqStatusRegs( unsigned short *tqStatusReg, unsigned short *HeatsinkTempReg, unsigned short *CcdTempReg, unsigned short *CoolerDriveReg, @@ -226,15 +226,15 @@ APN_USB_TYPE ApnUsbReadStatusRegs( unsigned short *StatusReg, unsigned short RegNumber; struct apIOparam request; unsigned short *Data; - unsigned char StatusData[21]; + unsigned char tqStatusData[21]; request.reg = 0; //check this ******************* - request.param1=(unsigned long)&StatusData; + request.param1=(unsigned long)&tqStatusData; Success=ioctl(g_hSysDriver,APUSB_READ_STATUS,(unsigned long)&request); // if ( !Success ) // return APN_USB_ERR_STATUS; - Data = (unsigned short *)StatusData; + Data = (unsigned short *)tqStatusData; *HeatsinkTempReg = Data[0]; *CcdTempReg = Data[1]; @@ -242,11 +242,11 @@ APN_USB_TYPE ApnUsbReadStatusRegs( unsigned short *StatusReg, *VoltageReg = Data[3]; *TdiCounter = Data[4]; *SequenceCounter = Data[5]; - *StatusReg = Data[6]; + *tqStatusReg = Data[6]; - if ( (StatusData[20] & 0x01) != 0 ) + if ( (tqStatusData[20] & 0x01) != 0 ) { - *StatusReg |= 0x8; + *tqStatusReg |= 0x8; } return APN_USB_SUCCESS; diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp index 67d217ec..fcfd9070 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_Status = Camera_Status_Idle; - m_CoolerStatus = Camera_CoolerStatus_Off; + m_tqStatus = Camera_tqStatus_Idle; + m_CoolertqStatus = Camera_CoolertqStatus_Off; m_ExposureBinX = 0; m_ExposureBinY = 0; @@ -240,7 +240,7 @@ bool CCameraIO::FilterHome() // Check for strobe unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, 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_Status, val ); + Read( Reg_tqStatus, val ); if ( val & RegBit_GotTrigger ) { Sleep ( 10 ); val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, 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_Status + // Update internal variables in case application did not poll read_tqStatus m_WaitingforTrigger = false; m_WaitingforLine = false; if ( m_WaitingforImage ) - { // In case application did not poll read_Status + { // In case application did not poll read_tqStatus 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_Status, val ); + Read( Reg_tqStatus, 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_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break; // Line done if ( clock() > StopTime ) @@ -611,7 +611,7 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize if ( m_HighPriority ) SetPriorityClass ( hProcess, Class ); } -// UnmaskIrqs(); +// UntqmaskIrqs(); if ( ret ) { // We were successfull @@ -679,7 +679,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize ) int i; if ( m_WaitingforLine ) - { // In case application did not poll read_Status + { // In case application did not poll read_tqStatus m_WaitingforLine = false; ///////////////////////////////////// @@ -688,7 +688,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize ) while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break; // Line done if ( clock() > StopTime ) @@ -746,7 +746,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize ) if ( m_HighPriority ) SetPriorityClass ( hProcess, Class ); } -// UnmaskIrqs(); +// UntqmaskIrqs(); return ret; } @@ -763,11 +763,11 @@ bool CCameraIO::Snap( double Duration, bool Light, unsigned short* pImageData, s if ( m_WaitingforTrigger ) { - Camera_Status stat; + Camera_tqStatus stat; while ( true ) { // This will wait forever if no trigger happens - stat = read_Status(); - if ( stat == Camera_Status_Exposing ) break; + stat = read_tqStatus(); + if ( stat == Camera_tqStatus_Exposing ) break; Sleep( 220 ); // dont bog down the CPU while polling } m_WaitingforTrigger = false; @@ -778,8 +778,8 @@ 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_Status stat = read_Status(); - if ( stat == Camera_Status_ImageReady ) break; + Camera_tqStatus stat = read_tqStatus(); + if ( stat == Camera_tqStatus_ImageReady ) break; if ( clock() > StopTime ) return false; // Timed out, no image available Sleep( 220 ); // dont bog down the CPU while polling @@ -791,43 +791,43 @@ bool CCameraIO::Snap( double Duration, bool Light, unsigned short* pImageData, s //////////////////////////////////////////////////////////// // Camera Settings -Camera_Status CCameraIO::read_Status() +Camera_tqStatus CCameraIO::read_tqStatus() { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( val & RegBit_Exposing ) //11.0 { ATLTRACE( "Exposing\r\n" ); m_WaitingforTrigger = false; - m_Status = Camera_Status_Exposing; + m_tqStatus = Camera_tqStatus_Exposing; } else if ( m_WaitingforTrigger ) - m_Status = Camera_Status_Waiting; + m_tqStatus = Camera_tqStatus_Waiting; else if ( m_WaitingforImage && ( val & RegBit_FrameDone ) ) //11.11 { ATLTRACE( "ImageReady\r\n" ); m_WaitingforImage = false; - m_Status = Camera_Status_ImageReady; + m_tqStatus = Camera_tqStatus_ImageReady; } else if ( m_WaitingforLine && ( val & RegBit_LineDone ) ) //11.1 { ATLTRACE( "LineReady\r\n" ); m_WaitingforLine = false; - m_Status = Camera_Status_LineReady; + m_tqStatus = Camera_tqStatus_LineReady; } else if ( m_WaitingforImage || m_WaitingforLine ) { ATLTRACE( "Flushing\r\n" ); - m_Status = Camera_Status_Flushing; + m_tqStatus = Camera_tqStatus_Flushing; } else - m_Status = Camera_Status_Idle; + m_tqStatus = Camera_tqStatus_Idle; - return m_Status; + return m_tqStatus; } bool CCameraIO::read_Present() @@ -839,13 +839,13 @@ bool CCameraIO::read_Present() bool FailedLoopback = false; unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, 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_Status, val ); + Read( Reg_tqStatus, 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_Status, regval ); + Read( Reg_tqStatus, 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_Status, regval ); + Read( Reg_tqStatus, 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_CoolerStatus CCameraIO::read_CoolerStatus() +Camera_CoolertqStatus CCameraIO::read_CoolertqStatus() { unsigned short val = 0; Read( Reg_CommandReadback, val ); @@ -1084,34 +1084,34 @@ Camera_CoolerStatus CCameraIO::read_CoolerStatus() if ( val & RegBit_CoolerEnable ) //12.15 { unsigned short val2 = 0; - Read( Reg_Status, val2 ); + Read( Reg_tqStatus, val2 ); if ( val & RegBit_CoolerShutdown ) //12.8 { if ( val2 & RegBit_ShutdownComplete ) //11.6 - m_CoolerStatus = Camera_CoolerStatus_AtAmbient; + m_CoolertqStatus = Camera_CoolertqStatus_AtAmbient; else - m_CoolerStatus = Camera_CoolerStatus_RampingToAmbient; + m_CoolertqStatus = Camera_CoolertqStatus_RampingToAmbient; } else { if ( val2 & RegBit_TempAtMax ) //11.5 - m_CoolerStatus = Camera_CoolerStatus_AtMax; + m_CoolertqStatus = Camera_CoolertqStatus_AtMax; else if ( val2 & RegBit_TempAtMin ) //11.4 - m_CoolerStatus = Camera_CoolerStatus_AtMin; + m_CoolertqStatus = Camera_CoolertqStatus_AtMin; else if ( val2 & RegBit_TempAtSetPoint ) //11.7 - m_CoolerStatus = Camera_CoolerStatus_AtSetPoint; + m_CoolertqStatus = Camera_CoolertqStatus_AtSetPoint; // Check against last known cooler status - else if ( m_CoolerStatus == Camera_CoolerStatus_AtSetPoint ) - m_CoolerStatus = Camera_CoolerStatus_Correcting; + else if ( m_CoolertqStatus == Camera_CoolertqStatus_AtSetPoint ) + m_CoolertqStatus = Camera_CoolertqStatus_Correcting; else - m_CoolerStatus = Camera_CoolerStatus_RampingToSetPoint; + m_CoolertqStatus = Camera_CoolertqStatus_RampingToSetPoint; } } else - m_CoolerStatus = Camera_CoolerStatus_Off; + m_CoolertqStatus = Camera_CoolertqStatus_Off; - return m_CoolerStatus; + return m_CoolertqStatus; } Camera_CoolerMode CCameraIO::read_CoolerMode() @@ -1319,7 +1319,7 @@ void CCameraIO::Flush( short Rows ) while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, 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 d6a61e1c..6edfe467 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_Status = 0x006; // Register 11 in firmware -const long Reg_Status = 10; // Register 11 +const long RegISA_tqStatus = 0x006; // Register 11 in firmware +const long Reg_tqStatus = 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_Status = 0x00C; // Register 11 in firmware +const long RegPCI_tqStatus = 0x00C; // Register 11 in firmware const long RegPCI_CommandReadback = 0x010; // Register 12 in PCI firmware @@ -161,7 +161,7 @@ public: //////////////////////////////////////////////////////////// // Camera Settings - Camera_Status read_Status(); // Current camera state + Camera_tqStatus read_tqStatus(); // 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_CoolerStatus read_CoolerStatus(); // Returns current cooler status + Camera_CoolertqStatus read_CoolertqStatus(); // Returns current cooler status Camera_CoolerMode read_CoolerMode(); // Returns/sets current cooler operation mode. void write_CoolerMode( Camera_CoolerMode val ); @@ -271,8 +271,8 @@ public: // Mask user requested set of IRQS // void MaskIrqs(); - // Restore default IRQ mask -// void UnmaskIrqs(); + // Restore default IRQ tqmask +// void UntqmaskIrqs(); // Starts flushing the camera (which should be the normal idle state) // If Rows is non-negative, only the specified number of rows are flushed, @@ -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 CameraStatus + // = False closes the shutter. Returns immediately after invocation, poll the CameratqStatus // 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 CameraStatus property to + // sequence and ending with a buffer full of line data. Poll the CameratqStatus 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_Status m_Status; // Last known camera status + Camera_tqStatus m_tqStatus; // Last known camera status Camera_Interface m_Interface; // String acronyms may be used in INI file. // 0 or ISA: Industry Standard Architecture bus @@ -356,8 +356,8 @@ public: Camera_SensorType m_SensorType; // 0 or CCD: Charge Coupled Device // 1 or CMOS: Complementary Metal-Oxide-Silicon - Camera_CoolerStatus m_CoolerStatus; // Last known cooler status. - unsigned int m_IRQMask; // Set of IRQs masked on user request // 0: Off + Camera_CoolertqStatus m_CoolertqStatus; // Last known cooler status. + unsigned int m_IRQMask; // Set of IRQs tqmasked on user request // 0: Off // 1: Ramping to set point // 2: Correcting // 3: Ramping to ambient diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp index 16a6bb72..bbff2080 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_Status: - realreg = RegISA_Status; + case Reg_tqStatus: + realreg = RegISA_tqStatus; 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_Status, val ); + Read( Reg_tqStatus, 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_Status, val ); + Read( Reg_tqStatus, 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 a83a594e..15c139dd 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_Status: - RegNumber = RegPCI_Status; + case Reg_tqStatus: + RegNumber = RegPCI_tqStatus; 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_Status, val ); + Read( Reg_tqStatus, 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_Status, val ); + Read( Reg_tqStatus, 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 7025d9ce..bb143e55 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_Status: - realreg = RegISA_Status; + case Reg_tqStatus: + realreg = RegISA_tqStatus; 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_Status, val ); + Read( Reg_tqStatus, 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_Status, val ); + Read( Reg_tqStatus, 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 3e6cc43e..ba9ce96d 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_Status: - RegNumber = RegPCI_Status; + case Reg_tqStatus: + RegNumber = RegPCI_tqStatus; 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_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done if ( clock() > StopTime ) return 1; // Timed out diff --git a/kstars/kstars/indi/apogee/Camera_Example.cpp b/kstars/kstars/indi/apogee/Camera_Example.cpp index f1f64121..52a95f43 100644 --- a/kstars/kstars/indi/apogee/Camera_Example.cpp +++ b/kstars/kstars/indi/apogee/Camera_Example.cpp @@ -295,9 +295,9 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) } ///////////////////////////////////////////////////////////////////////////////// - // Necessary geometry settings + // Necessary tqgeometry settings - if (CfgGet (inifp, "geometry", "rows", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "rows", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXTOTALROWS ) cam->m_Rows = val; @@ -310,7 +310,7 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) return CCD_OPEN_CFGDATA; // rows MUST be defined } - if (CfgGet (inifp, "geometry", "columns", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "columns", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXTOTALCOLUMNS ) cam->m_Columns = val; @@ -490,31 +490,31 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) ///////////////////////////////////////////////////////////////////////////////// // Geometry - if (CfgGet (inifp, "geometry", "bic", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "bic", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXCOLUMNS ) cam->m_BIC = val; } - if (CfgGet (inifp, "geometry", "bir", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "bir", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXROWS ) cam->m_BIR = val; } - if (CfgGet (inifp, "geometry", "skipc", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "skipc", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 0 && val <= MAXCOLUMNS ) cam->m_SkipC = val; } - if (CfgGet (inifp, "geometry", "skipr", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "skipr", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 0 && val <= MAXROWS ) cam->m_SkipR = val; } - if (CfgGet (inifp, "geometry", "imgcols", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "imgcols", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXTOTALCOLUMNS ) cam->m_ImgColumns = val; @@ -522,7 +522,7 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) else cam->m_ImgColumns = cam->m_Columns - cam->m_BIC - cam->m_SkipC; - if (CfgGet (inifp, "geometry", "imgrows", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "imgrows", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXTOTALROWS ) cam->m_ImgRows = val; @@ -530,13 +530,13 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) else cam->m_ImgRows = cam->m_Rows - cam->m_BIR - cam->m_SkipR; - if (CfgGet (inifp, "geometry", "hflush", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "hflush", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXHBIN ) cam->m_HFlush = val; } - if (CfgGet (inifp, "geometry", "vflush", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "vflush", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXVBIN ) cam->m_VFlush = val; diff --git a/kstars/kstars/indi/apogee_ppi.cpp b/kstars/kstars/indi/apogee_ppi.cpp index 9898018f..26efb4cc 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 readStatus=0; + int readtqStatus=0; double ccdTemp; if (!isCCDConnected()) @@ -407,16 +407,16 @@ void ApogeeCam::ISPoll() case IPS_BUSY: - readStatus = cam->read_Status(); - if (readStatus < 0) + readtqStatus = cam->read_tqStatus(); + if (readtqStatus < 0) { - IDLog("Error in exposure! Read status: %d\n", readStatus); + IDLog("Error in exposure! Read status: %d\n", readtqStatus); ExposeTimeNP.s = IPS_ALERT; ExposeTimeN[0].value = 0; - IDSetNumber(&ExposeTimeNP, "Error in exposure procedure. Read states: %d", readStatus); + IDSetNumber(&ExposeTimeNP, "Error in exposure procedure. Read states: %d", readtqStatus); return; } - else if (readStatus == Camera_Status_ImageReady) + else if (readtqStatus == Camera_tqStatus_ImageReady) { ExposeTimeN[0].value = 0; ExposeTimeNP.s = IPS_OK; @@ -891,7 +891,7 @@ bool ApogeeCam::initCamera() { LilXML *XMLParser = newLilXML(); XMLEle *root = NULL, *camera = NULL, *ele = NULL; - XMLEle *system = NULL, *geometry = NULL, *temp = NULL, *ccd = NULL; + XMLEle *system = NULL, *tqgeometry = NULL, *temp = NULL, *ccd = NULL; XMLAtt *ap; FILE *spFile = NULL; char errmsg[1024]; @@ -948,7 +948,7 @@ bool ApogeeCam::initCamera() // Let's get the subsections now system = findXMLEle(camera, "System"); - geometry = findXMLEle(camera, "Geometry"); + tqgeometry = findXMLEle(camera, "Geometry"); temp = findXMLEle(camera, "Temp"); ccd = findXMLEle(camera, "CCD"); @@ -960,7 +960,7 @@ bool ApogeeCam::initCamera() return false; } - if (geometry == NULL) + if (tqgeometry == NULL) { IDLog("Error: Unable to find Geometry element in camera.\n"); IDMessage(mydev, "Error: Unable to find Geometry element in camera."); @@ -1000,7 +1000,7 @@ bool ApogeeCam::initCamera() bAddr = hextoi(valuXMLAtt(findXMLAtt(system, "Base"))) & 0xFFF; // Rows - ap = findXMLAtt(geometry, "Rows"); + ap = findXMLAtt(tqgeometry, "Rows"); if (!ap) { IDLog("Error: Unable to find attribute Rows.\n"); @@ -1012,7 +1012,7 @@ bool ApogeeCam::initCamera() cam->m_Rows = hextoi(valuXMLAtt(ap)); // Columns - ap = findXMLAtt(geometry, "Columns"); + ap = findXMLAtt(tqgeometry, "Columns"); if (!ap) { IDLog("Error: Unable to find attribute Columns.\n"); @@ -1210,7 +1210,7 @@ bool ApogeeCam::initCamera() } // BIC - ele = findXMLEle(geometry, "BIC"); + ele = findXMLEle(tqgeometry, "BIC"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1219,7 +1219,7 @@ bool ApogeeCam::initCamera() } // BIR - ele = findXMLEle(geometry, "BIR"); + ele = findXMLEle(tqgeometry, "BIR"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1228,7 +1228,7 @@ bool ApogeeCam::initCamera() } // SKIPC - ele = findXMLEle(geometry, "SKIPC"); + ele = findXMLEle(tqgeometry, "SKIPC"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1237,7 +1237,7 @@ bool ApogeeCam::initCamera() } // SKIPR - ele = findXMLEle(geometry, "SKIPR"); + ele = findXMLEle(tqgeometry, "SKIPR"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1246,7 +1246,7 @@ bool ApogeeCam::initCamera() } // IMG COlS - ele = findXMLEle(geometry, "ImgCols"); + ele = findXMLEle(tqgeometry, "ImgCols"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1257,7 +1257,7 @@ bool ApogeeCam::initCamera() cam->m_ImgColumns = cam->m_Columns - cam->m_BIC - cam->m_SkipC; // IMG ROWS - ele = findXMLEle(geometry, "ImgRows"); + ele = findXMLEle(tqgeometry, "ImgRows"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1268,7 +1268,7 @@ bool ApogeeCam::initCamera() cam->m_ImgRows = cam->m_Rows - cam->m_BIR - cam->m_SkipR; // Hor Flush - ele = findXMLEle(geometry, "HFlush"); + ele = findXMLEle(tqgeometry, "HFlush"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1277,7 +1277,7 @@ bool ApogeeCam::initCamera() } // Ver Flush - ele = findXMLEle(geometry, "VFlush"); + ele = findXMLEle(tqgeometry, "VFlush"); if (ele) { val = hextoi(pcdataXMLEle(ele)); diff --git a/kstars/kstars/indi/celestronprotocol.h b/kstars/kstars/indi/celestronprotocol.h index d7c956f7..aae4f204 100644 --- a/kstars/kstars/indi/celestronprotocol.h +++ b/kstars/kstars/indi/celestronprotocol.h @@ -2,7 +2,7 @@ * Header File for the Telescope Control protocols for the Meade LX200 * Author: John Kielkopf (kielkopf@louisville.edu) * -* This file contains header information used in common with xmtel. +* This file tqcontains header information used in common with xmtel. * * 15 May 2003 -- Version 2.00 * diff --git a/kstars/kstars/indi/fitsrw.c b/kstars/kstars/indi/fitsrw.c index b21622bf..ac2c0e39 100644 --- a/kstars/kstars/indi/fitsrw.c +++ b/kstars/kstars/indi/fitsrw.c @@ -1676,7 +1676,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, {double offs, scale; double datadiff, pixdiff; unsigned char pixbuffer[4096], *pix, *cdata; - unsigned char creplace; + unsigned char ctqreplace; int transcount = 0; long tdata, tmin, tmax; int maxelem; @@ -1706,7 +1706,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, if (tmax < 0) tmax = 0; else if (tmax > 255) tmax = 255; cdata = (unsigned char *)buf; - creplace = (unsigned char)trans->replacement; + ctqreplace = (unsigned char)trans->tqreplacement; switch (hdulist->bitpix) { @@ -1727,7 +1727,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, { bp8 = (FITS_BITPIX8)*(pix++); if (bp8 == bp8blank) /* Is it a blank pixel ? */ - *(cdata++) = creplace; + *(cdata++) = ctqreplace; else /* Do transform */ { tdata = (long)(bp8 * scale + offs); @@ -1770,7 +1770,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, { FITS_GETBITPIX16 (pix, bp16); if (bp16 == bp16blank) - *(cdata++) = creplace; + *(cdata++) = ctqreplace; else { tdata = (long)(bp16 * scale + offs); @@ -1815,7 +1815,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, { FITS_GETBITPIX32 (pix, bp32); if (bp32 == bp32blank) - *(cdata++) = creplace; + *(cdata++) = ctqreplace; else { tdata = (long)(bp32 * scale + offs); @@ -1856,7 +1856,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, while (maxelem--) { if (fits_nan_32 (pix)) /* An IEEE special value ? */ - *(cdata++) = creplace; + *(cdata++) = ctqreplace; else /* Do transform */ { FITS_GETBITPIXM32 (pix, bpm32); @@ -1884,7 +1884,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, while (maxelem--) { if (fits_nan_64 (pix)) - *(cdata++) = creplace; + *(cdata++) = ctqreplace; else { FITS_GETBITPIXM64 (pix, bpm64); @@ -1953,7 +1953,7 @@ int fits_to_pgmraw (char *fitsfile, char *pgmfile) trans.pixmax = hdu->pixmax; trans.datamin = 0.0; trans.datamax = 255.0; - trans.replacement = 0.0; /* Blank/NaN replacement value */ + trans.tqreplacement = 0.0; /* Blank/NaN tqreplacement value */ trans.dsttyp = 'c'; /* Output type is character */ nbytes = hdu->naxisn[0]*hdu->naxisn[1]; diff --git a/kstars/kstars/indi/fitsrw.h b/kstars/kstars/indi/fitsrw.h index 9a246930..37a80492 100644 --- a/kstars/kstars/indi/fitsrw.h +++ b/kstars/kstars/indi/fitsrw.h @@ -82,7 +82,7 @@ typedef enum { typedef struct { double pixmin, pixmax; /** The pixel values [pixmin,pixmax] that should be mapped */ double datamin, datamax; /** The data values [datamin,datamax] that the pixel values should be mapped to*/ - double replacement; /** datavalue to use for blank or NaN pixels */ + double tqreplacement; /** datavalue to use for blank or NaN pixels */ char dsttyp; /** Destination typ ('c' = char) */ } FITS_PIX_TRANSFORM; @@ -110,7 +110,7 @@ typedef struct fits_record_list { /** \struct FITS_HDU_LIST \brief Header and Data Unit List. -* The structure hold header and data unit lists. The \p used struct contains flags specifying if some cards are used. +* The structure hold header and data unit lists. The \p used struct tqcontains flags specifying if some cards are used. */ typedef struct fits_hdu_list { long header_offset; /** Offset of header in the file */ diff --git a/kstars/kstars/indi/fli/libfli.c b/kstars/kstars/indi/fli/libfli.c index 68df7945..d3962a62 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 FLIGetExposureStatus + @see FLIGetExposuretqStatus */ 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 FLIGetExposureStatus + @see FLIGetExposuretqStatus @see FLISetExposureTime */ LIBFLIAPI FLICancelExposure(flidev_t dev) @@ -652,7 +652,7 @@ LIBFLIAPI FLICancelExposure(flidev_t dev) @see FLICancelExposure @see FLISetExposureTime */ -LIBFLIAPI FLIGetExposureStatus(flidev_t dev, long *timeleft) +LIBFLIAPI FLIGetExposuretqStatus(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 FLIGetExposureStatus + @see FLIGetExposuretqStatus */ LIBFLIAPI FLIExposeFrame(flidev_t dev) { diff --git a/kstars/kstars/indi/fli/libfli.h b/kstars/kstars/indi/fli/libfli.h index 351a9e8e..ca6a7200 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 FLIGetExposureStatus(flidev_t dev, long *timeleft); +LIBFLIAPI FLIGetExposuretqStatus(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 4fa9a95a..2ce10786 100644 --- a/kstars/kstars/indi/fli_ccd.c +++ b/kstars/kstars/indi/fli_ccd.c @@ -610,13 +610,13 @@ void ISPoll(void *p) break; case IPS_BUSY: - if ( (err = FLIGetExposureStatus(fli_dev, &timeleft))) + if ( (err = FLIGetExposuretqStatus(fli_dev, &timeleft))) { ExposeTimeNP.s = IPS_IDLE; ExposeTimeN[0].value = 0; - IDSetNumber(&ExposeTimeNP, "FLIGetExposureStatus() failed. %s.", strerror((int)-err)); - IDLog("FLIGetExposureStatus() failed. %s.\n", strerror((int)-err)); + IDSetNumber(&ExposeTimeNP, "FLIGetExposuretqStatus() failed. %s.", strerror((int)-err)); + IDLog("FLIGetExposuretqStatus() failed. %s.\n", strerror((int)-err)); break; } diff --git a/kstars/kstars/indi/indiserver.c b/kstars/kstars/indi/indiserver.c index ad4d2ffd..c412e883 100644 --- a/kstars/kstars/indi/indiserver.c +++ b/kstars/kstars/indi/indiserver.c @@ -710,7 +710,7 @@ send2Clients (ClInfo *notme, XMLEle *root, char *dev) pthread_mutex_unlock (&client_m); } -/* free Msg mp and everything it contains */ +/* free Msg mp and everything it tqcontains */ static void freeMsg (Msg *mp) { diff --git a/kstars/kstars/indi/lilxml.c b/kstars/kstars/indi/lilxml.c index c8344b5e..be9d6bac 100644 --- a/kstars/kstars/indi/lilxml.c +++ b/kstars/kstars/indi/lilxml.c @@ -532,7 +532,7 @@ oneXMLchar (LilXML *lp, int c, char errmsg[]) case INCON: /* reading content */ if (c == '<') { - /* if text contains a nl trim trailing blanks. + /* if text tqcontains a nl trim trailing blanks. * chomp trailing nl if only one. */ char *nl = strpbrk (lp->ce->pcdata, "\n\r"); diff --git a/kstars/kstars/indi/lx200_16.cpp b/kstars/kstars/indi/lx200_16.cpp index fe37df18..8b705728 100644 --- a/kstars/kstars/indi/lx200_16.cpp +++ b/kstars/kstars/indi/lx200_16.cpp @@ -54,7 +54,7 @@ extern int MaxReticleFlashRate; // bool setObjAz(int degrees, int minutes); -static ISwitch FanStatusS[] = { {"On", "", ISS_OFF, 0, 0}, {"Off", "", ISS_OFF, 0, 0}}; +static ISwitch FantqStatusS[] = { {"On", "", ISS_OFF, 0, 0}, {"Off", "", ISS_OFF, 0, 0}}; static ISwitch HomeSearchS[] = { {"Save home", "", ISS_OFF, 0, 0} , {"Set home", "", ISS_OFF, 0, 0}}; static ISwitch FieldDeRotatorS[] = { {"On", "", ISS_OFF, 0, 0}, {"Off", "", ISS_OFF,0 ,0}}; //static ISwitch SlewAltAzS[] = { {"Slew To Alt/Az", ISS_ON}}; @@ -65,7 +65,7 @@ static ISwitch FieldDeRotatorS[] = { {"On", "", ISS_OFF, 0, 0}, {"Off", "", ISS_ #define MAXINDIGROUP 32 #define MAXINDIFORMAT 32 -static ISwitchVectorProperty FanStatusSw = { mydev, "Fan", "", LX16GROUP, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, FanStatusS, NARRAY(FanStatusS), "", 0}; +static ISwitchVectorProperty FantqStatusSw = { mydev, "Fan", "", LX16GROUP, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, FantqStatusS, NARRAY(FantqStatusS), "", 0}; static ISwitchVectorProperty HomeSearchSw = { mydev, "Park", "", LX16GROUP, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, HomeSearchS, NARRAY(HomeSearchS), "", 0}; @@ -85,7 +85,7 @@ static INumberVectorProperty horNum = { void changeLX200_16DeviceName(const char * newName) { strcpy(horNum.device, newName); - strcpy(FanStatusSw.device, newName); + strcpy(FantqStatusSw.device, newName); strcpy(HomeSearchSw.device, newName); strcpy(FieldDeRotatorSw.device,newName); } @@ -106,7 +106,7 @@ if (dev && strcmp (thisDevice, dev)) IDDefNumber (&horNum, NULL); - IDDefSwitch (&FanStatusSw, NULL); + IDDefSwitch (&FantqStatusSw, NULL); IDDefSwitch (&HomeSearchSw, NULL); IDDefSwitch (&FieldDeRotatorSw, NULL); @@ -196,20 +196,20 @@ void LX200_16::ISNewSwitch (const char *dev, const char *name, ISState *states, if (strcmp (dev, thisDevice)) return; - if (!strcmp(name, FanStatusSw.name)) + if (!strcmp(name, FantqStatusSw.name)) { - if (checkPower(&FanStatusSw)) + if (checkPower(&FantqStatusSw)) return; - IUResetSwitches(&FanStatusSw); - IUUpdateSwitches(&FanStatusSw, states, names, n); - index = getOnSwitch(&FanStatusSw); + IUResetSwitches(&FantqStatusSw); + IUUpdateSwitches(&FantqStatusSw, states, names, n); + index = getOnSwitch(&FantqStatusSw); if (index == 0) { if ( (err = turnFanOn()) < 0) { - handleError(&FanStatusSw, err, "Changing fan status"); + handleError(&FantqStatusSw, err, "Changing fan status"); return; } } @@ -217,13 +217,13 @@ void LX200_16::ISNewSwitch (const char *dev, const char *name, ISState *states, { if ( (err = turnFanOff()) < 0) { - handleError(&FanStatusSw, err, "Changing fan status"); + handleError(&FantqStatusSw, err, "Changing fan status"); return; } } - FanStatusSw.s = IPS_OK; - IDSetSwitch (&FanStatusSw, index == 0 ? "Fan is ON" : "Fan is OFF"); + FantqStatusSw.s = IPS_OK; + IDSetSwitch (&FantqStatusSw, index == 0 ? "Fan is ON" : "Fan is OFF"); return; } @@ -304,7 +304,7 @@ void LX200_16::handleAltAzSlew() case IPS_BUSY: - if ( (err = getHomeSearchStatus(&searchResult)) < 0) + if ( (err = getHomeSearchtqStatus(&searchResult)) < 0) { handleError(&HomeSearchSw, err, "Home search"); return; diff --git a/kstars/kstars/indi/lx200driver.c b/kstars/kstars/indi/lx200driver.c index 9c521cfe..bd85ba88 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 Status */ -int getHomeSearchStatus(int *status); +/* Get Home Search tqStatus */ +int getHomeSearchtqStatus(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 setAlignmentMode(unsigned int alignMode); +int tqsetAlignmentMode(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 currentDate[64]; + char tqcurrentDate[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(currentDate)) + if (!getCalenderDate(tqcurrentDate)) return 0; usleep(50000); @@ -534,7 +534,7 @@ int getNumberOfBars(int *value) return 0; } -int getHomeSearchStatus(int *status) +int getHomeSearchtqStatus(int *status) { char tempString[16]; @@ -726,9 +726,9 @@ int setCommandXYZ(int x, int y, int z, const char *cmd) return (setStandardProcedure(tempString)); } -int setAlignmentMode(unsigned int alignMode) +int tqsetAlignmentMode(unsigned int alignMode) { - fprintf(stderr , "Set alignment mode %d\n", alignMode); + fprintf(stderr , "Set tqalignment mode %d\n", alignMode); switch (alignMode) { diff --git a/kstars/kstars/indi/lx200driver.h b/kstars/kstars/indi/lx200driver.h index 06b8017f..529dfa02 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 Status */ -int getHomeSearchStatus(int *status); +/* Get Home Search tqStatus */ +int getHomeSearchtqStatus(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 setAlignmentMode(unsigned int alignMode); +int tqsetAlignmentMode(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 b4f6d792..311e4b68 100644 --- a/kstars/kstars/indi/lx200generic.cpp +++ b/kstars/kstars/indi/lx200generic.cpp @@ -906,9 +906,9 @@ void LX200Generic::ISNewSwitch (const char *dev, const char *name, ISState *stat IUUpdateSwitches(&AlignmentSw, states, names, n); index = getOnSwitch(&AlignmentSw); - if ( ( err = setAlignmentMode(index) < 0) ) + if ( ( err = tqsetAlignmentMode(index) < 0) ) { - handleError(&AlignmentSw, err, "Setting alignment"); + handleError(&AlignmentSw, err, "Setting tqalignment"); return; } @@ -1789,7 +1789,7 @@ void LX200Generic::getAlignment() signed char align = ACK(); if (align < 0) { - IDSetSwitch (&AlignmentSw, "Failed to get telescope alignment."); + IDSetSwitch (&AlignmentSw, "Failed to get telescope tqalignment."); return; } diff --git a/kstars/kstars/indi/lx200gps.cpp b/kstars/kstars/indi/lx200gps.cpp index 451a7269..0a02b32e 100644 --- a/kstars/kstars/indi/lx200gps.cpp +++ b/kstars/kstars/indi/lx200gps.cpp @@ -32,7 +32,7 @@ extern LX200Generic *telescope; extern int MaxReticleFlashRate; static ISwitch GPSPowerS[] = {{ "On", "", ISS_OFF, 0, 0}, {"Off", "", ISS_ON, 0, 0}}; -static ISwitch GPSStatusS[] = {{ "Sleep", "", ISS_OFF, 0, 0}, {"Wake up", "", ISS_OFF, 0 ,0}, {"Restart", "", ISS_OFF, 0, 0}}; +static ISwitch GPStqStatusS[] = {{ "Sleep", "", ISS_OFF, 0, 0}, {"Wake up", "", ISS_OFF, 0 ,0}, {"Restart", "", ISS_OFF, 0, 0}}; static ISwitch GPSUpdateS[] = { {"Update", "", ISS_OFF, 0, 0}}; static ISwitch AltDecPecS[] = {{ "Enable", "", ISS_OFF, 0 ,0}, {"Disable", "", ISS_OFF, 0 ,0}}; static ISwitch AzRaPecS[] = {{ "Enable", "", ISS_OFF, 0, 0}, {"Disable", "", ISS_OFF, 0 ,0}}; @@ -42,7 +42,7 @@ static ISwitch AzRaBackSlashS[] = {{ "Activate", "", ISS_OFF, 0, 0}}; static ISwitch OTAUpdateS[] = {{ "Update", "", ISS_OFF, 0, 0}}; static ISwitchVectorProperty GPSPowerSw = { mydev, "GPS Power", "", GPSGroup, IP_RW, ISR_1OFMANY, 0 , IPS_IDLE, GPSPowerS, NARRAY(GPSPowerS), "", 0}; -static ISwitchVectorProperty GPSStatusSw = { mydev, "GPS Status", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, GPSStatusS, NARRAY(GPSStatusS), "", 0}; +static ISwitchVectorProperty GPStqStatusSw = { mydev, "GPS tqStatus", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, GPStqStatusS, NARRAY(GPStqStatusS), "", 0}; static ISwitchVectorProperty GPSUpdateSw = { mydev, "GPS System", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, GPSUpdateS, NARRAY(GPSUpdateS), "", 0}; static ISwitchVectorProperty AltDecPecSw = { mydev, "Alt/Dec PEC", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, AltDecPecS, NARRAY(AltDecPecS), "", 0}; static ISwitchVectorProperty AzRaPecSw = { mydev, "Az/Ra PEC", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, AzRaPecS, NARRAY(AzRaPecS), "", 0}; @@ -59,7 +59,7 @@ void updateTemp(void * /*p*/); void changeLX200GPSDeviceName(const char *newName) { strcpy(GPSPowerSw.device, newName); - strcpy(GPSStatusSw.device, newName ); + strcpy(GPStqStatusSw.device, newName ); strcpy(GPSUpdateSw.device, newName ); strcpy(AltDecPecSw.device, newName ); strcpy(AzRaPecSw.device,newName ); @@ -87,7 +87,7 @@ if (dev && strcmp (thisDevice, dev)) LX200_16::ISGetProperties(dev); IDDefSwitch (&GPSPowerSw, NULL); -IDDefSwitch (&GPSStatusSw, NULL); +IDDefSwitch (&GPStqStatusSw, NULL); IDDefSwitch (&GPSUpdateSw, NULL); IDDefSwitch (&AltDecPecSw, NULL); IDDefSwitch (&AzRaPecSw, NULL); @@ -139,15 +139,15 @@ void LX200GPS::ISNewNumber (const char *dev, const char *name, double values[], return; } - /* GPS Status Update */ - if (!strcmp(name,GPSStatusSw.name)) + /* GPS tqStatus Update */ + if (!strcmp(name,GPStqStatusSw.name)) { - if (checkPower(&GPSStatusSw)) + if (checkPower(&GPStqStatusSw)) return; - IUResetSwitches(&GPSStatusSw); - IUUpdateSwitches(&GPSStatusSw, states, names, n); - index = getOnSwitch(&GPSStatusSw); + IUResetSwitches(&GPStqStatusSw); + IUUpdateSwitches(&GPStqStatusSw, states, names, n); + index = getOnSwitch(&GPStqStatusSw); if (index == 0) { @@ -167,8 +167,8 @@ void LX200GPS::ISNewNumber (const char *dev, const char *name, double values[], updateLocation(); } - GPSStatusSw.s = IPS_OK; - IDSetSwitch (&GPSStatusSw, "%s", msg); + GPStqStatusSw.s = IPS_OK; + IDSetSwitch (&GPStqStatusSw, "%s", msg); return; } diff --git a/kstars/kstars/indi/sbigccd.cpp b/kstars/kstars/indi/sbigccd.cpp index fb35cf59..d5b03096 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 readStatus=0; + int readtqStatus=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 /* - readStatus = cam->read_Status(); - if (readStatus < 0) + readtqStatus = cam->read_tqStatus(); + if (readtqStatus < 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 (readStatus == Camera_Status_ImageReady) + else if (readtqStatus == Camera_tqStatus_ImageReady) { ExposeTimeN[0].value = 0; ExposeTimeNP.s = IPS_OK; diff --git a/kstars/kstars/indi/webcam/ccvt.h b/kstars/kstars/indi/webcam/ccvt.h index c78f88a6..f98a4bd2 100644 --- a/kstars/kstars/indi/webcam/ccvt.h +++ b/kstars/kstars/indi/webcam/ccvt.h @@ -27,7 +27,7 @@ CCMAIL: kstars-devel@kde.org Revision 1.3 2004/06/26 23:12:03 mutlaqja - Hopefully this will fix compile issues on 64bit archs, and FreeBSD, among others. The assembly code is replaced with a more portable, albeit slower C implementation. I imported the videodev.h header after cleaning it for user space. + Hopefully this will fix compile issues on 64bit archs, and FreeBSD, among others. The assembly code is tqreplaced with a more portable, albeit slower C implementation. I imported the videodev.h header after cleaning it for user space. Anyone who has problems compiling this, please report the problem to kstars-devel@kde.org diff --git a/kstars/kstars/indi/webcam/ccvt_c2.c b/kstars/kstars/indi/webcam/ccvt_c2.c index 52ed276d..1fb7bcbf 100644 --- a/kstars/kstars/indi/webcam/ccvt_c2.c +++ b/kstars/kstars/indi/webcam/ccvt_c2.c @@ -8,7 +8,7 @@ #include "ccvt_types.h" /* by suitable definition of PIXTYPE, can do yuv to rgb or bgr, with or -without word alignment */ +without word tqalignment */ /* This doesn't exactly earn a prize in a programming beauty contest. */ diff --git a/kstars/kstars/indi/webcam/ccvt_misc.c b/kstars/kstars/indi/webcam/ccvt_misc.c index e774ca6d..0d907f8b 100644 --- a/kstars/kstars/indi/webcam/ccvt_misc.c +++ b/kstars/kstars/indi/webcam/ccvt_misc.c @@ -19,7 +19,7 @@ reached at nemosoft@smcc.demon.nl. */ -/* This file contains CCVT functions that aren't available in assembly yet +/* This file tqcontains CCVT functions that aren't available in assembly yet (or are not worth programming) */ @@ -31,7 +31,7 @@ * CCMAIL: kstars-devel@kde.org * * Revision 1.1 2004/06/26 23:12:03 mutlaqja - * Hopefully this will fix compile issues on 64bit archs, and FreeBSD, among others. The assembly code is replaced with a more portable, albeit slower C implementation. I imported the videodev.h header after cleaning it for user space. + * Hopefully this will fix compile issues on 64bit archs, and FreeBSD, among others. The assembly code is tqreplaced with a more portable, albeit slower C implementation. I imported the videodev.h header after cleaning it for user space. * * Anyone who has problems compiling this, please report the problem to kstars-devel@kde.org * diff --git a/kstars/kstars/indi/webcam/pwc-ioctl.h b/kstars/kstars/indi/webcam/pwc-ioctl.h index 9b650298..d545eb76 100644 --- a/kstars/kstars/indi/webcam/pwc-ioctl.h +++ b/kstars/kstars/indi/webcam/pwc-ioctl.h @@ -43,7 +43,7 @@ /* The frame rate is encoded in the video_window.flags parameter using the upper 16 bits, since some flags are defined nowadays. The following - defines provide a mask and shift to filter out this value. + defines provide a tqmask and shift to filter out this value. In 'Snapshot' mode the camera freezes its automatic exposure and colour balance controls. diff --git a/kstars/kstars/indi/webcam/videodev.h b/kstars/kstars/indi/webcam/videodev.h index a5b0aec7..eb0ac6cf 100644 --- a/kstars/kstars/indi/webcam/videodev.h +++ b/kstars/kstars/indi/webcam/videodev.h @@ -214,7 +214,7 @@ struct video_info unsigned int picture_type; /* current picture type */ unsigned int temporal_reference; /* current temporal reference */ unsigned char user_data[256]; /* user data last found in compressed stream */ - /* user_data[0] contains user data flags, user_data[1] has count */ + /* user_data[0] tqcontains user data flags, user_data[1] has count */ }; /* generic structure for setting playback modes */ diff --git a/kstars/kstars/indiconf.ui b/kstars/kstars/indiconf.ui index c5edd124..6b1d448f 100644 --- a/kstars/kstars/indiconf.ui +++ b/kstars/kstars/indiconf.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>INDIConf</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -43,7 +43,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -66,13 +66,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>28</width> <height>28</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>28</width> <height>28</height> @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -238,7 +238,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>200</width> <height>21</height> @@ -302,7 +302,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> @@ -328,7 +328,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <vbox> <property name="name"> @@ -372,7 +372,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>20</height> @@ -405,7 +405,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/indidevice.cpp b/kstars/kstars/indidevice.cpp index e7a36efc..e0de3418 100644 --- a/kstars/kstars/indidevice.cpp +++ b/kstars/kstars/indidevice.cpp @@ -605,7 +605,7 @@ INDI_P * INDI_D::addProperty (XMLEle *root, char errmsg[]) return NULL; } - /* Remove Vertical spacer from group layout, this is done everytime + /* Remove Vertical spacer from group tqlayout, this is done everytime * a new property arrives. The spacer is then appended to the end of the * properties */ pg->propertyLayout->removeItem(pg->VerticalSpacer); @@ -775,7 +775,7 @@ int INDI_D::buildTextGUI(XMLEle *root, char errmsg[]) if (pp == NULL) return (-1); - /* get the permission, it will determine layout issues */ + /* get the permission, it will determine tqlayout issues */ if (findPerm (pp, root, &p, errmsg)) { delete(pp); @@ -811,7 +811,7 @@ int INDI_D::buildNumberGUI (XMLEle *root, char *errmsg) if (pp == NULL) return (-1); - /* get the permission, it will determine layout issues */ + /* get the permission, it will determine tqlayout issues */ if (findPerm (pp, root, &p, errmsg)) { delete(pp); @@ -879,7 +879,7 @@ int INDI_D::buildSwitchesGUI (XMLEle *root, char errmsg[]) return (err); } - /* otherwise, build 1-4 button layout */ + /* otherwise, build 1-4 button tqlayout */ pp->guitype = PG_BUTTONS; err = pp->buildSwitchesGUI(root, errmsg); @@ -896,7 +896,7 @@ int INDI_D::buildSwitchesGUI (XMLEle *root, char errmsg[]) } else if (!strcmp (valuXMLAtt(ap), "AnyOfMany")) { - /* 1-4 checkboxes layout */ + /* 1-4 checkboxes tqlayout */ pp->guitype = PG_RADIO; err = pp->buildSwitchesGUI(root, errmsg); @@ -955,7 +955,7 @@ int INDI_D::buildBLOBGUI (XMLEle *root, char errmsg[]) if (!pp) return (-1); - /* get the permission, it will determine layout issues */ + /* get the permission, it will determine tqlayout issues */ if (findPerm (pp, root, &p, errmsg)) { delete(pp); diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp index 8c2e0db6..f9073f23 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(processHostStatus(int))); +TQObject::connect(ClientpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processHostqStatus(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(processDeviceStatus(int))); +TQObject::connect(LocalpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processDevicetqStatus(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() { - processDeviceStatus(0); + processDevicetqStatus(0); } void INDIDriver::activateStopService() { - processDeviceStatus(1); + processDevicetqStatus(1); } void INDIDriver::activateHostConnection() { - processHostStatus(0); + processHostqStatus(0); } void INDIDriver::activateHostDisconnection() { - processHostStatus(1); + processHostqStatus(1); } void INDIDriver::updateLocalButtons() @@ -244,7 +244,7 @@ for (uint i=0; i < ksw->data()->INDIHostsList.count(); i++) } -void INDIDriver::processDeviceStatus(int id) +void INDIDriver::processDevicetqStatus(int id) { if (localListView->selectedItem() == NULL) return; @@ -301,7 +301,7 @@ void INDIDriver::processDeviceStatus(int id) } } -void INDIDriver::processHostStatus(int id) +void INDIDriver::processHostqStatus(int id) { int mgrID; bool toConnect = (id == 0); @@ -829,7 +829,7 @@ void INDIDriver::modifyINDIHost() currentItem->setText(1, hostConf.nameIN->text()); currentItem->setText(2, hostConf.portnumber->text()); - ksw->data()->INDIHostsList.replace(clientListView->itemIndex(currentItem), hostItem); + ksw->data()->INDIHostsList.tqreplace(clientListView->itemIndex(currentItem), hostItem); saveHosts(); } diff --git a/kstars/kstars/indidriver.h b/kstars/kstars/indidriver.h index 3511112e..36586833 100644 --- a/kstars/kstars/indidriver.h +++ b/kstars/kstars/indidriver.h @@ -130,8 +130,8 @@ public slots: void updateMenuActions(); void ClientprocessRightButton( TQListViewItem *, const TQPoint &, int ); void LocalprocessRightButton( TQListViewItem *, const TQPoint &, int ); - void processDeviceStatus(int); - void processHostStatus(int); + void processDevicetqStatus(int); + void processHostqStatus(int); void addINDIHost(); void modifyINDIHost(); void removeINDIHost(); diff --git a/kstars/kstars/indielement.cpp b/kstars/kstars/indielement.cpp index 0ae460f7..310e0971 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->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) ); +label_w->tqsetAlignment( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) ); + spin_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) ); else - spin_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) ); + spin_w->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, write_w->sizePolicy().hasHeightForWidth() )); + write_w->tqsetSizePolicy( 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->setAlignment( int( KLineEdit::AlignHCenter ) ); + read_w->tqsetAlignment( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, browse_w->sizePolicy().hasHeightForWidth() ) ); + browse_w->tqsetSizePolicy( 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/indielement.h b/kstars/kstars/indielement.h index d7c18e15..6e5b7b29 100644 --- a/kstars/kstars/indielement.h +++ b/kstars/kstars/indielement.h @@ -21,7 +21,7 @@ #define INDIVERSION 1.5 /* we support this or less */ -/* GUI layout */ +/* GUI tqlayout */ #define PROPERTY_LABEL_WIDTH 80 #define ELEMENT_LABEL_WIDTH 175 #define ELEMENT_READ_WIDTH 175 @@ -97,7 +97,7 @@ class INDI_E : public QObject PState state; /* control on/off t/f etc */ INDI_P *pp; /* parent property */ - TQHBoxLayout *EHBox; /* Horizontal layout */ + TQHBoxLayout *EHBox; /* Horizontal tqlayout */ /* GUI widgets, only malloced when needed */ KSqueezedTextLabel *label_w; // label diff --git a/kstars/kstars/indigroup.h b/kstars/kstars/indigroup.h index 097e6a10..28e8b5aa 100644 --- a/kstars/kstars/indigroup.h +++ b/kstars/kstars/indigroup.h @@ -34,7 +34,7 @@ class INDI_G TQString name; /* Group name */ INDI_D *dp; /* Parent device */ TQFrame *propertyContainer; /* Properties container */ - TQVBoxLayout *propertyLayout; /* Properties layout */ + TQVBoxLayout *propertyLayout; /* Properties tqlayout */ TQSpacerItem *VerticalSpacer; /* Vertical spacer */ TQPtrList<INDI_P> pl; /* malloced list of pointers to properties */ diff --git a/kstars/kstars/indihostconf.ui b/kstars/kstars/indihostconf.ui index f8b6c743..c0bdac80 100644 --- a/kstars/kstars/indihostconf.ui +++ b/kstars/kstars/indihostconf.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>INDIHostConf</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> @@ -63,7 +63,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>35</height> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -186,5 +186,5 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/indimenu.cpp b/kstars/kstars/indimenu.cpp index 99181b0b..4742f28b 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::updateStatus() +void INDIMenu::updatetqStatus() { INDIDriver *drivers = ksw->getINDIDriver(); diff --git a/kstars/kstars/indimenu.h b/kstars/kstars/indimenu.h index 344d087e..14f8a36f 100644 --- a/kstars/kstars/indimenu.h +++ b/kstars/kstars/indimenu.h @@ -66,7 +66,7 @@ class INDIMenu : public KDialogBase TQPtrList<DeviceManager> mgr; - void updateStatus(); + void updatetqStatus(); //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 058e154c..7499db2c 100644 --- a/kstars/kstars/indiproperty.cpp +++ b/kstars/kstars/indiproperty.cpp @@ -47,7 +47,7 @@ #include <stdlib.h> /******************************************************************* -** INDI Property: contains widgets, labels, and their status +** INDI Property: tqcontains widgets, labels, and their status *******************************************************************/ INDI_P::INDI_P(INDI_G *parentGroup, TQString inName) { @@ -209,7 +209,7 @@ void INDI_P::convertSwitch(int id) if (assosiatedPopup == NULL) return; - mLabel = assosiatedPopup->text(id).replace("&", ""); + mLabel = assosiatedPopup->text(id).tqreplace("&", ""); //kdDebug() << "Name: " << name << " ID: " << id << endl; /* Special case is CCD_EXPOSE_DURATION, not a switch */ @@ -438,19 +438,19 @@ void INDI_P::addGUI (XMLEle *root) else label_w = new TQLabel(label, pg->propertyContainer); - label_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, label_w->sizePolicy().hasHeightForWidth() ) ); + label_w->tqsetSizePolicy( 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->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignHCenter) ); + label_w->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignHCenter) ); PHBox->addWidget(label_w); light->show(); label_w->show(); - /* #3 Add the Vertical layout thay may contain several elements */ + /* #3 Add the Vertical tqlayout thay may contain several elements */ PHBox->addLayout(PVBox); } @@ -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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, set_w->sizePolicy().hasHeightForWidth() ) ); + set_w->tqsetSizePolicy( 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/indistd.cpp b/kstars/kstars/indistd.cpp index b21f46b5..f7d71259 100644 --- a/kstars/kstars/indistd.cpp +++ b/kstars/kstars/indistd.cpp @@ -63,7 +63,7 @@ dp = associatedDevice; ksw = kswPtr; initDevCounter = 0; - seqCount = 0; + setqCount = 0; batchMode = false; ISOMode = false; @@ -158,7 +158,7 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d strncpy(tempFileStr, filename, 256); if ( batchMode && !ISOMode) - snprintf(filename, sizeof(filename), "%s/%s_%02d.fits", tempFileStr, seqPrefix.ascii(), seqCount); + snprintf(filename, sizeof(filename), "%s/%s_%02d.fits", tempFileStr, seqPrefix.ascii(), setqCount); else if (!batchMode && !Options::indiFITSDisplay()) { strftime (ts, sizeof(ts), "%Y-%m-%dT%H:%M:%S", tp); @@ -167,10 +167,10 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d else { strftime (ts, sizeof(ts), "%Y-%m-%dT%H:%M:%S", tp); - snprintf(filename, sizeof(filename), "%s/%s_%02d_%s.fits", tempFileStr, seqPrefix.ascii(), seqCount, ts); + snprintf(filename, sizeof(filename), "%s/%s_%02d_%s.fits", tempFileStr, seqPrefix.ascii(), setqCount, ts); } - seqCount++; + setqCount++; } else { @@ -447,7 +447,7 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d seqLister->setNameFilter(TQString("%1_*.fits").arg(seqPrefix)); - seqCount = 0; + setqCount = 0; if (ISOMode) return; @@ -486,8 +486,8 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d newFileIndex = strtol(t, NULL, 10); - if (newFileIndex >= seqCount) - seqCount = newFileIndex + 1; + if (newFileIndex >= setqCount) + setqCount = newFileIndex + 1; } delete [] (tempPrefix); diff --git a/kstars/kstars/indistd.h b/kstars/kstars/indistd.h index 407ac02b..52a29e9b 100644 --- a/kstars/kstars/indistd.h +++ b/kstars/kstars/indistd.h @@ -74,7 +74,7 @@ LilXML *parser; QString seqPrefix; - int seqCount; + int setqCount; bool batchMode; bool ISOMode; KDirLister *seqLister; diff --git a/kstars/kstars/infobox.h b/kstars/kstars/infobox.h index e9953404..b2cbfeca 100644 --- a/kstars/kstars/infobox.h +++ b/kstars/kstars/infobox.h @@ -26,7 +26,7 @@ /**@class InfoBox *InfoBoxencapsulates a lightweight floating "window" to be drawn directly - *on a pixmap. The window contains three lines of text, and it can + *on a pixmap. The window tqcontains three lines of text, and it can *be "shaded" to show only the top line. The window resizes itself *automatically to contain the text within it. *@author Jason Harris @@ -39,7 +39,7 @@ class InfoBox : public TQObject { Q_OBJECT public: /**default constructor. Creates an infobox with empty text string - *and default geometry + *and default tqgeometry */ InfoBox(); @@ -169,7 +169,7 @@ public: /**@return the third line of text*/ TQString text3() const { return Text3; } - /**@return the geometry of the box*/ + /**@return the tqgeometry of the box*/ TQRect rect() const; /**@return TRUE if the box is anchored to the right window edge*/ @@ -184,10 +184,10 @@ public: /**Set the box to be anchored to the bottom window edge*/ void setAnchorBottom( const bool ab ); - /**@return the box's anchor flag bitmask.*/ + /**@return the box's anchor flag bitqmask.*/ int anchorFlag() const { return AnchorFlag; } - /**Set the box's anchor flag bitmask*/ + /**Set the box's anchor flag bitqmask*/ void setAnchorFlag( const int af ) { AnchorFlag = af; } enum AnchorType { diff --git a/kstars/kstars/infoboxes.cpp b/kstars/kstars/infoboxes.cpp index dff865e4..fdd95517 100644 --- a/kstars/kstars/infoboxes.cpp +++ b/kstars/kstars/infoboxes.cpp @@ -126,17 +126,17 @@ void InfoBoxes::drawBoxes( TQPainter &p, TQColor FGColor, TQColor grabColor, } bool InfoBoxes::grabBox( TQMouseEvent *e ) { - if ( GeoBox->rect().contains( e->pos() ) ) { + if ( GeoBox->rect().tqcontains( e->pos() ) ) { GrabbedBox = 1; GrabPos.setX( e->x() - GeoBox->x() ); GrabPos.setY( e->y() - GeoBox->y() ); return true; - } else if ( TimeBox->rect().contains( e->pos() ) ) { + } else if ( TimeBox->rect().tqcontains( e->pos() ) ) { GrabbedBox = 2; GrabPos.setX( e->x() - TimeBox->x() ); GrabPos.setY( e->y() - TimeBox->y() ); return true; - } else if ( FocusBox->rect().contains( e->pos() ) ) { + } else if ( FocusBox->rect().tqcontains( e->pos() ) ) { GrabbedBox = 3; GrabPos.setX( e->x() - FocusBox->x() ); GrabPos.setY( e->y() - FocusBox->y() ); @@ -180,7 +180,7 @@ bool InfoBoxes::dragBox( TQMouseEvent *e ) { } bool InfoBoxes::shadeBox( TQMouseEvent *e ) { - if ( GeoBox->rect().contains( e->pos() ) ) { + if ( GeoBox->rect().tqcontains( e->pos() ) ) { GeoBox->toggleShade(); if ( GeoBox->rect().bottom() > height() ) GeoBox->move( GeoBox->x(), height() - GeoBox->height() ); if ( GeoBox->rect().right() > width() ) GeoBox->move( width() - GeoBox->width(), GeoBox->y() ); @@ -189,7 +189,7 @@ bool InfoBoxes::shadeBox( TQMouseEvent *e ) { fixCollisions( TimeBox ); fixCollisions( FocusBox ); return true; - } else if ( TimeBox->rect().contains( e->pos() ) ) { + } else if ( TimeBox->rect().tqcontains( e->pos() ) ) { TimeBox->toggleShade(); if ( TimeBox->rect().bottom() > height() ) TimeBox->move( TimeBox->x(), height() - TimeBox->height() ); if ( TimeBox->rect().right() > width() ) TimeBox->move( width() - TimeBox->width(), TimeBox->y() ); @@ -198,7 +198,7 @@ bool InfoBoxes::shadeBox( TQMouseEvent *e ) { fixCollisions( GeoBox ); fixCollisions( FocusBox ); return true; - } else if ( FocusBox->rect().contains( e->pos() ) ) { + } else if ( FocusBox->rect().tqcontains( e->pos() ) ) { FocusBox->toggleShade(); if ( FocusBox->rect().bottom() > height() ) FocusBox->move( FocusBox->x(), height() - FocusBox->height() ); if ( FocusBox->rect().right() > width() ) FocusBox->move( width() - FocusBox->width(), FocusBox->y() ); @@ -248,7 +248,7 @@ bool InfoBoxes::fixCollisions( InfoBox *target ) { if ( Box2.width() ) Box2.setCoords( Box2.left()+1, Box2.top()+1, Box2.right()-1, Box2.bottom()-1 ); //First, make sure target box is within area rect. - if ( ! area.contains( t ) ) { + if ( ! area.tqcontains( t ) ) { /* if ( t.x() < area.x() ) target->move( area.x(), t.y() ); if ( t.y() < area.y() ) target->move( t.x(), area.y() ); if ( t.right() > area.right() ){ target->move( area.right() - t.width(), t.y() ); } @@ -280,25 +280,25 @@ bool InfoBoxes::fixCollisions( InfoBox *target ) { leftRect.moveTopLeft( TQPoint( t.x() - dLeft, t.y() ) ); } //If leftRect is outside area, set dLeft to a nonsense large value - if ( !area.contains( leftRect ) ) { dLeft = 100000; } + if ( !area.tqcontains( leftRect ) ) { dLeft = 100000; } //repeat for right, up and down directions. while ( rightRect.intersects( Box1 ) || rightRect.intersects( Box2 ) ) { ++dRight; rightRect.moveTopLeft( TQPoint( t.x() + dRight, t.y() ) ); } - if ( !area.contains( rightRect ) ) { dRight = 100000; } + if ( !area.tqcontains( rightRect ) ) { dRight = 100000; } while ( upRect.intersects( Box1 ) || upRect.intersects( Box2 ) ) { ++dUp; upRect.moveTopLeft( TQPoint( t.x(), t.y() - dUp ) ); } - if ( !area.contains( upRect ) ) { dUp = 100000; } + if ( !area.tqcontains( upRect ) ) { dUp = 100000; } while ( downRect.intersects( Box1 ) || downRect.intersects( Box2 ) ) { ++dDown; downRect.moveTopLeft( TQPoint( t.x(), t.y() + dDown ) ); } - if ( !area.contains( downRect ) ) { dDown = 100000; } + if ( !area.tqcontains( downRect ) ) { dDown = 100000; } //find the smallest displacement, and move the target box there. @@ -331,7 +331,7 @@ bool InfoBoxes::fixCollisions( InfoBox *target ) { //Final check to see if we're still inside area (we may not be if target //is bigger than area) - if ( area.contains( target->rect() ) ) return true; + if ( area.tqcontains( target->rect() ) ) return true; else return false; } @@ -351,7 +351,7 @@ bool InfoBoxes::timeChanged( const KStarsDateTime &ut, const KStarsDateTime <, //Don't use KLocale::formatNumber() for Julian Day because we don't want //thousands-place separators TQString JDString = TQString::number( ut.djd(), 'f', 2 ); - JDString.replace( ".", KGlobal::locale()->decimalSymbol() ); + JDString.tqreplace( ".", KGlobal::locale()->decimalSymbol() ); TimeBox->setText3( i18n( "Sidereal Time", "ST: " ) + STString + i18n( "Julian Day", "JD: " ) + JDString ); diff --git a/kstars/kstars/infoboxes.h b/kstars/kstars/infoboxes.h index 25ec2d23..dc3799ff 100644 --- a/kstars/kstars/infoboxes.h +++ b/kstars/kstars/infoboxes.h @@ -162,7 +162,7 @@ public: *to the box position equal to GrabPos. (this is called by SkyMap::mouseMoveEvent() ). *Once the box has been moved, we call fixCollisions() to make sure the boxes don't *overlap or exceed the SkyMap boundaries. - *@param e The mouse event which contains the new mouse cursor position + *@param e The mouse event which tqcontains the new mouse cursor position *@return false if no box is grabbed; otherwise, moves the grabbed box and returns true. */ bool dragBox( TQMouseEvent *e ); diff --git a/kstars/kstars/kscomet.cpp b/kstars/kstars/kscomet.cpp index 94ed1762..af14444b 100644 --- a/kstars/kstars/kscomet.cpp +++ b/kstars/kstars/kscomet.cpp @@ -48,8 +48,8 @@ KSComet::KSComet( KStarsData *_kd, TQString _s, TQString imfile, //Compute the orbital Period from Kepler's 3rd law: P = 365.2568984 * pow(a, 1.5); //period in days - //If the name contains a "/", make this name2 and make name a truncated version without the leading "P/" or "C/" - if ( name().contains( "/" ) ) { + //If the name tqcontains a "/", make this name2 and make name a truncated version without the leading "P/" or "C/" + if ( name().tqcontains( "/" ) ) { setLongName( name() ); setName( name().mid( name().find("/") + 1 ) ); } diff --git a/kstars/kstars/ksnewstuff.cpp b/kstars/kstars/ksnewstuff.cpp index e416388e..d353613b 100644 --- a/kstars/kstars/ksnewstuff.cpp +++ b/kstars/kstars/ksnewstuff.cpp @@ -79,7 +79,7 @@ void KSNewStuff::updateData( const TQString &path ) { //Handle the Steinicke NGC/IC catalog - if ( !NGCUpdated && qd[0].contains( "ngcic" ) ) { + if ( !NGCUpdated && qd[0].tqcontains( "ngcic" ) ) { //Build a progress dialog to show during data installation. KProgressDialog prog( 0, "newstuffprogdialog", i18n( "Please Wait" ), i18n( "Installing Steinicke NGC/IC catalog..." ), false /*modal*/ ); diff --git a/kstars/kstars/ksplanet.h b/kstars/kstars/ksplanet.h index c30e40e7..5e66b879 100644 --- a/kstars/kstars/ksplanet.h +++ b/kstars/kstars/ksplanet.h @@ -30,7 +30,7 @@ *(Earth and Pluto have their own specialized classes derived from KSPlanetBase). *@note The Sun is subclassed from KSPlanet. * - *KSPlanet contains internal classes to manage the computations of a planet's position. + *KSPlanet tqcontains internal classes to manage the computations of a planet's position. *The position is computed as a series of sinusoidal sums, similar to a Fourier *transform. See "Astronomical Algorithms" by Jean Meeus or the file README.planetmath *for details. @@ -83,7 +83,7 @@ protected: virtual bool findGeocentricPosition( const KSNumbers *num, const KSPlanetBase *Earth=NULL ); /**@class OrbitData - *This class contains doubles A,B,C which represent a single term in a planet's + *This class tqcontains doubles A,B,C which represent a single term in a planet's *positional expansion sums (each sum-term is A*COS(B+C*T)). *@author Mark Hollomon *@version 1.0 @@ -103,7 +103,7 @@ protected: typedef TQPtrVector<OrbitData> OBArray[6]; -/**OrbitDataColl contains three groups of six QPtrVectors. Each TQPtrVector is a +/**OrbitDataColl tqcontains three groups of six QPtrVectors. Each TQPtrVector is a *list of OrbitData objects, representing a single sum used in computing *the planet's position. A set of six of these vectors comprises the large *"meta-sum" which yields the planet's Longitude, Latitude, or Distance value. diff --git a/kstars/kstars/kspopupmenu.cpp b/kstars/kstars/kspopupmenu.cpp index 5f1a7829..b767275a 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->setAlignment( AlignCenter ); + pmTitle->tqsetAlignment( 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->setAlignment( AlignCenter ); + pmTitle2->tqsetAlignment( AlignCenter ); pmTitle2->setPalette( pal ); insertItem( pmTitle2 ); } if ( ! s3.isEmpty() ) { pmType = new TQLabel( s3, this ); - pmType->setAlignment( AlignCenter ); + pmType->tqsetAlignment( AlignCenter ); pmType->setPalette( pal ); insertItem( pmType ); } TQString c = obj->constellation( ksw->data()->csegmentList, ksw->data()->cnameList ); pmConstellation = new TQLabel( c, this ); - pmConstellation->setAlignment( AlignCenter ); + pmConstellation->tqsetAlignment( AlignCenter ); pmConstellation->setPalette( pal ); insertItem( pmConstellation ); //Insert Rise/Set/Transit labels if ( showRiseSet && obj ) { pmRiseTime = new TQLabel( i18n( "Rise time: 00:00" ), this ); - pmRiseTime->setAlignment( AlignCenter ); + pmRiseTime->tqsetAlignment( 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->setAlignment( AlignCenter ); + pmSetTime->tqsetAlignment( AlignCenter ); pmSetTime->setPalette( pal ); pmSetTime->setFont( rsFont ); pmTransitTime = new TQLabel( i18n( "Transit time: 00:00" ), this ); - pmTransitTime->setAlignment( AlignCenter ); + pmTransitTime->tqsetAlignment( AlignCenter ); pmTransitTime->setPalette( pal ); pmTransitTime->setFont( rsFont ); insertSeparator(); @@ -320,7 +320,7 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr } if ( showObsList && obj ) { - if ( ksw->observingList()->contains( obj ) ) + if ( ksw->observingList()->tqcontains( obj ) ) insertItem( i18n("Remove From List"), ksw->observingList(), TQT_SLOT( slotRemoveObject() ) ); else insertItem( i18n("Add to List"), ksw->observingList(), TQT_SLOT( slotAddObject() ) ); diff --git a/kstars/kstars/kstars.cpp b/kstars/kstars/kstars.cpp index b18f65fe..c41a39f7 100644 --- a/kstars/kstars/kstars.cpp +++ b/kstars/kstars/kstars.cpp @@ -14,7 +14,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -//JH 11.06.2002: replaced infoPanel with infoBoxes +//JH 11.06.2002: tqreplaced infoPanel with infoBoxes //JH 24.08.2001: reorganized infoPanel //JH 25.08.2001: added toolbar, converted menu items to KAction objects //JH 25.08.2001: main window now resizable, window size saved in config file @@ -103,7 +103,7 @@ KStars::~KStars() Options::setFocusRA( skymap->focus()->ra()->Hours() ); Options::setFocusDec( skymap->focus()->dec()->Degrees() ); - //Store Window geometry in Options object + //Store Window tqgeometry in Options object Options::setWindowWidth( width() ); Options::setWindowHeight( height() ); diff --git a/kstars/kstars/kstars.h b/kstars/kstars/kstars.h index 73c10127..faeaf5c0 100644 --- a/kstars/kstars/kstars.h +++ b/kstars/kstars/kstars.h @@ -58,8 +58,8 @@ class imagesequence; /** *@class KStars *@short This is the main window for KStars. - *In addition to the GUI elements, the class contains the program clock, - *KStarsData, and SkyMap objects. It also contains functions for the DCOP interface. + *In addition to the GUI elements, the class tqcontains the program clock, + *KStarsData, and SkyMap objects. It also tqcontains functions for the DCOP interface. *@author Jason Harris *@version 1.0 */ @@ -84,7 +84,7 @@ class KStars : public KMainWindow, virtual public KStarsInterface */ ~KStars(); - /**@return pointer to KStarsData object which contains application data. + /**@return pointer to KStarsData object which tqcontains application data. */ KStarsData* data(); @@ -381,7 +381,7 @@ class KStars : public KMainWindow, virtual public KStarsInterface public slots: /** - *Update time-dependent data and (possibly) repaint the sky map. + *Update time-dependent data and (possibly) tqrepaint the sky map. *@p automaticDSTchange change DST status automatically? */ void updateTime( const bool automaticDSTchange = true ); @@ -624,7 +624,7 @@ class KStars : public KMainWindow, virtual public KStarsInterface void initFOV(); /** - *Initialize Status bar. + *Initialize tqStatus bar. */ void initStatusBar(); diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp index c370d55e..7e071142 100644 --- a/kstars/kstars/kstarsactions.cpp +++ b/kstars/kstars/kstarsactions.cpp @@ -87,7 +87,7 @@ #endif // KDE >= 3.2.90 #include "imagesequence.h" -//This file contains function definitions for Actions declared in kstars.h +//This file tqcontains function definitions for Actions declared in kstars.h /** ViewToolBar Action. All of the viewToolBar buttons are connected to this slot. **/ @@ -227,7 +227,7 @@ void KStars::slotImageSequence() if (indiseq == NULL) indiseq = new imagesequence(this); - if (indiseq->updateStatus()) + if (indiseq->updatetqStatus()) indiseq->show(); } @@ -248,7 +248,7 @@ void KStars::slotINDIPanel() { if (indimenu == NULL) indimenu = new INDIMenu(this); - indimenu->updateStatus(); + indimenu->updatetqStatus(); } void KStars::slotINDIDriver() { @@ -553,7 +553,7 @@ void KStars::slotRunScript() { if ( ! fileOK ) { int answer; - answer = KMessageBox::warningContinueCancel( 0, i18n( "The selected script contains unrecognized elements," + answer = KMessageBox::warningContinueCancel( 0, i18n( "The selected script tqcontains unrecognized elements," "indicating that it was not created using the KStars script builder. " "This script may not function properly, and it may even contain malicious code. " "Would you like to execute it anyway?" ), @@ -595,7 +595,7 @@ void KStars::slotPrint() { //Set Time to CPU clock void KStars::slotSetTimeToNow() { - data()->changeDateTime( geo()->LTtoUT( KStarsDateTime::currentDateTime() ) ); + data()->changeDateTime( geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ) ); if ( Options::useAltAz() ) { map()->focus()->HorizontalToEquatorial( LST(), geo()->lat() ); @@ -823,7 +823,7 @@ void KStars::slotTargetSymbol() { Options::setFOVName( f.name() ); Options::setFOVSize( f.size() ); - Options::setFOVShape( f.shape() ); + Options::setFOVShape( f.tqshape() ); Options::setFOVColor( f.color() ); data()->fovSymbol.setName( Options::fOVName() ); data()->fovSymbol.setSize( Options::fOVSize() ); @@ -840,7 +840,7 @@ void KStars::slotTargetSymbol() { void KStars::slotFOVEdit() { FOVDialog fovdlg( this ); if ( fovdlg.exec() == TQDialog::Accepted ) { - //replace existing fov.dat with data from the FOVDialog + //tqreplace existing fov.dat with data from the FOVDialog TQFile f; f.setName( locateLocal( "appdata", "fov.dat" ) ); @@ -856,7 +856,7 @@ void KStars::slotFOVEdit() { for ( FOV *fov = fovdlg.FOVList.first(); fov; fov = fovdlg.FOVList.next() ) ostream << fov->name() << ":" << fov->size() - << ":" << TQString("%1").arg( fov->shape() ) << ":" << fov->color() << endl; + << ":" << TQString("%1").arg( fov->tqshape() ) << ":" << fov->color() << endl; f.close(); } @@ -914,11 +914,11 @@ void KStars::slotTipOfDay() { // Toggle to and from full screen mode void KStars::slotFullScreen() { - if ( topLevelWidget()->isFullScreen() ) { - topLevelWidget()->showNormal(); + if ( tqtopLevelWidget()->isFullScreen() ) { + tqtopLevelWidget()->showNormal(); } else { - topLevelWidget()->showFullScreen(); + tqtopLevelWidget()->showFullScreen(); } } diff --git a/kstars/kstars/kstarsdata.cpp b/kstars/kstars/kstarsdata.cpp index 4d5ff70a..465eca8e 100644 --- a/kstars/kstars/kstarsdata.cpp +++ b/kstars/kstars/kstarsdata.cpp @@ -236,7 +236,7 @@ bool KStarsData::readADVTreeData(void) subName = Name; interfaceIndex = Link.find("KSINTERFACE"); Link.remove(interfaceIndex, 11); - Link = Link.insert(interfaceIndex, subName.replace( TQRegExp(" "), "+")); + Link = Link.insert(interfaceIndex, subName.tqreplace( TQRegExp(" "), "+")); } @@ -390,7 +390,7 @@ bool KStarsData::readINDIHosts(void) } bool KStarsData::readCLineData( void ) { - //The constellation lines data file (clines.dat) contains lists + //The constellation lines data file (clines.dat) tqcontains lists //of abbreviated genetive star names in the same format as they //appear in the star data files (hipNNN.dat). // @@ -664,7 +664,7 @@ void KStarsData::processStar( TQString *line, bool reloadMode ) { //parse name(s) name = line->mid( 72 ).stripWhiteSpace(); //the rest of the line - if (name.contains( ':' )) { //genetive form exists + if (name.tqcontains( ':' )) { //genetive form exists gname = name.mid( name.find(':')+1 ).stripWhiteSpace(); name = name.mid( 0, name.find(':') ).stripWhiteSpace(); } @@ -964,15 +964,15 @@ bool KStarsData::openURLFile(TQString urlfile, TQFile & file) { TQString line = gStream.readLine(); //If global-file line begins with "XXX:" then this line should be removed from the local file. - if ( line.left( 4 ) == "XXX:" && urlData.contains( line.mid( 4 ) ) ) { + if ( line.left( 4 ) == "XXX:" && urlData.tqcontains( line.mid( 4 ) ) ) { urlData.remove( urlData.find( line.mid( 4 ) ) ); } else { //does local file contain the current global file line, up to second ':' ? bool linefound( false ); for ( unsigned int j=0; j< urlData.count(); ++j ) { - if ( urlData[j].contains( line.left( line.find( ':', line.find( ':' ) + 1 ) ) ) ) { - //replace line in urlData with its equivalent in the newer global file. + if ( urlData[j].tqcontains( line.left( line.find( ':', line.find( ':' ) + 1 ) ) ) ) { + //tqreplace line in urlData with its equivalent in the newer global file. urlData.remove( urlData.at(j) ); urlData.insert( urlData.at(j), line ); if ( !newDataFound ) newDataFound = true; @@ -1169,7 +1169,7 @@ CustomCatalog* KStarsData::createCustomCatalog( TQString filename, bool showerrs TQString CatalogName, CatalogPrefix, CatalogColor; float CatalogEpoch; - //If the filename begins with "~", replace the "~" with the user's home directory + //If the filename begins with "~", tqreplace the "~" with the user's home directory //(otherwise, the file will not successfully open) if ( filename.at(0)=='~' ) filename = TQDir::homeDirPath() + filename.mid( 1, filename.length() ); @@ -1393,7 +1393,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column int icolor = d.find( "# Color: " ); int iepoch = d.find( "# Epoch: " ); - if ( iname == 0 ) { //line contains catalog name + if ( iname == 0 ) { //line tqcontains catalog name iname = d.find(":")+2; if ( CatalogName.isEmpty() ) { CatalogName = d.mid( iname ); @@ -1402,7 +1402,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column errs.append( i18n( "Parsing header: " ) + i18n( "Extra Name field in header: %1. Will be ignored" ).arg( d.mid(iname) ) ); } - } else if ( iprefix == 0 ) { //line contains catalog prefix + } else if ( iprefix == 0 ) { //line tqcontains catalog prefix iprefix = d.find(":")+2; if ( CatalogPrefix.isEmpty() ) { CatalogPrefix = d.mid( iprefix ); @@ -1411,7 +1411,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column errs.append( i18n( "Parsing header: " ) + i18n( "Extra Prefix field in header: %1. Will be ignored" ).arg( d.mid(iprefix) ) ); } - } else if ( icolor == 0 ) { //line contains catalog prefix + } else if ( icolor == 0 ) { //line tqcontains catalog prefix icolor = d.find(":")+2; if ( CatalogColor.isEmpty() ) { CatalogColor = d.mid( icolor ); @@ -1420,7 +1420,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column errs.append( i18n( "Parsing header: " ) + i18n( "Extra Color field in header: %1. Will be ignored" ).arg( d.mid(icolor) ) ); } - } else if ( iepoch == 0 ) { //line contains catalog epoch + } else if ( iepoch == 0 ) { //line tqcontains catalog epoch iepoch = d.find(":")+2; if ( CatalogEpoch == 0. ) { bool ok( false ); @@ -1438,7 +1438,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column } } else if ( ! foundDataColumns ) { //don't try to parse data column descriptors if we already found them //Chomp off leading "#" character - d = d.replace( TQRegExp( "#" ), "" ); + d = d.tqreplace( TQRegExp( "#" ), "" ); TQStringList fields = TQStringList::split( " ", d ); //split on whitespace @@ -1452,7 +1452,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column for ( ; itf != itfEnd; itf++ ) { TQString s( *itf ); - if ( master.contains( s ) ) { + if ( master.tqcontains( s ) ) { //add the data field Columns.append( s ); @@ -1462,7 +1462,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column master.remove( master.find( s ) ); ncol++; } - } else if ( fields.contains( s ) ) { //duplicate field + } else if ( fields.tqcontains( s ) ) { //duplicate field fields.append( "Ig" ); //skip this column if ( showerrs ) errs.append( i18n( "Parsing header: " ) + diff --git a/kstars/kstars/kstarsdata.h b/kstars/kstars/kstarsdata.h index 0a358a42..b2968600 100644 --- a/kstars/kstars/kstarsdata.h +++ b/kstars/kstars/kstarsdata.h @@ -130,11 +130,11 @@ public: */ bool readCityData( void ); - /**Read the data file that contains daylight savings time rules. + /**Read the data file that tqcontains daylight savings time rules. */ bool readTimeZoneRulebook( void ); - /**Parse one line from a locations database file. The line contains 10 or 11 fields + /**Parse one line from a locations database file. The line tqcontains 10 or 11 fields *separated by colons (":"). The fields are: *@li City Name [string] *@li Province Name (optional) [string] @@ -351,7 +351,7 @@ public: /**Read in URLs to be attached to a named object's right-click popup menu. At this *point, there is no way to attach URLs to unnamed objects. There are two *kinds of URLs, each with its own data file: image links and webpage links. In addition, - *there may be user-specific versions with custom URLs. Each line contains 3 fields + *there may be user-specific versions with custom URLs. Each line tqcontains 3 fields *separated by colons (":"). Note that the last field is the URL, and as such it will *generally contain a colon itself. Only the first two colons encountered are treated *as field separators. The fields are: diff --git a/kstars/kstars/kstarsdatetime.cpp b/kstars/kstars/kstarsdatetime.cpp index 6b406f44..25c3be0b 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::currentDateTime() { - KStarsDateTime dt( ExtDate::currentDate(), TQTime::currentTime() ); +KStarsDateTime KStarsDateTime::tqcurrentDateTime() { + KStarsDateTime dt( ExtDate::tqcurrentDate(), TQTime::currentTime() ); if ( dt.time().hour()==0 && dt.time().minute()==0 ) // midnight or right after? - dt.setDate( ExtDate::currentDate() ); // fetch date again + dt.setDate( ExtDate::tqcurrentDate() ); // fetch date again return dt; } diff --git a/kstars/kstars/kstarsdatetime.h b/kstars/kstars/kstarsdatetime.h index a45e2495..f31d0955 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 currentDateTime(); + static KStarsDateTime tqcurrentDateTime(); /** *@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 b4a22ba9..751b0f19 100644 --- a/kstars/kstars/kstarsdcop.cpp +++ b/kstars/kstars/kstarsdcop.cpp @@ -191,7 +191,7 @@ void KStars::readConfig() { //Reset date, if one was stored if ( data()->StoredDate.isValid() ) { data()->changeDateTime( geo()->LTtoUT( data()->StoredDate ) ); - data()->StoredDate.setDJD( (long double)INVALID_DAY ); //invalidate StoredDate + data()->StoredDate.setDJD( (long double)INVALID_DAY ); //tqinvalidate StoredDate } map()->forceUpdate(); @@ -359,7 +359,7 @@ void KStars::loadColorScheme( const TQString _name ) { if ( ! ok ) { if ( !filename.isEmpty() ) { for( unsigned int i=0; i<filename.length(); ++i) - if ( filename.at(i)==' ' ) filename.replace( i, 1, "-" ); + if ( filename.at(i)==' ' ) filename.tqreplace( i, 1, "-" ); filename = filename.append( ".colors" ); ok = data()->colorScheme()->load( filename ); @@ -389,10 +389,10 @@ void KStars::loadColorScheme( const TQString _name ) { } void KStars::exportImage( const TQString url, int w, int h ) { - //If the filename string contains no "/" separators, assume the + //If the filename string tqcontains no "/" separators, assume the //user wanted to place a file in their home directory. KURL fileURL; - if ( ! url.contains( "/" ) ) fileURL = TQDir::homeDirPath() + "/" + url; + if ( ! url.tqcontains( "/" ) ) fileURL = TQDir::homeDirPath() + "/" + url; else fileURL = url; KTempFile tmpfile; @@ -523,7 +523,7 @@ void KStars::startINDI (TQString deviceName, bool useLocal) if (indidriver->isDeviceRunning(deviceName)) { indidriver->localListView->setSelected(driverItem, true); - indidriver->processDeviceStatus(1); + indidriver->processDevicetqStatus(1); } // Set custome label for device @@ -538,7 +538,7 @@ void KStars::startINDI (TQString deviceName, bool useLocal) indidriver->serverR->setChecked(true); // Run it - indidriver->processDeviceStatus(0); + indidriver->processDevicetqStatus(0); } @@ -558,7 +558,7 @@ void KStars::shutdownINDI (TQString deviceName) return; } - indidriver->processDeviceStatus(1); + indidriver->processDevicetqStatus(1); } diff --git a/kstars/kstars/kstarsinit.cpp b/kstars/kstars/kstarsinit.cpp index 276e5c8a..9117e100 100644 --- a/kstars/kstars/kstarsinit.cpp +++ b/kstars/kstars/kstarsinit.cpp @@ -43,7 +43,7 @@ #include "simclock.h" #include "timestepbox.h" -//This file contains functions that kstars calls at startup (except constructors). +//This file tqcontains functions that kstars calls at startup (except constructors). //These functions are declared in kstars.h void KStars::initActions() { @@ -149,8 +149,8 @@ void KStars::initActions() { 0, 0, 0, actionCollection(), "show_viewToolBar"); TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); -//Statusbar view options - a = new KToggleAction(i18n( "Show Statusbar" ), +//tqStatusbar view options + a = new KToggleAction(i18n( "Show tqStatusbar" ), 0, 0, 0, actionCollection(), "show_statusBar"); TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); @@ -467,7 +467,7 @@ void KStars::privatedata::buildGUI() { ks->initStatusBar(); ks->initActions(); - // create the layout of the central widget + // create the tqlayout of the central widget ks->topLayout = new TQVBoxLayout( ks->centralWidget ); ks->topLayout->addWidget( ks->skymap ); diff --git a/kstars/kstars/kstarssplash.cpp b/kstars/kstars/kstarssplash.cpp index 7e57364b..5c3261a3 100644 --- a/kstars/kstars/kstarssplash.cpp +++ b/kstars/kstars/kstarssplash.cpp @@ -59,19 +59,19 @@ 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->setAlignment( AlignHCenter ); + label->tqsetAlignment( AlignHCenter ); label->setText( i18n( "Welcome to KStars. Please stand by while loading..." ) ); topLayout->addWidget( label ); //initialize the progress message label - textCurrentStatus = new TQLabel( page, "label2" ); - textCurrentStatus->setPalette( pal ); - textCurrentStatus->setAlignment( AlignHCenter ); - topLayout->addWidget( textCurrentStatus ); + textCurrentqStatus = new TQLabel( page, "label2" ); + textCurrentqStatus->setPalette( pal ); + textCurrentqStatus->tqsetAlignment( AlignHCenter ); + topLayout->addWidget( textCurrentqStatus ); topLayout->activate(); disableResize(); - setMessage(TQString::null); // force repaint of widget with no text + setMessage(TQString::null); // force tqrepaint of widget with no text } KStarsSplash::~KStarsSplash() { @@ -80,8 +80,8 @@ KStarsSplash::~KStarsSplash() { void KStarsSplash::paintEvent( TQPaintEvent* ) { bitBlt( Banner, 0, 0, splashImage, 0, 0, -1, -1 ); - label->repaint(); // standard text label - textCurrentStatus->repaint(); // status text label + label->tqrepaint(); // standard text label + textCurrentqStatus->tqrepaint(); // status text label } void KStarsSplash::closeEvent( TQCloseEvent *e ) { @@ -90,11 +90,11 @@ void KStarsSplash::closeEvent( TQCloseEvent *e ) { } void KStarsSplash::setMessage( TQString s ) { - textCurrentStatus->setText( s ); - repaint(); // repaint splash screen + textCurrentqStatus->setText( s ); + tqrepaint(); // tqrepaint splash screen /** *Flush all event data. This is needed because events will buffered and - *repaint call will queued in event buffer. With flush all X11 events of + *tqrepaint call will queued in event buffer. With flush all X11 events of *this application will flushed. */ kapp->flush(); diff --git a/kstars/kstars/kstarssplash.h b/kstars/kstars/kstarssplash.h index afe523a2..00946b85 100644 --- a/kstars/kstars/kstarssplash.h +++ b/kstars/kstars/kstarssplash.h @@ -50,7 +50,7 @@ class KStarsSplash : public KDialogBase protected: /**Paint event to redraw the widgets. This only gets called when the timer fires. - *It should also repaint if another window was on top of the splash screen, but + *It should also tqrepaint if another window was on top of the splash screen, but *this may be difficult to implement (it may be that the program is too busy loading data *to notice that a redraw is required). */ @@ -65,7 +65,7 @@ class KStarsSplash : public KDialogBase void closeWindow(); private: - TQLabel *textCurrentStatus, *label; + TQLabel *textCurrentqStatus, *label; TQWidget *Banner; TQPixmap *splashImage; }; diff --git a/kstars/kstars/kswizardui.ui b/kstars/kstars/kswizardui.ui index 398ac2fa..eb832835 100644 --- a/kstars/kstars/kswizardui.ui +++ b/kstars/kstars/kswizardui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KSWizardUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -35,7 +35,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>120</width> <height>360</height> @@ -47,7 +47,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <vbox> <property name="name"> @@ -63,7 +63,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> @@ -79,7 +79,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -95,7 +95,7 @@ <p>To get started, press the <b>Next</b> button.</p></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>189</height> @@ -145,7 +145,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>120</width> <height>360</height> @@ -157,7 +157,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <vbox> <property name="name"> @@ -173,7 +173,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout16</cstring> + <cstring>tqlayout16</cstring> </property> <hbox> <property name="name"> @@ -181,7 +181,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <hbox> <property name="name"> @@ -197,7 +197,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -206,7 +206,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <vbox> <property name="name"> @@ -225,7 +225,7 @@ country.</p> <p>Once you have selected a City, press <b>Next</b>.</p></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -239,7 +239,7 @@ country.</p> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -248,7 +248,7 @@ country.</p> </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> @@ -314,7 +314,7 @@ country.</p> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -323,7 +323,7 @@ country.</p> </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <grid> <property name="name"> @@ -333,7 +333,7 @@ country.</p> <property name="name"> <cstring>LatBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>120</width> <height>0</height> @@ -358,7 +358,7 @@ country.</p> <property name="text"> <string>Latitude:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -366,7 +366,7 @@ country.</p> <property name="name"> <cstring>LongBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>120</width> <height>0</height> @@ -386,7 +386,7 @@ country.</p> <property name="name"> <cstring>CityListBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>180</width> <height>0</height> @@ -428,7 +428,7 @@ country.</p> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>120</width> <height>360</height> @@ -440,7 +440,7 @@ country.</p> </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <vbox> <property name="name"> @@ -456,7 +456,7 @@ country.</p> </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <hbox> <property name="name"> @@ -472,7 +472,7 @@ country.</p> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -481,7 +481,7 @@ country.</p> </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout16</cstring> + <cstring>tqlayout16</cstring> </property> <vbox> <property name="name"> @@ -507,7 +507,7 @@ can also control telescopes remotely over the Internet.</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -544,7 +544,7 @@ You can always set up devices later using the <b>Devices</b> menu.</ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <hbox> <property name="name"> @@ -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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <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="minimumSize"> + <property name="tqminimumSize"> <size> <width>120</width> <height>360</height> @@ -661,7 +661,7 @@ and other astronomical devices such as CCD cameras and focusers.</string> </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout19</cstring> + <cstring>tqlayout19</cstring> </property> <vbox> <property name="name"> @@ -677,7 +677,7 @@ and other astronomical devices such as CCD cameras and focusers.</string> </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <hbox> <property name="name"> @@ -693,7 +693,7 @@ and other astronomical devices such as CCD cameras and focusers.</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -702,7 +702,7 @@ and other astronomical devices such as CCD cameras and focusers.</string> </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <vbox> <property name="name"> @@ -721,7 +721,7 @@ button to proceed. </p> <p>You can also use this tool later, by selecting <b>Download data</b> from the <b>File</b> menu.</p></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -735,7 +735,7 @@ button to proceed. </p> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -744,7 +744,7 @@ button to proceed. </p> </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> @@ -760,7 +760,7 @@ button to proceed. </p> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -785,7 +785,7 @@ button to proceed. </p> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -804,7 +804,7 @@ button to proceed. </p> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>90</height> @@ -843,7 +843,7 @@ button to proceed. </p> <data format="PNG" length="1110">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000041d49444154789c8d95c18b1c4514c67fbb29e5b54ea05b26da1d36b08d09a6c508138cb8c13d647141163de49043bca9f1628eb9294810f24f88c15b728b07617358888785d980427290b4a8d00b19a8821da8228cf42316ac87eed9247ac95c9aeaeef9eaabdffb5ebf85f178ccfcf7f5b79fec07a7280a08a008f25ceb7c29e5da573716e65a0be3f198ef6f5ededff9b9e1b34faf90882092a1ea21428b9220ffbf46054055b19386ba6970ae6665b5e0d2c5eb0b066067bbe1f21757c88f5504eff0c192189081303a5582b16854fccce2fe041f00cdd0a8103b874556405476b62d972ec2c2b90ff3fd8df5cb946549d80b34aea15ccaa94625450e2d0e558b460b7371a734b5e027251a155545678ab62d7eea90b4c504078908c107acb354cb251b1f8f08b1c18631aabbb4d18211404804f22545863561d2f060fb34aa8a18d0086204e72c46a32292e1a796f278c1da7a859d8da9a737506db04d0a24103d8949480b214d3bbee952a05c1d536f9d2684160c744f048311543d459eb1b65ee1754cedae13a64abd5d6127053c9d0281f22d4f75c6a2118a5c09272d7ab740638bf4ef2dd2174032d0d8d04c6fe19c32bedd8bc65e342aa3f785e2784bfd6bc1bd9db24b05505616a4edd67d5a8c1801a03a9962754c504bf34b8986acfb9be91cac7d54315a15541b36b134f74bd2dc53940115a5381e087bc25c6f71be831a8baa234cc1ee3eeb74ed83116beb2b8849d108a3730e8ce27e2bfb82419a7b407ac7c222fd0e6280a8078ce64e47ef54ac9d5be9aaae0162e0de568a44a18d3df90845d919c4f01463406340a44f40efb43a99b371618488e2670d1a2d7ee6f1d3be39342104e937ed85fb86599c33e9ee0be9a004946259d8b858909880d59aa00daa0d3280b5f39e34074c4b3a5434029a76a9e9f5cc0163b5c80024158a1cfc4cb1d3061d5834066cb0a403c008599a70f6bc27b8d03106ea3ae91987278c5b143b015547224ab5e24185cd9b81665273e7b6e7cecd82ddbf8098002de94049737bc09828cf3036f31c3735c8b0e98eb704672f348c7f7c93cd1fb2ae905119ff54e0dff3542b0e9dd983dcea2cc5eea6cf303e74ec687af5c41b6fa38f5e203c7ec8e1238ef85831a214afef21060ea781ec68247b65c6916353cc8b73d1ae79354606af2a930709aa118da1636c274dd7e3774b884a79aa6b5711a538d33cf9c01c1c9b83bc6a1f55c91ccb23b05b1deb43a7decdaffefd2862f61366aa8449c69e33642f012f2bb208fa98eeda1f3346f076c8eeef19475e9be115423364f78f84105a8643d34d90cfbfdcd8cf872589a45dc7f54cf3134a36f4e495c23f9da8db15bccb708d4014f2ca512cb5d4f7c13e84300d5cff6eb39b202bab053bdb9674f0648609427d0f8402ddeac30f4fcd3ced3efc3b422d406c09b340bedc1571e1bfc3d44dc281634c5fe5e758e7395cfbe6d6c130fd17d92372d2cb00c6470000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/locationdialog.cpp b/kstars/kstars/locationdialog.cpp index 8bbd34ac..dfbb4796 100644 --- a/kstars/kstars/locationdialog.cpp +++ b/kstars/kstars/locationdialog.cpp @@ -52,18 +52,18 @@ LocationDialog::LocationDialog( TQWidget* parent ) CityLay = new TQVBoxLayout( CityBox, 6, 4 ); //root mgr for CityBox CityLay->setSpacing( 6 ); CityLay->setMargin( 6 ); - hlay = new TQHBoxLayout( 2 ); //this layout will be added to CityLay - vlay = new TQVBoxLayout( 2 ); //this layout will be added to hlay - glay = new TQGridLayout( 3, 2, 6 ); //this layout will be added to vlay + hlay = new TQHBoxLayout( 2 ); //this tqlayout will be added to CityLay + vlay = new TQVBoxLayout( 2 ); //this tqlayout will be added to hlay + glay = new TQGridLayout( 3, 2, 6 ); //this tqlayout will be added to vlay CoordLay = new TQVBoxLayout( CoordBox, 6, 4 ); //root mgr for coordbox CoordLay->setSpacing( 6 ); CoordLay->setMargin( 6 ); - glay2 = new TQGridLayout( 3, 4, 4 ); //this layout will be added to CoordLay - hlayCoord = new TQHBoxLayout( 2 ); //this layout will be added to glay2 - hlayTZ = new TQHBoxLayout( 2 ); //this layout will be added to glay2 - hlayButtons = new TQHBoxLayout( 2 ); //this layout will be added to glay2 - hlay3 = new TQHBoxLayout( 2 ); //this layout will be added to CoordLay + glay2 = new TQGridLayout( 3, 4, 4 ); //this tqlayout will be added to CoordLay + hlayCoord = new TQHBoxLayout( 2 ); //this tqlayout will be added to glay2 + hlayTZ = new TQHBoxLayout( 2 ); //this tqlayout will be added to glay2 + hlayButtons = new TQHBoxLayout( 2 ); //this tqlayout will be added to glay2 + hlay3 = new TQHBoxLayout( 2 ); //this tqlayout will be added to CoordLay //Create widgets CityFiltLabel = new TQLabel( CityBox ); @@ -122,7 +122,7 @@ LocationDialog::LocationDialog( TQWidget* parent ) AddCityButton = new TQPushButton( i18n ( "Add to List" ), CoordBox, "AddCityButton" ); -//Pack the widgets into the layouts +//Pack the widgets into the tqlayouts RootLay->addWidget( CityBox, 0, 0 ); RootLay->addWidget( CoordBox, 0, 0 ); @@ -283,7 +283,7 @@ void LocationDialog::filterCity( void ) { if ( GeoBox->firstItem() ) // set first item in list as selected GeoBox->setCurrentItem( GeoBox->firstItem() ); - MapView->repaint(); + MapView->tqrepaint(); } void LocationDialog::changeCity( void ) { @@ -298,7 +298,7 @@ void LocationDialog::changeCity( void ) { } } - MapView->repaint(); + MapView->tqrepaint(); //Fill the fields at the bottom of the window with the selected city's data. if ( SelectedCity ) { @@ -437,7 +437,7 @@ void LocationDialog::findCitiesNear( int lng, int lat ) { if ( GeoBox->firstItem() ) // set first item in list as selected GeoBox->setCurrentItem( GeoBox->firstItem() ); - repaint(); + tqrepaint(); } bool LocationDialog::checkLongLat( void ) { diff --git a/kstars/kstars/locationdialog.h b/kstars/kstars/locationdialog.h index 23831361..db407884 100644 --- a/kstars/kstars/locationdialog.h +++ b/kstars/kstars/locationdialog.h @@ -23,7 +23,7 @@ *dialog is divided into two sections. * *The top section allows the location to be selected from a database - *of 2000 cities. It contains a MapCanvas (showing map of the globe + *of 2000 cities. It tqcontains a MapCanvas (showing map of the globe *with cities overlaid, with a handler for mouse clicks), a QListBox *containing the names of cities in the database, and three KLineEdit *widgets, which allow the user to filter the List by the name of the @@ -116,7 +116,7 @@ public slots: void filterCity( void ); /** - *When the selected city in the TQListBox changes, repaint the MapCanvas + *When the selected city in the TQListBox changes, tqrepaint the MapCanvas *so that the crosshairs icon appears on the newly selected city. */ void changeCity( void ); diff --git a/kstars/kstars/main.cpp b/kstars/kstars/main.cpp index a16acfbc..7335bd39 100644 --- a/kstars/kstars/main.cpp +++ b/kstars/kstars/main.cpp @@ -109,10 +109,10 @@ int main(int argc, char *argv[]) TQString datestring = args->getOption( "date" ); KStarsDateTime kdt; if ( ! datestring.isEmpty() ) { - if ( datestring.contains( "-" ) ) { //assume ISODate format - if ( datestring.contains( ":" ) ) { //also includes time + if ( datestring.tqcontains( "-" ) ) { //assume ISODate format + if ( datestring.tqcontains( ":" ) ) { //also includes time kdt = KStarsDateTime::fromString( datestring, Qt::ISODate ); - } else { //string probably contains date only + } else { //string probably tqcontains date only kdt.setDate( ExtDate::fromString( datestring, Qt::ISODate ) ); kdt.setTime( TQTime( 0, 0, 0 ) ); } @@ -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::currentDateTime() ); + kdt = dat->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); } } else { - kdt = dat->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); + kdt = dat->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); } dat->clock()->setUTC( kdt ); diff --git a/kstars/kstars/mapcanvas.cpp b/kstars/kstars/mapcanvas.cpp index 85dbd1ca..928623f8 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 *)topLevelWidget(); + LocationDialog *ld = (LocationDialog *)tqtopLevelWidget(); 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 *)topLevelWidget(); + LocationDialog *ld = (LocationDialog *)tqtopLevelWidget(); //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 *)topLevelWidget(); + LocationDialog *ld = (LocationDialog *)tqtopLevelWidget(); KStars *ks = (KStars *)ld->parent(); //prepare the canvas diff --git a/kstars/kstars/mapcanvas.h b/kstars/kstars/mapcanvas.h index b32098b2..38ded5c8 100644 --- a/kstars/kstars/mapcanvas.h +++ b/kstars/kstars/mapcanvas.h @@ -49,7 +49,7 @@ public: ~MapCanvas(); public slots: - /**Set the geometry of the map widget (overloaded from TQWidget). + /**Set the tqgeometry of the map widget (overloaded from TQWidget). *Resizes the size of the map pixmap to match the widget, and resets *the Origin TQPoint so it remains at the center of the widget. *@note this is called automatically by resize events. @@ -60,13 +60,13 @@ public slots: */ virtual void setGeometry( int x, int y, int w, int h ); - /**Set the geometry of the map widget (overloaded from TQWidget). + /**Set the tqgeometry of the map widget (overloaded from TQWidget). *Resizes the size of the map pixmap to match the widget, and resets *the Origin TQPoint so it remains at the center of the widget. *This function behaves just like the above function. It differs *only in the data type of its argument. *@note this is called automatically by resize events. - *@p r TQRect describing geometry + *@p r TQRect describing tqgeometry */ virtual void setGeometry( const TQRect &r ); diff --git a/kstars/kstars/newfovui.ui b/kstars/kstars/newfovui.ui index 4abfc4ad..d7ded82f 100644 --- a/kstars/kstars/newfovui.ui +++ b/kstars/kstars/newfovui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>NewFOVUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -74,7 +74,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout16</cstring> + <cstring>tqlayout16</cstring> </property> <hbox> <property name="name"> @@ -82,7 +82,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <vbox> <property name="name"> @@ -116,7 +116,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <vbox> <property name="name"> @@ -124,7 +124,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> @@ -160,7 +160,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> @@ -196,7 +196,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> @@ -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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -253,7 +253,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> @@ -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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>22</height> @@ -376,7 +376,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" </spacer> <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout26</cstring> + <cstring>tqlayout26</cstring> </property> <hbox> <property name="name"> @@ -384,7 +384,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout25</cstring> + <cstring>tqlayout25</cstring> </property> <vbox> <property name="name"> @@ -410,7 +410,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <vbox> <property name="name"> @@ -418,7 +418,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <hbox> <property name="name"> @@ -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="minimumSize"> + <property name="tqminimumSize"> <size> <width>60</width> <height>0</height> @@ -460,7 +460,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout16</cstring> + <cstring>tqlayout16</cstring> </property> <hbox> <property name="name"> @@ -513,7 +513,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout26_3</cstring> + <cstring>tqlayout26_3</cstring> </property> <hbox> <property name="name"> @@ -521,7 +521,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout25_3</cstring> + <cstring>tqlayout25_3</cstring> </property> <vbox> <property name="name"> @@ -547,7 +547,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout24_3</cstring> + <cstring>tqlayout24_3</cstring> </property> <vbox> <property name="name"> @@ -555,7 +555,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout15_4</cstring> + <cstring>tqlayout15_4</cstring> </property> <hbox> <property name="name"> @@ -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="minimumSize"> + <property name="tqminimumSize"> <size> <width>60</width> <height>0</height> @@ -597,7 +597,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout16_4</cstring> + <cstring>tqlayout16_4</cstring> </property> <hbox> <property name="name"> @@ -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="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>51</height> @@ -654,7 +654,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout36</cstring> + <cstring>tqlayout36</cstring> </property> <hbox> <property name="name"> @@ -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="sizeHint"> + <property name="tqsizeHint"> <size> <width>281</width> <height>21</height> @@ -703,7 +703,7 @@ The computed HPBW angle (in arcminutes) will be displayed in the "Field of view" </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> @@ -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="sizeHint"> + <property name="tqsizeHint"> <size> <width>298</width> <height>20</height> @@ -751,7 +751,7 @@ You can either enter a value directly, or use the "Eyepiece" or "Camera" Tabs to </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> @@ -759,7 +759,7 @@ You can either enter a value directly, or use the "Eyepiece" or "Camera" Tabs to </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> @@ -767,7 +767,7 @@ You can either enter a value directly, or use the "Eyepiece" or "Camera" Tabs to </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> @@ -832,10 +832,10 @@ You can either enter a value directly, or use the "Eyepiece" or "Camera" Tabs to <cstring>ShapeBox</cstring> </property> <property name="toolTip" stdset="0"> - <string>Select a shape for the field-of-view symbol</string> + <string>Select a tqshape for the field-of-view symbol</string> </property> <property name="whatsThis" stdset="0"> - <string>Select a shape for the field-of-view (FOV) symbol. The possible shapes are: + <string>Select a tqshape for the field-of-view (FOV) symbol. The possible tqshapes are: Circle, Square, Crosshairs, Bullseye.</string> </property> @@ -854,7 +854,7 @@ Circle, Square, Crosshairs, Bullseye.</string> </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <vbox> <property name="name"> @@ -872,7 +872,7 @@ Circle, Square, Crosshairs, Bullseye.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>80</width> <height>80</height> @@ -921,7 +921,7 @@ Circle, Square, Crosshairs, Bullseye.</string> <tabstop>ShapeBox</tabstop> <tabstop>ColorButton</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kstars/kstars/objectnamelist.cpp b/kstars/kstars/objectnamelist.cpp index b86fdac8..948f036c 100644 --- a/kstars/kstars/objectnamelist.cpp +++ b/kstars/kstars/objectnamelist.cpp @@ -104,7 +104,7 @@ SkyObjectName* ObjectNameList::first( const TQString &name ) { if ( mode == allLists ) { currentIndex = 0; } else { - // start with list which contains the first letter + // start with list which tqcontains the first letter currentIndex = getIndex( name ); } diff --git a/kstars/kstars/objectnamelist.h b/kstars/kstars/objectnamelist.h index 691311ee..4d8d045e 100644 --- a/kstars/kstars/objectnamelist.h +++ b/kstars/kstars/objectnamelist.h @@ -21,8 +21,8 @@ /**@class ObjectNameList *This class provides an interface like a TQPtrList, but sorts objects internally - *in 27 lists. The objects are sorted alphabetically. List 0 contains all objects - *beginning not with a letter. List 1 - 26 contains objects beginning with a letter. + *in 27 lists. The objects are sorted alphabetically. List 0 tqcontains all objects + *beginning not with a letter. List 1 - 26 tqcontains objects beginning with a letter. *The number of the list is similar to positon of letter in alphabet. (A = 1 .. Z = 26 ) *@author Thomas Kabelmann *@version 1.0 @@ -61,7 +61,7 @@ class ObjectNameList { */ void append(SkyObject *object, bool useLongName=false); - /**Select the list which contains objects whose names begin with the + /**Select the list which tqcontains objects whose names begin with the *same letter as the argument. The selected list ID is recorded in *an internal variable, so it is persistent. *@note This function is case insensitive. @@ -123,7 +123,7 @@ class ObjectNameList { void sort(); - /**@return the list index which contains the object whose name matches the argument. + /**@return the list index which tqcontains the object whose name matches the argument. *@note this does not return the position within a list of names; it returns the ID *of the list itself. *@param name the name of the object whose index is to be found diff --git a/kstars/kstars/opsadvancedui.ui b/kstars/kstars/opsadvancedui.ui index 13022545..689dee17 100644 --- a/kstars/kstars/opsadvancedui.ui +++ b/kstars/kstars/opsadvancedui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>OpsAdvancedUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -117,7 +117,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -140,7 +140,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout16</cstring> + <cstring>tqlayout16</cstring> </property> <hbox> <property name="name"> @@ -175,7 +175,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -200,7 +200,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout20</cstring> + <cstring>tqlayout20</cstring> </property> <hbox> <property name="name"> @@ -224,7 +224,7 @@ <property name="name"> <cstring>kcfg_MagLimitHideStar</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>40</width> <height>0</height> @@ -258,7 +258,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>240</width> <height>20</height> @@ -269,7 +269,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> @@ -409,7 +409,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -478,7 +478,7 @@ <tabstop>kcfg_HideCLines</tabstop> <tabstop>kcfg_HideGrid</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>timestepbox.h</includehint> <includehint>magnitudespinbox.h</includehint> diff --git a/kstars/kstars/opscatalogui.ui b/kstars/kstars/opscatalogui.ui index 14db7c6a..6b792c3a 100644 --- a/kstars/kstars/opscatalogui.ui +++ b/kstars/kstars/opscatalogui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>OpsCatalogUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -52,7 +52,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <grid> <property name="name"> @@ -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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -177,7 +177,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> @@ -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="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -234,7 +234,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> @@ -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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -275,7 +275,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> @@ -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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -329,7 +329,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <hbox> <property name="name"> @@ -362,7 +362,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <vbox> <property name="name"> @@ -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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>68</height> @@ -436,7 +436,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout8_2</cstring> + <cstring>tqlayout8_2</cstring> </property> <grid> <property name="name"> @@ -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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -593,7 +593,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>magnitudespinbox.h</includehint> <includehint>magnitudespinbox.h</includehint> diff --git a/kstars/kstars/opscolorsui.ui b/kstars/kstars/opscolorsui.ui index d2d22cab..04626b1d 100644 --- a/kstars/kstars/opscolorsui.ui +++ b/kstars/kstars/opscolorsui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>OpsColorsUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -43,7 +43,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -81,7 +81,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> @@ -113,7 +113,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> @@ -169,7 +169,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> @@ -185,7 +185,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -216,7 +216,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -233,7 +233,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -250,7 +250,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -285,5 +285,5 @@ <tabstop>AddPreset</tabstop> <tabstop>RemovePreset</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/opsguidesui.ui b/kstars/kstars/opsguidesui.ui index 1f8c1dca..55750725 100644 --- a/kstars/kstars/opsguidesui.ui +++ b/kstars/kstars/opsguidesui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>OpsGuidesUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -252,7 +252,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>60</height> @@ -261,5 +261,5 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/opssolarsystemui.ui b/kstars/kstars/opssolarsystemui.ui index 15b58a47..b5685ee0 100644 --- a/kstars/kstars/opssolarsystemui.ui +++ b/kstars/kstars/opssolarsystemui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>OpsSolarSystemUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -32,7 +32,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout20</cstring> + <cstring>tqlayout20</cstring> </property> <grid> <property name="name"> @@ -230,7 +230,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>100</width> <height>20</height> @@ -263,7 +263,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -307,7 +307,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -462,7 +462,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> @@ -492,7 +492,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -569,7 +569,7 @@ <tabstop>kcfg_FadePlanetTrails</tabstop> <tabstop>ClearAllTrails</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>magnitudespinbox.h</includehint> diff --git a/kstars/kstars/planetcatalog.h b/kstars/kstars/planetcatalog.h index 99a7b65e..4cdda9a4 100644 --- a/kstars/kstars/planetcatalog.h +++ b/kstars/kstars/planetcatalog.h @@ -19,7 +19,7 @@ #define PLANETCATALOG_H /**@class PlanetCatalog - *This class contains a TQPtrList of the eight major planets, as well as pointers + *This class tqcontains a TQPtrList of the eight major planets, as well as pointers *to objects representing the Earth and Sun. Note that the Sun also exists *in the TQPtrList, the external pointer is just for convenience. *There are methods to search diff --git a/kstars/kstars/simclock.h b/kstars/kstars/simclock.h index d4375bdb..2fdfdb99 100644 --- a/kstars/kstars/simclock.h +++ b/kstars/kstars/simclock.h @@ -39,7 +39,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::currentDateTime() ); + SimClock(TQObject *parent = 0, const KStarsDateTime &when = KStarsDateTime::tqcurrentDateTime() ); /** * Constructor * @param old a SimClock to initialize from. diff --git a/kstars/kstars/skymap.cpp b/kstars/kstars/skymap.cpp index 13a5ab45..1b6ae5b8 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( TQWidget::StrongFocus ); setMinimumSize( 380, 250 ); - setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); setMouseTracking (true); //Generate MouseMove events! midMouseButtonDown = false; @@ -1179,7 +1179,7 @@ void SkyMap::forceUpdate( bool now ) } computeSkymap = true; - if ( now ) repaint(); + if ( now ) tqrepaint(); else update(); } @@ -1252,18 +1252,18 @@ void SkyMap::setZoomMouseCursor() p.drawLine( mx + 5, my + 5, mx + 11, my + 11 ); p.end(); -// create a mask to make parts of the pixmap invisible - TQBitmap mask (32, 32); - mask.fill (color0); // all is invisible +// create a tqmask to make parts of the pixmap invisible + TQBitmap tqmask (32, 32); + tqmask.fill (color0); // all is invisible - p.begin (&mask); + p.begin (&tqmask); // paint over the parts which should be visible p.setPen (TQPen (color1, 3)); p.drawEllipse( mx - 7, my - 7, 14, 14 ); p.drawLine( mx + 5, my + 5, mx + 12, my + 12 ); p.end(); - cursorPix.setMask (mask); // set the mask + cursorPix.setMask (tqmask); // set the tqmask TQCursor cursor (cursorPix); setCursor (cursor); } @@ -1289,11 +1289,11 @@ void SkyMap::setDefaultMouseCursor() p.drawLine (mx + 2, my - 2, mx + 8, mx - 8); p.end(); -// create a mask to make parts of the pixmap invisible - TQBitmap mask (32, 32); - mask.fill (color0); // all is invisible +// create a tqmask to make parts of the pixmap invisible + TQBitmap tqmask (32, 32); + tqmask.fill (color0); // all is invisible - p.begin (&mask); + p.begin (&tqmask); // paint over the parts which should be visible p.setPen (TQPen (color1, 3)); // 1. diagonal @@ -1304,7 +1304,7 @@ void SkyMap::setDefaultMouseCursor() p.drawLine (mx + 2, my - 2, mx + 8, mx - 8); p.end(); - cursorPix.setMask (mask); // set the mask + cursorPix.setMask (tqmask); // set the tqmask TQCursor cursor (cursorPix); setCursor (cursor); } @@ -1313,7 +1313,7 @@ void SkyMap::setMouseMoveCursor() { if (mouseButtonDown) { - setCursor (9); // cursor shape defined in qt + setCursor (9); // cursor tqshape defined in qt mouseMoveCursor = true; } } diff --git a/kstars/kstars/skymap.h b/kstars/kstars/skymap.h index b6badd3b..86d83b55 100644 --- a/kstars/kstars/skymap.h +++ b/kstars/kstars/skymap.h @@ -47,7 +47,7 @@ class DeepSkyObject; *Contains SkyPoint members for the map's Focus (current central position), Destination *(requested central position), FocusPoint (next queued position to be focused), *MousePoint (position of mouse cursor), and ClickedPoint (position of last mouse click). - *Also contains the InfoBoxes for on-screen data display. + *Also tqcontains the InfoBoxes for on-screen data display. * *SkyMap handles most user interaction events (both mouse and keyboard). * @@ -163,7 +163,7 @@ public: *@note setDestination() emits the destinationChanged() SIGNAL, *which triggers the TQT_SLOT function SkyMap::slewFocus(). This *function iteratively steps the Focus point toward Destination, - *repainting the sky at each step (if Options::useAnimatedSlewing()==true). + *tqrepainting the sky at each step (if Options::useAnimatedSlewing()==true). *@param f a pointer to the SkyPoint the map should slew to */ void setDestination( SkyPoint *f ); @@ -368,7 +368,7 @@ public: */ bool isAngleMode() const {return angularDistanceMode;} -/**@short update the geometry of the angle ruler +/**@short update the tqgeometry of the angle ruler */ void updateAngleRuler(); @@ -388,7 +388,7 @@ public: /**@short Draw the current Sky map to a pixmap which is to be printed or exported to a file. * *Each of the draw functions is called, with a value for the Scale parameter computed to fit the - *geometry of the TQPaintDevice. + *tqgeometry of the TQPaintDevice. *@param pd pointer to the TQPaintDevice on which to draw. *@see KStars::slotExportImage() *@see KStars::slotPrint() @@ -406,7 +406,7 @@ public slots: */ virtual void setGeometry( const TQRect &r ); -/**Recalculates the positions of objects in the sky, and then repaints the sky map. +/**Recalculates the positions of objects in the sky, and then tqrepaints the sky map. *If the positions don't need to be recalculated, use update() instead of forceUpdate(). *This saves a lot of CPU time. *@param now if true, paintEvent() is run immediately. Otherwise, it is added to the event queue @@ -622,7 +622,7 @@ private slots: */ void slotTransientLabel(); -/**Set the shape of mouse cursor to a cross with 4 arrows. */ +/**Set the tqshape of mouse cursor to a cross with 4 arrows. */ void setMouseMoveCursor(); private: @@ -776,7 +776,7 @@ private: void drawBoxes( TQPainter &p ); /**Draw symbols at the position of each Telescope currently being controlled by KStars. - *@note The shape of the Telescope symbol is currently a hard-coded bullseye. + *@note The tqshape of the Telescope symbol is currently a hard-coded bullseye. *@note there is no scale factor because this is only used for drawing onto the screen, not printing. *@param psky reference to the TQPainter on which to draw (this should be the Sky pixmap). */ @@ -900,11 +900,11 @@ private: */ double findPA( SkyObject *o, int x, int y, double scale=1.0 ); -/**@short Sets the shape of the default mouse cursor to a cross. +/**@short Sets the tqshape of the default mouse cursor to a cross. */ void setDefaultMouseCursor(); -/**@short Sets the shape of the mouse cursor to a magnifying glass. +/**@short Sets the tqshape of the mouse cursor to a magnifying glass. */ void setZoomMouseCursor(); @@ -919,7 +919,7 @@ private: bool mouseButtonDown, midMouseButtonDown; bool mouseMoveCursor; // true if mouseMoveEvent; needed by setMouseMoveCursor bool slewing, clockSlewing; - bool computeSkymap; //if false only old pixmap will repainted with bitBlt(), this saves a lot of cpu usage + bool computeSkymap; //if false only old pixmap will tqrepainted with bitBlt(), this saves a lot of cpu usage bool angularDistanceMode; int idSolInfo, idMessHST, idMoonInfo, idMoonImages, idMessInfo, idNGCHST; int scrollCount; diff --git a/kstars/kstars/skymapdraw.cpp b/kstars/kstars/skymapdraw.cpp index 8b15c57a..0c76de4b 100644 --- a/kstars/kstars/skymapdraw.cpp +++ b/kstars/kstars/skymapdraw.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -//This file contains drawing functions SkyMap class. +//This file tqcontains drawing functions SkyMap class. #include <stdlib.h> // abs #include <math.h> //log10() @@ -1578,7 +1578,7 @@ void SkyMap::drawPlanetTrail( TQPainter& psky, KSPlanetBase *ksp, double scale ) if ( ( o.x() >= -1000 && o.x() <= Width+1000 && o.y() >=-1000 && o.y() <= Height+1000 ) ) { //Want to disable line-drawing if this point and the last are both outside bounds of display. - if ( ! rect().contains( o ) && ! rect().contains( cur ) ) doDrawLine = false; + if ( ! rect().tqcontains( o ) && ! rect().tqcontains( cur ) ) doDrawLine = false; cur = o; if ( doDrawLine ) { diff --git a/kstars/kstars/skymapevents.cpp b/kstars/kstars/skymapevents.cpp index 26b04a5f..f2634872 100644 --- a/kstars/kstars/skymapevents.cpp +++ b/kstars/kstars/skymapevents.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -//This file contains Event handlers for the SkyMap class. +//This file tqcontains Event handlers for the SkyMap class. #include <stdlib.h> #include <math.h> //using fabs() @@ -453,7 +453,7 @@ void SkyMap::mouseMoveEvent( TQMouseEvent *e ) { if ( ZoomRect.center().x() > 0 && ZoomRect.center().y() > 0 ) { //cancel operation if the user let go of CTRL if ( !( e->state() & ControlButton ) ) { - ZoomRect = TQRect(); //invalidate ZoomRect + ZoomRect = TQRect(); //tqinvalidate ZoomRect update(); } else { //Resize the rectangle so that it passes through the cursor position @@ -600,7 +600,7 @@ void SkyMap::mouseReleaseEvent( TQMouseEvent * ) { ksw->zoom( Options::zoomFactor() * factor ); setDefaultMouseCursor(); - ZoomRect = TQRect(); //invalidate ZoomRect + ZoomRect = TQRect(); //tqinvalidate ZoomRect forceUpdate(); } else { setDefaultMouseCursor(); @@ -733,7 +733,7 @@ void SkyMap::paintEvent( TQPaintEvent * ) *sky2 = *sky; drawOverlays( sky2 ); bitBlt( this, 0, 0, sky2 ); - return ; // exit because the pixmap is repainted and that's all what we want + return ; // exit because the pixmap is tqrepainted and that's all what we want } TQPainter psky; diff --git a/kstars/kstars/skyobject.cpp b/kstars/kstars/skyobject.cpp index 5ea5036d..612c951e 100644 --- a/kstars/kstars/skyobject.cpp +++ b/kstars/kstars/skyobject.cpp @@ -342,11 +342,11 @@ TQString SkyObject::messageFromTitle( const TQString &imageTitle ) { TQString message = imageTitle; //HST Image - if ( imageTitle == i18n( "Show HST Image" ) || imageTitle.contains("HST") ) { + if ( imageTitle == i18n( "Show HST Image" ) || imageTitle.tqcontains("HST") ) { message = i18n( "%1: Hubble Space Telescope, operated by STScI for NASA [public domain]" ).arg( longname() ); //Spitzer Image - } else if ( imageTitle.contains( i18n( "Show Spitzer Image" ) ) ) { + } else if ( imageTitle.tqcontains( i18n( "Show Spitzer Image" ) ) ) { message = i18n( "%1: Spitzer Space Telescope, courtesy NASA/JPL-Caltech [public domain]" ).arg( longname() ); //SEDS Image @@ -358,11 +358,11 @@ TQString SkyObject::messageFromTitle( const TQString &imageTitle ) { message = i18n( "%1: Advanced Observing Program at Kitt Peak National Observatory [free for non-commercial use; no physical reproductions]" ).arg( longname() ); //NOAO Image - } else if ( imageTitle.contains( i18n( "Show NOAO Image" ) ) ) { + } else if ( imageTitle.tqcontains( i18n( "Show NOAO Image" ) ) ) { message = i18n( "%1: National Optical Astronomy Observatories and AURA [free for non-commercial use]" ).arg( longname() ); //VLT Image - } else if ( imageTitle.contains( "VLT" ) ) { + } else if ( imageTitle.tqcontains( "VLT" ) ) { message = i18n( "%1: Very Large Telescope, operated by the European Southern Observatory [free for non-commercial use; no reproductions]" ).arg( longname() ); //All others diff --git a/kstars/kstars/skyobjectname.h b/kstars/kstars/skyobjectname.h index 580671c7..cfa0a46a 100644 --- a/kstars/kstars/skyobjectname.h +++ b/kstars/kstars/skyobjectname.h @@ -23,7 +23,7 @@ #include <klocale.h> /**@class SkyObjectName - *Convenience class which contains a SkyObject's name and a pointer to the SkyObject + *Convenience class which tqcontains a SkyObject's name and a pointer to the SkyObject *itself. This class is used to construct the List of named objects that may be *located with the FindDialog. *@short convenience class for indexing SkyObjects by name. diff --git a/kstars/kstars/skypoint.cpp b/kstars/kstars/skypoint.cpp index c5ea55a8..4895485d 100644 --- a/kstars/kstars/skypoint.cpp +++ b/kstars/kstars/skypoint.cpp @@ -538,7 +538,7 @@ dms SkyPoint::angularDistanceTo(SkyPoint *sp) { } TQString SkyPoint::constellation( TQPtrList<CSegment> &csegmentList, TQPtrList<SkyObject> &cnameList ) const { - //Identify the constellation that contains point p. + //Identify the constellation that tqcontains point p. //First, find all CSegments that bracket the RA of p. //Then, identify the pair of these bracketing segments which bracket p in the Dec direction. //Each segment has two cnames, identifying the 2 constellations which the segment delineates. diff --git a/kstars/kstars/starobject.cpp b/kstars/kstars/starobject.cpp index 8e46b0db..12fb5652 100644 --- a/kstars/kstars/starobject.cpp +++ b/kstars/kstars/starobject.cpp @@ -112,7 +112,7 @@ TQString StarObject::greekLetter( bool gchar ) const { if ( code == "omi" ) gchar ? letter = TQString( TQChar(alpha +14) ) : letter = i18n("omicron"); if ( code == "pi " ) gchar ? letter = TQString( TQChar(alpha +15) ) : letter = i18n("pi"); if ( code == "rho" ) gchar ? letter = TQString( TQChar(alpha +16) ) : letter = i18n("rho"); - //there are two unicode symbols for sigma; + //there are two tqunicode symbols for sigma; //skip the first one, the second is more widely used if ( code == "sig" ) gchar ? letter = TQString( TQChar(alpha +18) ) : letter = i18n("sigma"); if ( code == "tau" ) gchar ? letter = TQString( TQChar(alpha +19) ) : letter = i18n("tau"); diff --git a/kstars/kstars/starpixmap.cpp b/kstars/kstars/starpixmap.cpp index 59e21fe5..be0d413e 100644 --- a/kstars/kstars/starpixmap.cpp +++ b/kstars/kstars/starpixmap.cpp @@ -69,7 +69,7 @@ void StarPixmap::loadPixmaps (int newColorMode, int newColorIntensity) { if (colorIntensity < 0) colorIntensity = 0; // min TQPixmap pix (STARSIZE, STARSIZE); - TQBitmap mask (STARSIZE, STARSIZE); + TQBitmap tqmask (STARSIZE, STARSIZE); TQImage image; TQPainter p; TQMemArray<TQColor> starColor; @@ -104,9 +104,9 @@ void StarPixmap::loadPixmaps (int newColorMode, int newColorIntensity) { p.end(); } - mask.fill (Qt::color0); + tqmask.fill (Qt::color0); - p.begin (&mask); + p.begin (&tqmask); p.setPen (TQPen ( Qt::color1, 1)); p.setBrush( TQBrush( Qt::color1 ) ); p.drawEllipse(0, 0, STARSIZE, STARSIZE); @@ -117,7 +117,7 @@ void StarPixmap::loadPixmaps (int newColorMode, int newColorIntensity) { TQImage tmp = pix.convertToImage(); pix.convertFromImage( KImageEffect::blur( tmp, 100.0 ) ); - pix.setMask (mask); // set the mask + pix.setMask (tqmask); // set the tqmask image = pix.convertToImage(); // create the image for smoothScale() for (int i = 0; i < 26; i++) diff --git a/kstars/kstars/statform.ui b/kstars/kstars/statform.ui index 8287a805..1f7dce2c 100644 --- a/kstars/kstars/statform.ui +++ b/kstars/kstars/statform.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>statForm</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -176,5 +176,5 @@ <tabstop>meanOUT</tabstop> <tabstop>stddevOUT</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/streamformui.ui b/kstars/kstars/streamformui.ui index 90d4c1b8..edb08f37 100644 --- a/kstars/kstars/streamformui.ui +++ b/kstars/kstars/streamformui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>streamForm</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -31,13 +31,13 @@ <property name="name"> <cstring>playB</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -57,13 +57,13 @@ <property name="name"> <cstring>captureB</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -97,7 +97,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>300</width> <height>21</height> @@ -119,7 +119,7 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/streamwg.cpp b/kstars/kstars/streamwg.cpp index 80998c07..a4e6d6b2 100644 --- a/kstars/kstars/streamwg.cpp +++ b/kstars/kstars/streamwg.cpp @@ -138,14 +138,14 @@ void StreamWG::setSize(int wd, int ht) streamFrame->totalBaseCount = wd * ht; - resize(wd + layout()->margin() * 2 , ht + playB->height() + layout()->margin() * 2 + layout()->spacing()); + resize(wd + tqlayout()->margin() * 2 , ht + playB->height() + tqlayout()->margin() * 2 + tqlayout()->spacing()); streamFrame->resize(wd, ht); } void StreamWG::resizeEvent(TQResizeEvent *ev) { - streamFrame->resize(ev->size().width() - layout()->margin() * 2, ev->size().height() - playB->height() - layout()->margin() * 2 - layout()->spacing()); + streamFrame->resize(ev->size().width() - tqlayout()->margin() * 2, ev->size().height() - playB->height() - tqlayout()->margin() * 2 - tqlayout()->spacing()); } /* @@ -273,7 +273,7 @@ VideoWG::VideoWG(TQWidget * parent, const char * name) : TQFrame(parent, name, Q streamImage = NULL; grayTable=new QRgb[256]; for (int i=0;i<256;i++) - grayTable[i]=qRgb(i,i,i); + grayTable[i]=tqRgb(i,i,i); } VideoWG::~VideoWG() diff --git a/kstars/kstars/telescopepropui.ui b/kstars/kstars/telescopepropui.ui index cea9e20d..97805cf0 100644 --- a/kstars/kstars/telescopepropui.ui +++ b/kstars/kstars/telescopepropui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>scopeProp</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -32,7 +32,7 @@ </widget> <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>236</width> <height>20</height> @@ -101,7 +101,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>130</width> <height>0</height> @@ -110,7 +110,7 @@ </widget> <widget class="QLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> @@ -160,7 +160,7 @@ </widget> <widget class="QLayoutWidget" row="1" column="2"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> @@ -186,7 +186,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -209,7 +209,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -242,7 +242,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>190</height> @@ -251,7 +251,7 @@ </spacer> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/telescopewizard.ui b/kstars/kstars/telescopewizard.ui index 8f055960..d2d82809 100644 --- a/kstars/kstars/telescopewizard.ui +++ b/kstars/kstars/telescopewizard.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>telescopeWizard</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>1</y> @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>500</width> <height>300</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>800</width> <height>300</height> @@ -44,7 +44,7 @@ </property> <widget class="QLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> @@ -74,7 +74,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>56</width> <height>11</height> @@ -141,7 +141,7 @@ This Wizard will help you to connect to your telescope and control it from KStar <br><br> Please click next to continue.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -167,7 +167,7 @@ Please click next to continue.</string> Please select your telescope model from the list below. Click next after selecting a model.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>25</height> @@ -190,7 +190,7 @@ Please select your telescope model from the list below. Click next after selecti </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> @@ -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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>25</height> @@ -274,12 +274,12 @@ Please select your telescope model from the list below. Click next after selecti <property name="text"> <string><h3>2. Align Your Telescope</h3> -You need to align your telescope before you can control it properly from KStars. Please refer to your telescope manual for alignment instructions. +You need to align your telescope before you can control it properly from KStars. Please refer to your telescope manual for tqalignment instructions. <br><br> -After a successful alignment, connect your telescope's RS232 interface to your computer's serial or USB port. +After a successful tqalignment, connect your telescope's RS232 interface to your computer's serial or USB port. <br><br><br>Click next to continue.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -306,7 +306,7 @@ After a successful alignment, connect your telescope's RS232 interface to your c Verify if the following time, date, and location settings are correct. If any of the settings are incorrect, you can correct them via the <tt>Set time</tt> and <tt>Set Location</tt> buttons. </string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -329,7 +329,7 @@ Verify if the following time, date, and location settings are correct. If any of </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> @@ -337,7 +337,7 @@ Verify if the following time, date, and location settings are correct. If any of </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <vbox> <property name="name"> @@ -345,7 +345,7 @@ Verify if the following time, date, and location settings are correct. If any of </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> @@ -353,7 +353,7 @@ Verify if the following time, date, and location settings are correct. If any of </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -384,7 +384,7 @@ Verify if the following time, date, and location settings are correct. If any of </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -417,7 +417,7 @@ Verify if the following time, date, and location settings are correct. If any of </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -450,7 +450,7 @@ Verify if the following time, date, and location settings are correct. If any of </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <vbox> <property name="name"> @@ -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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -524,7 +524,7 @@ Verify if the following time, date, and location settings are correct. If any of Enter the port number your telescope is connected to. If you only have one serial port in your computer, the port is usually <tt>/dev/ttyS0</tt> <br><br>If you are unsure about the port number, you can leave the field empty and KStars will try to scan the ports for attached telescopes. Beware that the autoscan process might take a few minutes to complete. </string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>25</height> @@ -547,7 +547,7 @@ Enter the port number your telescope is connected to. If you only have one seria </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <hbox> <property name="name"> @@ -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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>25</height> @@ -617,7 +617,7 @@ Enter the port number your telescope is connected to. If you only have one seria </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="0"/> +<tqlayoutdefaults spacing="6" margin="0"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/telescopewizardprocess.cpp b/kstars/kstars/telescopewizardprocess.cpp index 664a4749..201abef5 100644 --- a/kstars/kstars/telescopewizardprocess.cpp +++ b/kstars/kstars/telescopewizardprocess.cpp @@ -106,7 +106,7 @@ telescopeWizardProcess::~telescopeWizardProcess() { if (progressScan) if (progressScan->wasCancelled()) - indidriver->processDeviceStatus(1); + indidriver->processDevicetqStatus(1); Options::setIndiMessages( INDIMessageBar ); @@ -237,7 +237,7 @@ int telescopeWizardProcess::establishLink() if (indidriver->isDeviceRunning(telescopeCombo->currentText())) { indidriver->localListView->setSelected(driverItem, true); - indidriver->processDeviceStatus(1); + indidriver->processDevicetqStatus(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->processDeviceStatus(0); + indidriver->processDevicetqStatus(0); if (!indidriver->isDeviceRunning(telescopeCombo->currentText())) return (3); @@ -274,7 +274,7 @@ void telescopeWizardProcess::processPort() if (timeOutCount >= TIMEOUT_THRESHHOLD) { - indidriver->processDeviceStatus(1); + indidriver->processDevicetqStatus(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->processDeviceStatus(1); + indidriver->processDevicetqStatus(1); Reset(); return; } diff --git a/kstars/kstars/thumbnaileditor.cpp b/kstars/kstars/thumbnaileditor.cpp index 5e2301eb..95d15212 100644 --- a/kstars/kstars/thumbnaileditor.cpp +++ b/kstars/kstars/thumbnaileditor.cpp @@ -130,7 +130,7 @@ void ThumbImage::paintEvent( TQPaintEvent* ) { } void ThumbImage::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == LeftButton && CropRect->contains( e->pos() ) ) { + if ( e->button() == LeftButton && CropRect->tqcontains( e->pos() ) ) { bMouseButtonDown = true; //The Anchor tells how far from the CropRect corner we clicked diff --git a/kstars/kstars/thumbnaileditorui.ui b/kstars/kstars/thumbnaileditorui.ui index 81675a98..2a6c64f9 100644 --- a/kstars/kstars/thumbnaileditorui.ui +++ b/kstars/kstars/thumbnaileditorui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ThumbnailEditorUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -48,7 +48,7 @@ <property name="text"> <string>Crop region: [0,0 200 x 200]</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -65,7 +65,7 @@ <property name="text"> <string>(crop region will be scaled to 200x200)</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -94,5 +94,5 @@ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/thumbnailpicker.cpp b/kstars/kstars/thumbnailpicker.cpp index c9460480..017c9489 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().pixelMetric( TQStyle::PM_TitleBarHeight ) + //I tried to use kapp->style().tqpixelMetric( 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().pixelMetric( TQStyle::PM_TitleBarHeight ) << endl; +// kdDebug() << "Title bar height: " << kapp->style().tqpixelMetric( 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 b5ffd200..d188d87d 100644 --- a/kstars/kstars/thumbnailpickerui.ui +++ b/kstars/kstars/thumbnailpickerui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ThumbnailPickerUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -24,7 +24,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> @@ -32,7 +32,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -80,7 +80,7 @@ <property name="name"> <cstring>ImageList</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>0</height> @@ -110,7 +110,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <vbox> <property name="name"> @@ -118,7 +118,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>53</width> <height>20</height> @@ -143,7 +143,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> @@ -169,13 +169,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>200</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>200</width> <height>200</height> @@ -200,7 +200,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>53</width> <height>20</height> @@ -211,7 +211,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -227,7 +227,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -236,7 +236,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <vbox> <property name="name"> @@ -270,7 +270,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -289,7 +289,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>233</height> @@ -302,7 +302,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>klistbox.h</includehint> diff --git a/kstars/kstars/timebox.cpp b/kstars/kstars/timebox.cpp index 5040cf1f..66464b67 100644 --- a/kstars/kstars/timebox.cpp +++ b/kstars/kstars/timebox.cpp @@ -91,7 +91,7 @@ TQTime timeBox::createTime ( bool *ok ) TQStringList fields; //check for colon-delimiters or space-delimiters - if ( entry.contains(':') ) + if ( entry.tqcontains(':') ) fields = TQStringList::split( ':', entry ); else fields = TQStringList::split( " ", entry ); @@ -113,9 +113,9 @@ TQTime timeBox::createTime ( bool *ok ) // ignore all after 3rd field if ( fields.count() >= 3 ) { - fields[0].replace( TQRegExp("h"), "" ); - fields[1].replace( TQRegExp("m"), "" ); - fields[2].replace( TQRegExp("s"), "" ); + fields[0].tqreplace( TQRegExp("h"), "" ); + fields[1].tqreplace( TQRegExp("m"), "" ); + fields[2].tqreplace( TQRegExp("s"), "" ); } //See if first two fields parse as integers. // @@ -159,9 +159,9 @@ ExtDate timeBox::createDate (bool */*ok*/) if ( !date.isValid() ) { kdDebug() << k_funcinfo << "Invalid date" << endl; - showDate(ExtDate::currentDate()); + showDate(ExtDate::tqcurrentDate()); entry = text().stripWhiteSpace(); - return ExtDate::currentDate(); + return ExtDate::tqcurrentDate(); } else { return date; } diff --git a/kstars/kstars/timedialog.cpp b/kstars/kstars/timedialog.cpp index f4d1449f..b07b74b9 100644 --- a/kstars/kstars/timedialog.cpp +++ b/kstars/kstars/timedialog.cpp @@ -36,7 +36,7 @@ TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* parent ) TQFrame *page = plainPage(); vlay = new TQVBoxLayout( page, 2, 2 ); - hlay = new TQHBoxLayout( 2 ); //this layout will be added to the VLayout + hlay = new TQHBoxLayout( 2 ); //this tqlayout will be added to the VLayout dPicker = new ExtDatePicker( page ); dPicker->setDate( now.date() ); @@ -112,7 +112,7 @@ void TimeDialog::keyReleaseEvent( TQKeyEvent *kev ) { void TimeDialog::setNow( void ) { - KStarsDateTime dt( KStarsDateTime::currentDateTime() ); + KStarsDateTime dt( KStarsDateTime::tqcurrentDateTime() ); dPicker->setDate( dt.date() ); TQTime t = dt.time(); diff --git a/kstars/kstars/tools/altvstime.cpp b/kstars/kstars/tools/altvstime.cpp index 458b467f..0d24508f 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->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); + View->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); View->setXAxisType( KStarsPlotWidget::TIME ); View->setYAxisType( KStarsPlotWidget::ANGLE ); View->setShowGrid( false ); @@ -190,7 +190,7 @@ void AltVsTime::slotAddSource(void) { avtUI->decBox->TQWidget::setFocus(); } - View->repaint(false); + View->tqrepaint(false); } //Use find dialog to choose an object @@ -201,7 +201,7 @@ void AltVsTime::slotBrowseObject(void) { processObject( o ); } - View->repaint(); + View->tqrepaint(); } void AltVsTime::processObject( SkyObject *o, bool forceAdd ) { @@ -323,7 +323,7 @@ void AltVsTime::slotClear(void) { avtUI->decBox->clear(); avtUI->epochName->clear(); View->clearObjectList(); - View->repaint(); + View->tqrepaint(); } void AltVsTime::slotClearBoxes(void) { @@ -400,13 +400,13 @@ void AltVsTime::slotUpdateDateLoc(void) { o->updateCoords( num ); //update pList entry - pList.replace( i, (SkyPoint*)o ); + pList.tqreplace( i, (SkyPoint*)o ); KPlotObject *po = new KPlotObject( "", "white", KPlotObject::CURVE, 1, KPlotObject::SOLID ); for ( double h=-12.0; h<=12.0; h+=0.5 ) { po->addPoint( new DPoint( h, findAltitude( o, h ) ) ); } - View->replaceObject( i, po ); + View->tqreplaceObject( i, po ); //restore original position if ( o->isSolarSystem() ) { @@ -428,7 +428,7 @@ void AltVsTime::slotUpdateDateLoc(void) { for ( double h=-12.0; h<=12.0; h+=0.5 ) { po->addPoint( new DPoint( h, findAltitude( pList.at(i), h ) ) ); } - View->replaceObject( i, po ); + View->tqreplaceObject( i, po ); } } @@ -437,7 +437,7 @@ void AltVsTime::slotUpdateDateLoc(void) { setLSTLimits(); slotHighlight(); - View->repaint(); + View->tqrepaint(); delete num; } @@ -468,7 +468,7 @@ void AltVsTime::setLSTLimits(void) { void AltVsTime::showCurrentDate (void) { - KStarsDateTime dt = KStarsDateTime::currentDateTime(); + KStarsDateTime dt = KStarsDateTime::tqcurrentDateTime(); if ( dt.time() > TQTime( 12, 0, 0 ) ) dt = dt.addDays( 1 ); avtUI->dateBox->setDate( dt.date() ); } @@ -512,7 +512,7 @@ void AVTPlotWidget::mouseMoveEvent( TQMouseEvent *e ) { int Xcursor = e->x(); int Ycursor = e->y(); - if ( ! checkRect.contains( e->x(), e->y() ) ) { + if ( ! checkRect.tqcontains( e->x(), e->y() ) ) { if ( e->x() < checkRect.left() ) Xcursor = checkRect.left(); if ( e->x() > checkRect.right() ) Xcursor = checkRect.right(); if ( e->y() < checkRect.top() ) Ycursor = checkRect.top(); diff --git a/kstars/kstars/tools/altvstimeui.ui b/kstars/kstars/tools/altvstimeui.ui index a4d1bb29..c22b8692 100644 --- a/kstars/kstars/tools/altvstimeui.ui +++ b/kstars/kstars/tools/altvstimeui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AltVsTimeUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -44,7 +44,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout30</cstring> + <cstring>tqlayout30</cstring> </property> <grid> <property name="name"> @@ -108,7 +108,7 @@ <property name="text"> <string>RA:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> @@ -150,13 +150,13 @@ <property name="name"> <cstring>epochName</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>80</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>80</width> <height>32767</height> @@ -175,7 +175,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> @@ -228,7 +228,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -260,7 +260,7 @@ <property name="name"> <cstring>PlotList</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -285,7 +285,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout57</cstring> + <cstring>tqlayout57</cstring> </property> <hbox> <property name="name"> @@ -303,7 +303,7 @@ <property name="name"> <cstring>dateBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>90</width> <height>0</height> @@ -320,7 +320,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>257</width> <height>20</height> @@ -331,7 +331,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout25</cstring> + <cstring>tqlayout25</cstring> </property> <hbox> <property name="name"> @@ -421,7 +421,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -430,7 +430,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout26</cstring> + <cstring>tqlayout26</cstring> </property> <hbox> <property name="name"> @@ -446,7 +446,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -526,7 +526,7 @@ <tabstop>latBox</tabstop> <tabstop>updateButton</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argchangeviewoption.ui b/kstars/kstars/tools/argchangeviewoption.ui index 2445322a..8a475d9e 100644 --- a/kstars/kstars/tools/argchangeviewoption.ui +++ b/kstars/kstars/tools/argchangeviewoption.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgChangeViewOption</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>20</height> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>160</width> <height>20</height> @@ -122,7 +122,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -133,7 +133,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/argexportimage.ui b/kstars/kstars/tools/argexportimage.ui index f5e0d0fb..db033c1e 100644 --- a/kstars/kstars/tools/argexportimage.ui +++ b/kstars/kstars/tools/argexportimage.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgExportImage</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> @@ -36,7 +36,7 @@ <property name="name"> <cstring>ExportFileName</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>160</width> <height>0</height> @@ -47,7 +47,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -72,7 +72,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -179,14 +179,14 @@ <slot access="public" specifier="">update()</slot> <slot access="public" specifier="">update(int,int,int,int)</slot> <slot access="public" specifier="">update(const QRect&)</slot> - <slot access="public" specifier="">repaint()</slot> - <slot access="public" specifier="">repaint(bool)</slot> - <slot access="public" specifier="">repaint(int,int,int,int)</slot> - <slot access="public" specifier="">repaint(int,int,int,int,bool)</slot> - <slot access="public" specifier="">repaint(const QRect&)</slot> - <slot access="public" specifier="">repaint(const QRect&,bool)</slot> - <slot access="public" specifier="">repaint(const QRegion&)</slot> - <slot access="public" specifier="">repaint(const QRegion&,bool)</slot> + <slot access="public" specifier="">tqrepaint()</slot> + <slot access="public" specifier="">tqrepaint(bool)</slot> + <slot access="public" specifier="">tqrepaint(int,int,int,int)</slot> + <slot access="public" specifier="">tqrepaint(int,int,int,int,bool)</slot> + <slot access="public" specifier="">tqrepaint(const QRect&)</slot> + <slot access="public" specifier="">tqrepaint(const QRect&,bool)</slot> + <slot access="public" specifier="">tqrepaint(const QRegion&)</slot> + <slot access="public" specifier="">tqrepaint(const QRegion&,bool)</slot> <slot access="public" specifier="">show()</slot> <slot access="public" specifier="">hide()</slot> <slot access="public" specifier="">setShown(bool)</slot> @@ -221,10 +221,10 @@ <slot access="private" specifier="">slotEmitRelativeValueChanged(int)</slot> <property type="CString">name</property> <property type="Bool">enabled</property> - <property type="Rect">geometry</property> + <property type="Rect">tqgeometry</property> <property type="SizePolicy">sizePolicy</property> - <property type="Size">minimumSize</property> - <property type="Size">maximumSize</property> + <property type="Size">tqminimumSize</property> + <property type="Size">tqmaximumSize</property> <property type="Size">sizeIncrement</property> <property type="Size">baseSize</property> <property type="Color">paletteForegroundColor</property> @@ -255,7 +255,7 @@ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154789cb5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c203e47720000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argloadcolorscheme.ui b/kstars/kstars/tools/argloadcolorscheme.ui index addc92eb..80c4022e 100644 --- a/kstars/kstars/tools/argloadcolorscheme.ui +++ b/kstars/kstars/tools/argloadcolorscheme.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgLoadColorScheme</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -23,5 +23,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/tools/arglooktoward.ui b/kstars/kstars/tools/arglooktoward.ui index 5d28243b..d8caa57a 100644 --- a/kstars/kstars/tools/arglooktoward.ui +++ b/kstars/kstars/tools/arglooktoward.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgLookToward</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> @@ -125,7 +125,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -144,7 +144,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -155,7 +155,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argprintimage.ui b/kstars/kstars/tools/argprintimage.ui index a8bc4a24..8806e894 100644 --- a/kstars/kstars/tools/argprintimage.ui +++ b/kstars/kstars/tools/argprintimage.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgPrintImage</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>70</height> @@ -54,5 +54,5 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/tools/argsetactionindi.ui b/kstars/kstars/tools/argsetactionindi.ui index 8446c010..1b9f593c 100644 --- a/kstars/kstars/tools/argsetactionindi.ui +++ b/kstars/kstars/tools/argsetactionindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetActionINDI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout50</cstring> + <cstring>tqlayout50</cstring> </property> <hbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout47</cstring> + <cstring>tqlayout47</cstring> </property> <vbox> <property name="name"> @@ -55,7 +55,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout48</cstring> + <cstring>tqlayout48</cstring> </property> <vbox> <property name="name"> @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>21</height> @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>9</height> @@ -113,7 +113,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/argsetaltaz.ui b/kstars/kstars/tools/argsetaltaz.ui index 5c40d16a..d75810f5 100644 --- a/kstars/kstars/tools/argsetaltaz.ui +++ b/kstars/kstars/tools/argsetaltaz.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetAltAz</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <grid> <property name="name"> @@ -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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -136,7 +136,7 @@ The azimuth is one of the coordinates in the horizontal coordinate system. It i <tabstop>AzBox</tabstop> <tabstop>AltBox</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/argsetccdtempindi.ui b/kstars/kstars/tools/argsetccdtempindi.ui index 28822d8a..bc6f2324 100644 --- a/kstars/kstars/tools/argsetccdtempindi.ui +++ b/kstars/kstars/tools/argsetccdtempindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetCCDTempINDI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout64</cstring> + <cstring>tqlayout64</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout63</cstring> + <cstring>tqlayout63</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout62</cstring> + <cstring>tqlayout62</cstring> </property> <vbox> <property name="name"> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>27</width> <height>21</height> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>9</height> @@ -114,7 +114,7 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kstars/kstars/tools/argsetcolor.ui b/kstars/kstars/tools/argsetcolor.ui index 662b1ebe..3eaa2a01 100644 --- a/kstars/kstars/tools/argsetcolor.ui +++ b/kstars/kstars/tools/argsetcolor.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetColor</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <grid> <property name="name"> @@ -42,7 +42,7 @@ </widget> <widget class="QLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> @@ -66,7 +66,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -92,7 +92,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -139,14 +139,14 @@ <slot access="public" specifier="">update()</slot> <slot access="public" specifier="">update(int,int,int,int)</slot> <slot access="public" specifier="">update(const QRect&)</slot> - <slot access="public" specifier="">repaint()</slot> - <slot access="public" specifier="">repaint(bool)</slot> - <slot access="public" specifier="">repaint(int,int,int,int)</slot> - <slot access="public" specifier="">repaint(int,int,int,int,bool)</slot> - <slot access="public" specifier="">repaint(const QRect&)</slot> - <slot access="public" specifier="">repaint(const QRect&,bool)</slot> - <slot access="public" specifier="">repaint(const QRegion&)</slot> - <slot access="public" specifier="">repaint(const QRegion&,bool)</slot> + <slot access="public" specifier="">tqrepaint()</slot> + <slot access="public" specifier="">tqrepaint(bool)</slot> + <slot access="public" specifier="">tqrepaint(int,int,int,int)</slot> + <slot access="public" specifier="">tqrepaint(int,int,int,int,bool)</slot> + <slot access="public" specifier="">tqrepaint(const QRect&)</slot> + <slot access="public" specifier="">tqrepaint(const QRect&,bool)</slot> + <slot access="public" specifier="">tqrepaint(const QRegion&)</slot> + <slot access="public" specifier="">tqrepaint(const QRegion&,bool)</slot> <slot access="public" specifier="">show()</slot> <slot access="public" specifier="">hide()</slot> <slot access="public" specifier="">setShown(bool)</slot> @@ -180,10 +180,10 @@ <slot access="protected" specifier="">chooseColor()</slot> <property type="CString">name</property> <property type="Bool">enabled</property> - <property type="Rect">geometry</property> + <property type="Rect">tqgeometry</property> <property type="SizePolicy">sizePolicy</property> - <property type="Size">minimumSize</property> - <property type="Size">maximumSize</property> + <property type="Size">tqminimumSize</property> + <property type="Size">tqmaximumSize</property> <property type="Size">sizeIncrement</property> <property type="Size">baseSize</property> <property type="Color">paletteForegroundColor</property> @@ -218,7 +218,7 @@ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154789cb5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c203e47720000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argsetfilternumindi.ui b/kstars/kstars/tools/argsetfilternumindi.ui index 17e58302..7c8dce98 100644 --- a/kstars/kstars/tools/argsetfilternumindi.ui +++ b/kstars/kstars/tools/argsetfilternumindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetFilterNumINDI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout64</cstring> + <cstring>tqlayout64</cstring> </property> <hbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout63</cstring> + <cstring>tqlayout63</cstring> </property> <vbox> <property name="name"> @@ -55,7 +55,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout62</cstring> + <cstring>tqlayout62</cstring> </property> <vbox> <property name="name"> @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>27</width> <height>21</height> @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>9</height> @@ -117,7 +117,7 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kstars/kstars/tools/argsetfocusspeedindi.ui b/kstars/kstars/tools/argsetfocusspeedindi.ui index 73023c28..d79fb88e 100644 --- a/kstars/kstars/tools/argsetfocusspeedindi.ui +++ b/kstars/kstars/tools/argsetfocusspeedindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetFocusSpeedINDI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -26,7 +26,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>9</height> @@ -43,7 +43,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>45</width> <height>21</height> @@ -84,7 +84,7 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kstars/kstars/tools/argsetfocustimeoutindi.ui b/kstars/kstars/tools/argsetfocustimeoutindi.ui index fd7a827c..18f650b8 100644 --- a/kstars/kstars/tools/argsetfocustimeoutindi.ui +++ b/kstars/kstars/tools/argsetfocustimeoutindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetFocusTimeoutINDI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout64</cstring> + <cstring>tqlayout64</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout63</cstring> + <cstring>tqlayout63</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout62</cstring> + <cstring>tqlayout62</cstring> </property> <vbox> <property name="name"> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>27</width> <height>21</height> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>9</height> @@ -114,7 +114,7 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kstars/kstars/tools/argsetframetypeindi.ui b/kstars/kstars/tools/argsetframetypeindi.ui index 4400fe06..53962f38 100644 --- a/kstars/kstars/tools/argsetframetypeindi.ui +++ b/kstars/kstars/tools/argsetframetypeindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetFrameTypeINDI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout55</cstring> + <cstring>tqlayout55</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout47</cstring> + <cstring>tqlayout47</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout54</cstring> + <cstring>tqlayout54</cstring> </property> <vbox> <property name="name"> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>56</width> <height>21</height> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>9</height> @@ -108,7 +108,7 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argsetgeolocation.ui b/kstars/kstars/tools/argsetgeolocation.ui index 00e0f7b0..045bc5ed 100644 --- a/kstars/kstars/tools/argsetgeolocation.ui +++ b/kstars/kstars/tools/argsetgeolocation.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetGeoLocation</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout36</cstring> + <cstring>tqlayout36</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout35</cstring> + <cstring>tqlayout35</cstring> </property> <vbox> <property name="name"> @@ -34,7 +34,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout34</cstring> + <cstring>tqlayout34</cstring> </property> <grid> <property name="name"> @@ -101,7 +101,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout33</cstring> + <cstring>tqlayout33</cstring> </property> <hbox> <property name="name"> @@ -117,7 +117,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>49</width> <height>20</height> @@ -152,7 +152,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>49</width> <height>20</height> @@ -171,7 +171,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -191,7 +191,7 @@ <slots> <slot>slotFindCity()</slot> </slots> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/argsetgeolocationindi.ui b/kstars/kstars/tools/argsetgeolocationindi.ui index 6dd5fbf8..ac600dff 100644 --- a/kstars/kstars/tools/argsetgeolocationindi.ui +++ b/kstars/kstars/tools/argsetgeolocationindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetGeoLocationINDI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout34</cstring> + <cstring>tqlayout34</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout32</cstring> + <cstring>tqlayout32</cstring> </property> <vbox> <property name="name"> @@ -60,7 +60,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout33</cstring> + <cstring>tqlayout33</cstring> </property> <vbox> <property name="name"> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>23</height> @@ -161,7 +161,7 @@ <data format="PNG" length="1114">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042149444154789c8d95c18b1c4514c67fbb29e5b54ea05b26da1d36b08d096e8b11261871837bc8e282ac7ac82187e049a317e32d37110992bf42123c694eea414c0e0bf1b0ec6c402139485a54e8810c54c10e741146fa110bd643f74c12bd642e4d75f77cf5d5ef7dafdfc2ce7087d9eff32fdfdff74e5114104011e489d6e952cce5cfbe5998692dec0c77b87aedd3fddd9f2b3efce02291082209aa3504685022e4ffd7a000a82a765c515615ce95acae659c3f7765c100ec6e575cf8f822e991025f3b6a6f890c484f181ccfc1583428f5d4e2fe84da039aa04121b40eb32483a0ec6e5bce9f8385d36fa7fb9b1b17c8f31cbfe7a95c45be94520c72b2141a1caa160d1666e24ea94aa11ee7685054159d2ada34d41387c40dc63b8844f0b5c73a4bb19cb3f9de001f2aac1fa23aa209168c004224902e29d22ff1e38abbdb275055c4800610233867311a1491847a62c98f66ac6f14d8e99072f22daa15b68a8108424d6422e24c88e3966fbce4c9d786945b27f0be0103ed13c16004d59a2c4d58df28a87548e9aee2274ab95d60c7193c9a0281fc959ae2a4450364a9e2572c7a2b43438374ef2dd2154012d050514dbec7396578a3130d9d6850066f0ad9d186f2d78cdbbb799b0a202f2c48d3aebbb418310240b112637588574bf54b8efaa4fd9b691dacbf5b305813542bae63a9eee4c4694d967b5494eca8c7ef0933bdc5d90e6a2caa0e3f013b7adce9fa5b03d637561113a30106a71d18c5fd9677058338ad01e91c0b8b743b880182ce19cd9c0e5e2b583fbdda565d3d04cfedad180942133af201b2bc3588e111c680068f489780ce69b192b279768088524f2b3458ea694d3de99a4323bc976ed34eb86b98c51993f6be10f77240c99685cd731991f1582df15aa15a213d583f5313a7806988fb8a0640e336359d9e9933568bf44062214ba19e2a7652a13d8b068ff596b807182189234e9da9f1ceb78c81b28c3ac6fe21e306c58e41d5118952acd6a0c2f56b9e6a5c72f346cdcd6b19a3bf8010010d714f89533b674c90c7189b598eab12a45fb5c75b8253672b863fbcccf5af93b6904119fe9851bf5153ac3a746ae7b9d5698c1dc58f313e70e4707ce9d84bafa2f79fc23fb8c7c1438ef04031a2642fee21060ec69ee47020796ecaa12313ccd333d1b67935047acf2be3bb11aa010dbe656cc755dbe3b772084a7ebc6d5711253b593dfcc0cc8fcd3cafda455512c7f200ec56cbfac0f1d7d34b7fdf0f98fd88a92a7e9cb0e70cc933c0b38a2c823ea0bd76c70c016adb67f47bc2a117a6d40abeea33fa23c2fb867edfb413e4a34fded94ffb3991c46dc7754cd3634ad2af490b857f5a5137126a97e02a8120a485235b6a28ef80bd077ee2b9f2d54fed04595dcbd8ddb6c4bd87334c10cadb2064e856177e7864e669fbe1df154a0142839f7ad2e5b6880bff1da66eece78e315d959f609da670f98befe6c3f45fb42672c9acff7f660000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/argsetlocaltime.ui b/kstars/kstars/tools/argsetlocaltime.ui index 03247473..1e3ab951 100644 --- a/kstars/kstars/tools/argsetlocaltime.ui +++ b/kstars/kstars/tools/argsetlocaltime.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetLocalTime</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -23,7 +23,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout43</cstring> + <cstring>tqlayout43</cstring> </property> <hbox> <property name="name"> @@ -39,7 +39,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>70</width> <height>20</height> @@ -69,7 +69,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -101,5 +101,5 @@ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154789cb5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c203e47720000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/tools/argsetportindi.ui b/kstars/kstars/tools/argsetportindi.ui index 2ca20aa4..12687b8f 100644 --- a/kstars/kstars/tools/argsetportindi.ui +++ b/kstars/kstars/tools/argsetportindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetPortINDI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout23</cstring> + <cstring>tqlayout23</cstring> </property> <grid> <property name="name"> @@ -62,7 +62,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>9</height> @@ -71,7 +71,7 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/argsetradec.ui b/kstars/kstars/tools/argsetradec.ui index b78ac04a..f1830fb6 100644 --- a/kstars/kstars/tools/argsetradec.ui +++ b/kstars/kstars/tools/argsetradec.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetRaDec</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <grid> <property name="name"> @@ -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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -136,7 +136,7 @@ Right Ascension is one of the coordinates in the Equatorial coordinate system. <tabstop>RaBox</tabstop> <tabstop>DecBox</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/argsetscopeactionindi.ui b/kstars/kstars/tools/argsetscopeactionindi.ui index 528e783e..3630c8f4 100644 --- a/kstars/kstars/tools/argsetscopeactionindi.ui +++ b/kstars/kstars/tools/argsetscopeactionindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetScopeActionINDI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout55</cstring> + <cstring>tqlayout55</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout47</cstring> + <cstring>tqlayout47</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout54</cstring> + <cstring>tqlayout54</cstring> </property> <vbox> <property name="name"> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>56</width> <height>21</height> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>9</height> @@ -108,7 +108,7 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argsettargetcoordindi.ui b/kstars/kstars/tools/argsettargetcoordindi.ui index 8973b24b..b3b6849b 100644 --- a/kstars/kstars/tools/argsettargetcoordindi.ui +++ b/kstars/kstars/tools/argsettargetcoordindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetTargetCoordINDI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout34</cstring> + <cstring>tqlayout34</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout32</cstring> + <cstring>tqlayout32</cstring> </property> <vbox> <property name="name"> @@ -60,7 +60,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout33</cstring> + <cstring>tqlayout33</cstring> </property> <vbox> <property name="name"> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>24</height> @@ -161,7 +161,7 @@ <data format="PNG" length="1114">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042149444154789c8d95c18b1c4514c67fbb29e5b54ea05b26da1d36b08d096e8b11261871837bc8e282ac7ac82187e049a317e32d37110992bf42123c694eea414c0e0bf1b0ec6c402139485a54e8810c54c10e741146fa110bd643f74c12bd642e4d75f77cf5d5ef7dafdfc2ce7087d9eff32fdfdff74e5114104011e489d6e952cce5cfbe5998692dec0c77b87aedd3fddd9f2b3efce02291082209aa3504685022e4ffd7a000a82a765c515615ce95acae659c3f7765c100ec6e575cf8f822e991025f3b6a6f890c484f181ccfc1583428f5d4e2fe84da039aa04121b40eb32483a0ec6e5bce9f8385d36fa7fb9b1b17c8f31cbfe7a95c45be94520c72b2141a1caa160d1666e24ea94aa11ee7685054159d2ada34d41387c40dc63b8844f0b5c73a4bb19cb3f9de001f2aac1fa23aa209168c004224902e29d22ff1e38abbdb275055c4800610233867311a1491847a62c98f66ac6f14d8e99072f22daa15b68a8108424d6422e24c88e3966fbce4c9d786945b27f0be0103ed13c16004d59a2c4d58df28a87548e9aee2274ab95d60c7193c9a0281fc959ae2a4450364a9e2572c7a2b43438374ef2dd2154012d050514dbec7396578a3130d9d6850066f0ad9d186f2d78cdbbb799b0a202f2c48d3aebbb418310240b112637588574bf54b8efaa4fd9b691dacbf5b305813542bae63a9eee4c4694d967b5494eca8c7ef0933bdc5d90e6a2caa0e3f013b7adce9fa5b03d637561113a30106a71d18c5fd9677058338ad01e91c0b8b743b880182ce19cd9c0e5e2b583fbdda565d3d04cfedad180942133af201b2bc3588e111c680068f489780ce69b192b279768088524f2b3458ea694d3de99a4323bc976ed34eb86b98c51993f6be10f77240c99685cd731991f1582df15aa15a213d583f5313a7806988fb8a0640e336359d9e9933568bf44062214ba19e2a7652a13d8b068ff596b807182189234e9da9f1ceb78c81b28c3ac6fe21e306c58e41d5118952acd6a0c2f56b9e6a5c72f346cdcd6b19a3bf8010010d714f89533b674c90c7189b598eab12a45fb5c75b8253672b863fbcccf5af93b6904119fe9851bf5153ac3a746ae7b9d5698c1dc58f313e70e4707ce9d84bafa2f79fc23fb8c7c1438ef04031a2642fee21060ec69ee47020796ecaa12313ccd333d1b67935047acf2be3bb11aa010dbe656cc755dbe3b772084a7ebc6d5711253b593dfcc0cc8fcd3cafda455512c7f200ec56cbfac0f1d7d34b7fdf0f98fd88a92a7e9cb0e70cc933c0b38a2c823ea0bd76c70c016adb67f47bc2a117a6d40abeea33fa23c2fb867edfb413e4a34fded94ffb3991c46dc7754cd3634ad2af490b857f5a5137126a97e02a8120a485235b6a28ef80bd077ee2b9f2d54fed04595dcbd8ddb6c4bd87334c10cadb2064e856177e7864e669fbe1df154a0142839f7ad2e5b6880bff1da66eece78e315d959f609da670f98befe6c3f45fb42672c9acff7f660000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/argsettargetnameindi.ui b/kstars/kstars/tools/argsettargetnameindi.ui index 0f4b17f9..c826f0c9 100644 --- a/kstars/kstars/tools/argsettargetnameindi.ui +++ b/kstars/kstars/tools/argsettargetnameindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetTargetNameINDI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout44</cstring> + <cstring>tqlayout44</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout40</cstring> + <cstring>tqlayout40</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout41</cstring> + <cstring>tqlayout41</cstring> </property> <vbox> <property name="name"> @@ -72,7 +72,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout42</cstring> + <cstring>tqlayout42</cstring> </property> <vbox> <property name="name"> @@ -88,7 +88,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>52</width> <height>20</height> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>8</height> @@ -139,7 +139,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/argsettrack.ui b/kstars/kstars/tools/argsettrack.ui index bacb0597..27dc0ebf 100644 --- a/kstars/kstars/tools/argsettrack.ui +++ b/kstars/kstars/tools/argsettrack.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetTrack</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <hbox> <property name="name"> @@ -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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -78,5 +78,5 @@ If unchecked, then Tracking will be forced off, even if an object has been cente </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/tools/argsetutcindi.ui b/kstars/kstars/tools/argsetutcindi.ui index 9c0f1302..d3af06e3 100644 --- a/kstars/kstars/tools/argsetutcindi.ui +++ b/kstars/kstars/tools/argsetutcindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetUTCINDI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout88</cstring> + <cstring>tqlayout88</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout86</cstring> + <cstring>tqlayout86</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout87</cstring> + <cstring>tqlayout87</cstring> </property> <vbox> <property name="name"> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>9</height> @@ -110,7 +110,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/argshutdownindi.ui b/kstars/kstars/tools/argshutdownindi.ui index ce7be2f4..03260458 100644 --- a/kstars/kstars/tools/argshutdownindi.ui +++ b/kstars/kstars/tools/argshutdownindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgShutdownINDI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -59,7 +59,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>33</height> @@ -68,7 +68,7 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argstartexposureindi.ui b/kstars/kstars/tools/argstartexposureindi.ui index 47a631e6..68849411 100644 --- a/kstars/kstars/tools/argstartexposureindi.ui +++ b/kstars/kstars/tools/argstartexposureindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgStartExposureINDI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout64</cstring> + <cstring>tqlayout64</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout63</cstring> + <cstring>tqlayout63</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout62</cstring> + <cstring>tqlayout62</cstring> </property> <vbox> <property name="name"> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>27</width> <height>21</height> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>9</height> @@ -116,7 +116,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kstars/kstars/tools/argstartfocusindi.ui b/kstars/kstars/tools/argstartfocusindi.ui index 3bd5503c..407dd4b5 100644 --- a/kstars/kstars/tools/argstartfocusindi.ui +++ b/kstars/kstars/tools/argstartfocusindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgStartFocusINDI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout55</cstring> + <cstring>tqlayout55</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout47</cstring> + <cstring>tqlayout47</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout54</cstring> + <cstring>tqlayout54</cstring> </property> <vbox> <property name="name"> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>56</width> <height>21</height> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>9</height> @@ -110,7 +110,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argstartindi.ui b/kstars/kstars/tools/argstartindi.ui index 554ea363..47f6c955 100644 --- a/kstars/kstars/tools/argstartindi.ui +++ b/kstars/kstars/tools/argstartindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgStartINDI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>20</height> @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -117,7 +117,7 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argswitchindi.ui b/kstars/kstars/tools/argswitchindi.ui index f4c85a1c..ea60237a 100644 --- a/kstars/kstars/tools/argswitchindi.ui +++ b/kstars/kstars/tools/argswitchindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSwitchINDI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>20</height> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>33</height> @@ -122,7 +122,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argtimescale.ui b/kstars/kstars/tools/argtimescale.ui index f2b0eab3..85b51337 100644 --- a/kstars/kstars/tools/argtimescale.ui +++ b/kstars/kstars/tools/argtimescale.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgTimeScale</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -39,7 +39,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>150</width> <height>20</height> @@ -58,7 +58,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -90,7 +90,7 @@ <data format="XPM.GZ" length="2926">789c9d95594f32591086effd15c4ba3393fae895ee4ce6824540141011b7c95cf406a202caa6f065fefb549faaea0b24996fc623cb937aeb3d55754e871f67a587eb6ee9ecc7c96a1dada74929798e96a5b374339bedfefceb8f9f27a7b65da27fcb724bf6e96f27a783752929f516f32c070402289b3fc39d8203c3136157e276c1260eac0f0ade0907927f2d9c58261f929cad72be0cef8535ff5959e277c201ef0fa02cf1ae7022f9efca12ff301ca81e87c21a5f32db5acf95b0eebfcdd92e2be3a5b0fa7986435bfd6e981d99278c0ae6795c288b3e2b98e3036157d8f839961308af985df51b1b0e9dc0098ddf5a3811fd7dceaee52a370d475e28f9b7ca1c07539f67173c144e65be2fcae2d763f62d89df2acb7cc282393e57b6b9ff58d893fca632c7d1ccc78bbcd48b4c7cc2ec4bfdf0aa2cfbf50be6fa2c65d9af2aacfd2c94e53cccf9fa7645eb7794a59ebdb027fe5565895f09cb7e981a267f9febaf3117fab6702af599e7a5e2049e6dce1377c25affa6608e4786e34a58894dfc8b59f5f890731087e28f2de648fbdb16ccfd6c9465bf7365c732f12f61ed3f5016fd4a59f4e6790fddd00a5d137f638eb4bfa532df5ffc148ea4be5ac17c5ea9b2ecd72b98efff403893fa1accb12d5c5696fd4d7f6152c41f95c53f2a98f56b6597fbf3857da9b75e30fb5584b59fa78239de5596fd3e0be6fdccf311b99115f1fcdaccb12fe77927ac7e2365f1c382793e63e14cfccdf3132571e69b1f07e83327d23fbac2bee4d785d57f2a9c89de9c6fecaa1fce98135bf845b9e2189e2a07e6fee287b0cfcf3bce9525ff5d38927a1bcca9cc1b66ca528ff93d89d338e3f9e182b9c86f31a752ff609d2f847f5f83b5ea31c218137a4f8fac0cc738e10cd6d3b7189f718a2ff88a6f38c339ad05adfcf31d3f7089ab037d42ea356e708b9ff8853bdc6395de6b58c706ad736c1ee823f2de608b146dbcc08e8976f012afb04b3975ec1de853aa2457f749d5c16b1ce00d0ecdf75b1ce1dd11fd1b55d236cef7f8808ff88465b4d02676d03da29f51dd9e513fa28f150c3004246d07002288bfe9e7d45f0712f22635a490d15ef730361e3b389c67aedf2390ea3157e73dc333e9a6f042d13ebc7ed32f6882405d3ee1c678030ee10d6630a76f162c8ee8f37adeb14c0aaa0b3e68b725ac80a2b039a29f630db6e46bc127d5fd45de4b5226b0833d8ea07a445f871ae96dacc218ead08073c835136842eba8be016db830e77a419f21aca143f76c025b9ae7e5813ea35bd5a0731fd1c4877a7f614fde57d085deb7f31ad31dccf54fd087883ab7a88f6baabb45fdf760003707fa09ddd826f66048af1826f00a0bb3aa7009b73082bb03fd2faeffa7fff58cfffcbcfffdfbc93f7f7d62d7</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>timestepbox.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argwaitfor.ui b/kstars/kstars/tools/argwaitfor.ui index 21478f29..89a62dbd 100644 --- a/kstars/kstars/tools/argwaitfor.ui +++ b/kstars/kstars/tools/argwaitfor.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgWaitFor</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <hbox> <property name="name"> @@ -53,7 +53,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -81,5 +81,5 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/tools/argwaitforkey.ui b/kstars/kstars/tools/argwaitforkey.ui index cb3f8610..805566ca 100644 --- a/kstars/kstars/tools/argwaitforkey.ui +++ b/kstars/kstars/tools/argwaitforkey.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgWaitForKey</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <hbox> <property name="name"> @@ -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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -85,7 +85,7 @@ Only simple keys can currently be used; you cannot use modifier keys such as Ctr </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argzoom.ui b/kstars/kstars/tools/argzoom.ui index 8b93e300..9a2fccfe 100644 --- a/kstars/kstars/tools/argzoom.ui +++ b/kstars/kstars/tools/argzoom.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgZoom</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -86,7 +86,7 @@ The Zoom level specifies the number of pixels which span one radian of arc. Rea </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/astrocalc.cpp b/kstars/kstars/tools/astrocalc.cpp index 3b87826b..18b0d6fd 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::sizeHint() const +TQSize AstroCalc::tqsizeHint() const { return TQSize(640,430); } diff --git a/kstars/kstars/tools/astrocalc.h b/kstars/kstars/tools/astrocalc.h index bbabcb24..18870824 100644 --- a/kstars/kstars/tools/astrocalc.h +++ b/kstars/kstars/tools/astrocalc.h @@ -120,7 +120,7 @@ Q_OBJECT void delRightPanel(void); /**@returns suggested size of calculator window. */ - TQSize sizeHint() const; + TQSize tqsizeHint() 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 7d7add93..90303b38 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->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->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->setPaletteForegroundColor( colIo ); labEu->setPaletteForegroundColor( colEu ); diff --git a/kstars/kstars/tools/kstarsplotwidget.cpp b/kstars/kstars/tools/kstarsplotwidget.cpp index dcbe36b7..1ca4ab1a 100644 --- a/kstars/kstars/tools/kstarsplotwidget.cpp +++ b/kstars/kstars/tools/kstarsplotwidget.cpp @@ -283,7 +283,7 @@ void KStarsPlotWidget::updateTickmarks() { void KStarsPlotWidget::drawBox( TQPainter *p ) { int pW = PixRect.width(), pH = PixRect.height(); - //First, fill in padding region with bgColor() to mask out-of-bounds plot data + //First, fill in padding region with bgColor() to tqmask out-of-bounds plot data p->setPen( bgColor() ); p->setBrush( bgColor() ); @@ -361,7 +361,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); int idot = str.find( '.' ); if ( idot >= 0 ) - str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() ); if ( px > 0 && px < pW ) { TQRect r( px - BIGTICKSIZE, pH+BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); @@ -429,7 +429,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); int idot = str.find( '.' ); if ( idot >= 0 ) - str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() ); if ( py > 0 && py < pH ) { TQRect r( -2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); @@ -495,7 +495,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); int idot = str.find( '.' ); if ( idot >= 0 ) - str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() ); if ( px > 0 && px < pW ) { TQRect r( px - BIGTICKSIZE, -2*BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); @@ -559,7 +559,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); int idot = str.find( '.' ); if ( idot >= 0 ) - str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() ); if ( py > 0 && py < pH ) { TQRect r( pW + 2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp index bc682bbb..a3812969 100644 --- a/kstars/kstars/tools/lcgenerator.cpp +++ b/kstars/kstars/tools/lcgenerator.cpp @@ -69,10 +69,10 @@ void LCGenerator::createGUI() StarInfoBox = new TQGroupBox( page, "StarInfoBox" ); StarInfoBox->setColumnLayout(0, Qt::Vertical ); - StarInfoBox->layout()->setSpacing( 6 ); - StarInfoBox->layout()->setMargin( 11 ); - StarInfoBoxLayout = new TQVBoxLayout( StarInfoBox->layout() ); - StarInfoBoxLayout->setAlignment( Qt::AlignTop ); + StarInfoBox->tqlayout()->setSpacing( 6 ); + StarInfoBox->tqlayout()->setMargin( 11 ); + StarInfoBoxLayout = new TQVBoxLayout( StarInfoBox->tqlayout() ); + StarInfoBoxLayout->tqsetAlignment( Qt::AlignTop ); DesignHLayout = new TQHBoxLayout( 0, 0, 6, "DesignHLayout"); @@ -125,10 +125,10 @@ void LCGenerator::createGUI() DataSelectBox = new TQGroupBox( page, "DataSelectBox" ); DataSelectBox->setColumnLayout(0, Qt::Vertical ); - DataSelectBox->layout()->setSpacing( 6 ); - DataSelectBox->layout()->setMargin( 11 ); - DataSelectBoxLayout = new TQVBoxLayout( DataSelectBox->layout() ); - DataSelectBoxLayout->setAlignment( Qt::AlignTop ); + DataSelectBox->tqlayout()->setSpacing( 6 ); + DataSelectBox->tqlayout()->setMargin( 11 ); + DataSelectBoxLayout = new TQVBoxLayout( DataSelectBox->tqlayout() ); + DataSelectBoxLayout->tqsetAlignment( Qt::AlignTop ); VisualCheck = new TQCheckBox( DataSelectBox, "VisualCheck" ); VisualCheck->setChecked( TRUE ); diff --git a/kstars/kstars/tools/modcalcangdistdlg.ui b/kstars/kstars/tools/modcalcangdistdlg.ui index 72290976..481b2287 100644 --- a/kstars/kstars/tools/modcalcangdistdlg.ui +++ b/kstars/kstars/tools/modcalcangdistdlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcAngDistDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -36,7 +36,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> @@ -57,7 +57,7 @@ <property name="name"> <cstring>ra0Box</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -71,7 +71,7 @@ <property name="name"> <cstring>dec0Box</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -114,7 +114,7 @@ <property name="name"> <cstring>ra1Box</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -128,7 +128,7 @@ <property name="name"> <cstring>dec1Box</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -160,7 +160,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>145</width> <height>20</height> @@ -201,7 +201,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>146</width> <height>20</height> @@ -226,7 +226,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>145</width> <height>20</height> @@ -256,7 +256,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>102</width> <height>20</height> @@ -275,7 +275,7 @@ <property name="name"> <cstring>distBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -295,7 +295,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>70</width> <height>20</height> @@ -314,7 +314,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>171</height> @@ -525,7 +525,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> @@ -541,7 +541,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>151</width> <height>21</height> @@ -574,7 +574,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>131</width> <height>21</height> @@ -593,7 +593,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -667,7 +667,7 @@ <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> </slots> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcapcoord.cpp b/kstars/kstars/tools/modcalcapcoord.cpp index 27f4bc0c..9d721f0c 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::currentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); datBox->setDate( dt.date() ); timBox->setTime( dt.time() ); } @@ -98,7 +98,7 @@ void modCalcApCoord::slotClearCoords(){ rafBox->clearFields(); decfBox->clearFields(); epoch0Name->setText(""); - datBox->setDate(ExtDate::currentDate()); + datBox->setDate(ExtDate::tqcurrentDate()); timBox->setTime(TQTime(0,0,0)); } diff --git a/kstars/kstars/tools/modcalcapcoorddlg.ui b/kstars/kstars/tools/modcalcapcoorddlg.ui index 5ddec248..2d5e0aa6 100644 --- a/kstars/kstars/tools/modcalcapcoorddlg.ui +++ b/kstars/kstars/tools/modcalcapcoorddlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcApCoordDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -39,7 +39,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -98,7 +98,7 @@ <property name="name"> <cstring>datBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -125,7 +125,7 @@ <property name="name"> <cstring>ra0Box</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -139,7 +139,7 @@ <property name="name"> <cstring>dec0Box</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -192,7 +192,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -208,7 +208,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>81</width> <height>20</height> @@ -233,7 +233,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>70</width> <height>20</height> @@ -258,7 +258,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>91</width> <height>20</height> @@ -288,7 +288,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>102</width> <height>20</height> @@ -297,7 +297,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <grid> <property name="name"> @@ -323,7 +323,7 @@ <property name="name"> <cstring>rafBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -337,7 +337,7 @@ <property name="name"> <cstring>decfBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -359,7 +359,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>70</width> <height>20</height> @@ -378,7 +378,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>70</height> @@ -440,7 +440,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -457,7 +457,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -526,7 +526,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -625,7 +625,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> @@ -641,7 +641,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>151</width> <height>21</height> @@ -674,7 +674,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>131</width> <height>21</height> @@ -693,7 +693,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -855,7 +855,7 @@ <slot>slotInputFile()</slot> <slot>slotOutputFile()</slot> </slots> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcazel.cpp b/kstars/kstars/tools/modcalcazel.cpp index a2dee393..e276defc 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::currentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); datBox->setDate( dt.date() ); timBox->setTime( dt.time() ); @@ -179,7 +179,7 @@ void modCalcAzel::slotClearCoords() elBox->clearFields(); epochName->setText(""); - datBox->setDate(ExtDate::currentDate()); + datBox->setDate(ExtDate::tqcurrentDate()); timBox->setTime(TQTime(0,0,0)); } diff --git a/kstars/kstars/tools/modcalcazel.h b/kstars/kstars/tools/modcalcazel.h index d7dae29a..65e09837 100644 --- a/kstars/kstars/tools/modcalcazel.h +++ b/kstars/kstars/tools/modcalcazel.h @@ -83,12 +83,12 @@ private: double getEpoch (TQString eName); /**Fill the Az and El dmsBoxes with values of the SkyPoint argument. - * @param sp SkypPoint object which contains the coordinates to + * @param sp SkypPoint object which tqcontains the coordinates to * be displayed */ void showHorCoords ( SkyPoint sp ); /**Fill the Az and El dmsBoxes with values of the SkyPoint argument. - * @param sp SkypPoint object which contains the coordinates to + * @param sp SkypPoint object which tqcontains the coordinates to * be displayed * @param jd Julian day for which the conversion has been performed * The epoch is constructed for that day diff --git a/kstars/kstars/tools/modcalcazeldlg.ui b/kstars/kstars/tools/modcalcazeldlg.ui index 0e1bb9fc..a7721f6f 100644 --- a/kstars/kstars/tools/modcalcazeldlg.ui +++ b/kstars/kstars/tools/modcalcazeldlg.ui @@ -7,7 +7,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -50,7 +50,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout20</cstring> + <cstring>tqlayout20</cstring> </property> <grid> <property name="name"> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -114,7 +114,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <grid> <property name="name"> @@ -132,7 +132,7 @@ <property name="name"> <cstring>longBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -154,7 +154,7 @@ <property name="name"> <cstring>latBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -218,13 +218,13 @@ <property name="name"> <cstring>Compute</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>25</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>120</width> <height>32767</height> @@ -238,13 +238,13 @@ <property name="name"> <cstring>Clear</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>25</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>120</width> <height>32767</height> @@ -258,7 +258,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout21</cstring> + <cstring>tqlayout21</cstring> </property> <hbox> <property name="name"> @@ -290,7 +290,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -312,7 +312,7 @@ <property name="name"> <cstring>decBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -334,7 +334,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -361,7 +361,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -383,7 +383,7 @@ <property name="name"> <cstring>azBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -413,7 +413,7 @@ <property name="name"> <cstring>elBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -437,7 +437,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>77</height> @@ -557,7 +557,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -574,7 +574,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -615,7 +615,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -632,7 +632,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -649,7 +649,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -677,7 +677,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -713,7 +713,7 @@ <property name="name"> <cstring>dateBoxBatch</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -801,7 +801,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> @@ -817,7 +817,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>151</width> <height>21</height> @@ -850,7 +850,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>131</width> <height>21</height> @@ -869,7 +869,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -1058,7 +1058,7 @@ <slot>slotElChecked()</slot> <slot>newSlot()</slot> </slots> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcdaylength.cpp b/kstars/kstars/tools/modcalcdaylength.cpp index dcfba7bd..4f2579c8 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::currentDateTime() ); + KStarsDateTime dt( KStarsDateTime::tqcurrentDateTime() ); datBox->setDate( dt.date() ); } @@ -71,7 +71,7 @@ void modCalcDayLength::slotClearCoords(){ elTransitBox->clearFields(); // reset to current date - datBox->setDate(ExtDate::currentDate()); + datBox->setDate(ExtDate::tqcurrentDate()); // reset times to 00:00:00 setTimeBox->clearFields(); diff --git a/kstars/kstars/tools/modcalcdaylengthdlg.ui b/kstars/kstars/tools/modcalcdaylengthdlg.ui index d5d5c1f8..027155ab 100644 --- a/kstars/kstars/tools/modcalcdaylengthdlg.ui +++ b/kstars/kstars/tools/modcalcdaylengthdlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcDayLengthDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -38,7 +38,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout37</cstring> + <cstring>tqlayout37</cstring> </property> <grid> <property name="name"> @@ -56,7 +56,7 @@ <property name="name"> <cstring>latBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>16</height> @@ -78,7 +78,7 @@ <property name="name"> <cstring>longBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>16</height> @@ -100,7 +100,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>60</width> <height>20</height> @@ -127,7 +127,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>120</width> <height>0</height> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -158,7 +158,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -174,7 +174,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>71</width> <height>21</height> @@ -199,7 +199,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> @@ -224,7 +224,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>81</width> <height>20</height> @@ -246,7 +246,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <grid> <property name="name"> @@ -264,7 +264,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>90</width> <height>20</height> @@ -294,7 +294,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>90</width> <height>20</height> @@ -332,7 +332,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>90</width> <height>20</height> @@ -354,7 +354,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>90</width> <height>20</height> @@ -384,7 +384,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -393,7 +393,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout20</cstring> + <cstring>tqlayout20</cstring> </property> <grid> <property name="name"> @@ -427,7 +427,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -457,7 +457,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -479,7 +479,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -499,7 +499,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -518,7 +518,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -537,7 +537,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>110</height> @@ -639,7 +639,7 @@ <slot>slotComputePosTime()</slot> <slot>slotClearCoords()</slot> </slots> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui index 1a164a9b..178408cc 100644 --- a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui +++ b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcEclCoordsDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -58,7 +58,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>97</width> <height>21</height> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>96</width> <height>21</height> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>97</width> <height>21</height> @@ -125,7 +125,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>21</height> @@ -166,7 +166,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>21</height> @@ -191,7 +191,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>71</width> <height>21</height> @@ -202,7 +202,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> @@ -231,7 +231,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -261,7 +261,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -318,7 +318,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -338,7 +338,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> @@ -372,7 +372,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -394,7 +394,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -416,7 +416,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>230</width> <height>20</height> @@ -437,7 +437,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>110</height> @@ -486,7 +486,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -503,7 +503,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -548,7 +548,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -565,7 +565,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -726,7 +726,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout22_3</cstring> + <cstring>tqlayout22_3</cstring> </property> <hbox> <property name="name"> @@ -742,7 +742,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>151</width> <height>21</height> @@ -775,7 +775,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>131</width> <height>21</height> @@ -794,7 +794,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>16</height> @@ -903,7 +903,7 @@ <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> </slots> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcequinox.cpp b/kstars/kstars/tools/modcalcequinox.cpp index ba749698..119c3fea 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::currentDateTime() ); + KStarsDateTime dt( KStarsDateTime::tqcurrentDateTime() ); yearEdit->setText( TQString( "%1").arg( dt.date().year() ) ); } diff --git a/kstars/kstars/tools/modcalcequinoxdlg.ui b/kstars/kstars/tools/modcalcequinoxdlg.ui index 025802ba..2b8660fe 100644 --- a/kstars/kstars/tools/modcalcequinoxdlg.ui +++ b/kstars/kstars/tools/modcalcequinoxdlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcEquinoxDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>70</width> <height>21</height> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -133,7 +133,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>31</height> @@ -144,7 +144,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -160,7 +160,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>81</width> <height>20</height> @@ -185,7 +185,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> @@ -210,7 +210,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>91</width> <height>21</height> @@ -271,7 +271,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>237</height> @@ -334,7 +334,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>111</width> <height>21</height> @@ -430,7 +430,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout22</cstring> + <cstring>tqlayout22</cstring> </property> <hbox> <property name="name"> @@ -446,7 +446,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>151</width> <height>21</height> @@ -479,7 +479,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>131</width> <height>21</height> @@ -498,7 +498,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>71</height> @@ -565,7 +565,7 @@ <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> </slots> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/modcalcgalcoorddlg.ui b/kstars/kstars/tools/modcalcgalcoorddlg.ui index dfb59183..ca231504 100644 --- a/kstars/kstars/tools/modcalcgalcoorddlg.ui +++ b/kstars/kstars/tools/modcalcgalcoorddlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcGalCoordDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -58,7 +58,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>97</width> <height>21</height> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>96</width> <height>21</height> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>97</width> <height>21</height> @@ -125,7 +125,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>21</height> @@ -166,7 +166,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>21</height> @@ -191,7 +191,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>71</width> <height>21</height> @@ -202,7 +202,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout22</cstring> + <cstring>tqlayout22</cstring> </property> <hbox> <property name="name"> @@ -231,7 +231,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -261,7 +261,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -318,7 +318,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>15</width> <height>20</height> @@ -338,7 +338,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> @@ -372,7 +372,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -394,7 +394,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -420,7 +420,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>160</height> @@ -469,7 +469,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -486,7 +486,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -601,7 +601,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -618,7 +618,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -709,7 +709,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout22_3</cstring> + <cstring>tqlayout22_3</cstring> </property> <hbox> <property name="name"> @@ -725,7 +725,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>151</width> <height>21</height> @@ -758,7 +758,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>131</width> <height>21</height> @@ -777,7 +777,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>71</height> @@ -914,7 +914,7 @@ <slot>slotGalLongCheckedBatch()</slot> <slot>slotRunBatch()</slot> </slots> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcgeoddlg.ui b/kstars/kstars/tools/modcalcgeoddlg.ui index 890eb4c0..ba00e3bc 100644 --- a/kstars/kstars/tools/modcalcgeoddlg.ui +++ b/kstars/kstars/tools/modcalcgeoddlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcGeodCoordDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -39,7 +39,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout31</cstring> + <cstring>tqlayout31</cstring> </property> <hbox> <property name="name"> @@ -58,7 +58,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -112,7 +112,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>81</width> <height>20</height> @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> @@ -178,7 +178,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>91</width> <height>21</height> @@ -189,7 +189,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout32</cstring> + <cstring>tqlayout32</cstring> </property> <hbox> <property name="name"> @@ -262,7 +262,7 @@ <property name="name"> <cstring>lonGeoBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>70</width> <height>0</height> @@ -276,7 +276,7 @@ <property name="name"> <cstring>latGeoBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>70</width> <height>0</height> @@ -332,7 +332,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>120</height> @@ -584,7 +584,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout22</cstring> + <cstring>tqlayout22</cstring> </property> <hbox> <property name="name"> @@ -600,7 +600,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>151</width> <height>21</height> @@ -633,7 +633,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>131</width> <height>21</height> @@ -652,7 +652,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>41</height> @@ -800,7 +800,7 @@ <slot>slotYCheckedBatch()</slot> <slot>slotZCheckedBatch()</slot> </slots> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/modcalcjd.cpp b/kstars/kstars/tools/modcalcjd.cpp index 99271d34..068014f1 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::currentDate() ); + datBox->setDate( ExtDate::tqcurrentDate() ); 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::currentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); datBox->setDate( dt.date() ); timBox->setTime( dt.time() ); computeFromCalendar(); diff --git a/kstars/kstars/tools/modcalcjddlg.ui b/kstars/kstars/tools/modcalcjddlg.ui index 6550c546..062b61f0 100644 --- a/kstars/kstars/tools/modcalcjddlg.ui +++ b/kstars/kstars/tools/modcalcjddlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcJdDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -40,7 +40,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> @@ -100,7 +100,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout37</cstring> + <cstring>tqlayout37</cstring> </property> <hbox> <property name="name"> @@ -129,7 +129,7 @@ <property name="name"> <cstring>JdName</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>130</width> <height>0</height> @@ -161,7 +161,7 @@ <property name="name"> <cstring>MjdName</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>130</width> <height>0</height> @@ -193,7 +193,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -212,7 +212,7 @@ <property name="name"> <cstring>timBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -229,7 +229,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -256,7 +256,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>110</width> <height>0</height> @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -284,7 +284,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> @@ -300,7 +300,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>23</width> <height>20</height> @@ -333,7 +333,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>39</width> <height>21</height> @@ -352,13 +352,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>25</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>30</height> @@ -378,7 +378,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>37</width> <height>20</height> @@ -397,13 +397,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>25</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>30</height> @@ -423,7 +423,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>38</width> <height>20</height> @@ -442,7 +442,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -499,7 +499,7 @@ <slot>slotComputeTime()</slot> <slot>showCurrentTime()</slot> </slots> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/modcalcplanets.cpp b/kstars/kstars/tools/modcalcplanets.cpp index e9053bd5..ae53f8e8 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(); // QSplitter->AstroCalc->KStars - KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); dateBox->setDate( dt.date() ); timeBox->setTime( dt.time() ); @@ -441,7 +441,7 @@ void modCalcPlanets::processLines( TQTextStream &istream ) { if(utCheckBatch->isChecked() ) { utB = TQTime::fromString( fields[i] ); if ( !utB.isValid() ) { - kdWarning() << i18n( "Line %1 contains an invalid time" ).arg(nline) << endl; + kdWarning() << i18n( "Line %1 tqcontains an invalid time" ).arg(nline) << endl; lineIsValid=false; nline++; continue; @@ -461,7 +461,7 @@ void modCalcPlanets::processLines( TQTextStream &istream ) { if(dateCheckBatch->isChecked() ) { dtB = ExtDate::fromString( fields[i], Qt::ISODate ); if ( !dtB.isValid() ) { - kdWarning() << i18n( "Line %1 contains an invalid date: " ).arg(nline) << + kdWarning() << i18n( "Line %1 tqcontains an invalid date: " ).arg(nline) << fields[i] << endl ; lineIsValid=false; nline++; diff --git a/kstars/kstars/tools/modcalcplanetsdlg.ui b/kstars/kstars/tools/modcalcplanetsdlg.ui index 3788816f..86179428 100644 --- a/kstars/kstars/tools/modcalcplanetsdlg.ui +++ b/kstars/kstars/tools/modcalcplanetsdlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcPlanetsDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -47,7 +47,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>101</width> <height>21</height> @@ -148,7 +148,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>151</width> <height>21</height> @@ -159,7 +159,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> @@ -167,7 +167,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout20</cstring> + <cstring>tqlayout20</cstring> </property> <grid> <property name="name"> @@ -177,7 +177,7 @@ <property name="name"> <cstring>dateBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>120</width> <height>0</height> @@ -199,7 +199,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -234,7 +234,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>20</height> @@ -243,7 +243,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <grid> <property name="name"> @@ -261,7 +261,7 @@ <property name="name"> <cstring>longBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -283,7 +283,7 @@ <property name="name"> <cstring>latBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -305,7 +305,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -318,7 +318,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> @@ -337,7 +337,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <grid> <property name="name"> @@ -347,7 +347,7 @@ <property name="name"> <cstring>raBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -374,7 +374,7 @@ <property name="name"> <cstring>decBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -393,7 +393,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -415,7 +415,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <grid> <property name="name"> @@ -433,7 +433,7 @@ <property name="name"> <cstring>altBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -452,7 +452,7 @@ <property name="name"> <cstring>azBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -471,7 +471,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -495,7 +495,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <grid> <property name="name"> @@ -513,7 +513,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -535,7 +535,7 @@ <property name="name"> <cstring>helLongBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -554,7 +554,7 @@ <property name="name"> <cstring>helLatBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -581,7 +581,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -590,7 +590,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> @@ -616,7 +616,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -638,7 +638,7 @@ <property name="name"> <cstring>geoLongBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -649,7 +649,7 @@ <property name="name"> <cstring>geoLatBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -676,7 +676,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -687,7 +687,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -703,7 +703,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>111</width> <height>20</height> @@ -728,7 +728,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>21</height> @@ -753,7 +753,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>91</width> <height>20</height> @@ -772,7 +772,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>60</height> @@ -829,7 +829,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -857,7 +857,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -882,7 +882,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -1143,7 +1143,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout14_2</cstring> + <cstring>tqlayout14_2</cstring> </property> <hbox> <property name="name"> @@ -1159,7 +1159,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>151</width> <height>21</height> @@ -1192,7 +1192,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>131</width> <height>21</height> @@ -1211,7 +1211,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -1370,7 +1370,7 @@ <slot>slotRunBatch()</slot> <slot>slotPlanetsCheckedBatch()</slot> </slots> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcprec.cpp b/kstars/kstars/tools/modcalcprec.cpp index ddf71e2e..bd489597 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::currentDateTime().epoch(); + return KStarsDateTime::tqcurrentDateTime().epoch(); } double modCalcPrec::getEpoch (TQString eName) { diff --git a/kstars/kstars/tools/modcalcprecdlg.ui b/kstars/kstars/tools/modcalcprecdlg.ui index ae895f9d..16619481 100644 --- a/kstars/kstars/tools/modcalcprecdlg.ui +++ b/kstars/kstars/tools/modcalcprecdlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcPrecDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -55,7 +55,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>98</width> <height>20</height> @@ -64,7 +64,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout25</cstring> + <cstring>tqlayout25</cstring> </property> <grid> <property name="name"> @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>98</width> <height>20</height> @@ -151,7 +151,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -167,7 +167,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>91</width> <height>20</height> @@ -192,7 +192,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> @@ -217,7 +217,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>91</width> <height>21</height> @@ -236,7 +236,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -264,7 +264,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>90</width> <height>20</height> @@ -273,7 +273,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout26</cstring> + <cstring>tqlayout26</cstring> </property> <grid> <property name="name"> @@ -323,7 +323,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>90</width> <height>20</height> @@ -342,7 +342,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>70</height> @@ -551,7 +551,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout14_2</cstring> + <cstring>tqlayout14_2</cstring> </property> <hbox> <property name="name"> @@ -567,7 +567,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>151</width> <height>21</height> @@ -600,7 +600,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>131</width> <height>21</height> @@ -619,7 +619,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>30</height> @@ -742,7 +742,7 @@ <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> </slots> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcsidtime.cpp b/kstars/kstars/tools/modcalcsidtime.cpp index 33cc03c9..cc7d1692 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::currentDate()); + datBox->setDate(ExtDate::tqcurrentDate()); 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 eea8681c..98751c7f 100644 --- a/kstars/kstars/tools/modcalcsidtimedlg.ui +++ b/kstars/kstars/tools/modcalcsidtimedlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcSidTimeDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -39,7 +39,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout47</cstring> + <cstring>tqlayout47</cstring> </property> <hbox> <property name="name"> @@ -111,7 +111,7 @@ <property name="name"> <cstring>longBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -125,7 +125,7 @@ <property name="name"> <cstring>datBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -141,7 +141,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>21</height> @@ -182,7 +182,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>101</width> <height>21</height> @@ -207,7 +207,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> @@ -218,7 +218,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout47</cstring> + <cstring>tqlayout47</cstring> </property> <hbox> <property name="name"> @@ -245,7 +245,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -275,7 +275,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -305,7 +305,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -335,7 +335,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -356,7 +356,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>204</height> @@ -391,7 +391,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>90</width> <height>0</height> @@ -406,7 +406,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout30</cstring> + <cstring>tqlayout30</cstring> </property> <grid> <property name="name"> @@ -452,7 +452,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -474,7 +474,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -483,7 +483,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout32</cstring> + <cstring>tqlayout32</cstring> </property> <grid> <property name="name"> @@ -501,7 +501,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -559,7 +559,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -647,7 +647,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout22_3</cstring> + <cstring>tqlayout22_3</cstring> </property> <hbox> <property name="name"> @@ -663,7 +663,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>151</width> <height>21</height> @@ -696,7 +696,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>131</width> <height>21</height> @@ -715,7 +715,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>16</height> @@ -860,7 +860,7 @@ <slot>slotInputFile()</slot> <slot>slotOutputFile()</slot> </slots> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcvlsr.cpp b/kstars/kstars/tools/modcalcvlsr.cpp index 412e1d72..f015d405 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::currentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); datBox->setDate( dt.date() ); timBox->setTime( dt.time() ); @@ -212,7 +212,7 @@ void modCalcVlsr::slotClearCoords() vGeoBox->setText(""); vTopoBox->setText(""); - datBox->setDate(ExtDate::currentDate()); + datBox->setDate(ExtDate::tqcurrentDate()); timBox->setTime(TQTime(0,0,0)); } diff --git a/kstars/kstars/tools/modcalcvlsrdlg.ui b/kstars/kstars/tools/modcalcvlsrdlg.ui index 80311fb8..611b4d9a 100644 --- a/kstars/kstars/tools/modcalcvlsrdlg.ui +++ b/kstars/kstars/tools/modcalcvlsrdlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcVlsrDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -47,7 +47,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <grid> <property name="name"> @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -93,7 +93,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -145,7 +145,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <grid> <property name="name"> @@ -155,7 +155,7 @@ <property name="name"> <cstring>heightBox</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>1000</width> <height>32767</height> @@ -169,7 +169,7 @@ <property name="name"> <cstring>longBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -207,7 +207,7 @@ <property name="name"> <cstring>latBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -223,7 +223,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> @@ -239,7 +239,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>120</width> <height>31</height> @@ -272,7 +272,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -294,7 +294,7 @@ <property name="name"> <cstring>decBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -316,7 +316,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -343,7 +343,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>100</width> <height>20</height> @@ -354,7 +354,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <hbox> <property name="name"> @@ -435,7 +435,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>21</height> @@ -510,13 +510,13 @@ <property name="name"> <cstring>Compute</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>25</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>120</width> <height>32767</height> @@ -530,13 +530,13 @@ <property name="name"> <cstring>Clear</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>25</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>120</width> <height>32767</height> @@ -558,7 +558,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -675,7 +675,7 @@ <property name="name"> <cstring>dateBoxBatch</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -689,7 +689,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -706,7 +706,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -736,7 +736,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -764,7 +764,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -937,7 +937,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> @@ -953,7 +953,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>151</width> <height>21</height> @@ -986,7 +986,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>131</width> <height>21</height> @@ -1005,7 +1005,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> @@ -1187,7 +1187,7 @@ <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> </slots> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp index fbd1702c..7a521bb9 100644 --- a/kstars/kstars/tools/observinglist.cpp +++ b/kstars/kstars/tools/observinglist.cpp @@ -121,7 +121,7 @@ ObservingList::ObservingList( KStars *_ks, TQWidget* parent ) ui->NotesEdit->setEnabled( false ); } -bool ObservingList::contains( const SkyObject *q ) { +bool ObservingList::tqcontains( const SkyObject *q ) { for ( SkyObject* o = obsList.first(); o; o = obsList.next() ) { if ( o == q ) return true; } diff --git a/kstars/kstars/tools/observinglist.h b/kstars/kstars/tools/observinglist.h index e2beaba6..528708fa 100644 --- a/kstars/kstars/tools/observinglist.h +++ b/kstars/kstars/tools/observinglist.h @@ -70,7 +70,7 @@ public: /**@return true if the object is in the observing list *@p o pointer to the object to test. */ - bool contains( const SkyObject *o ); + bool tqcontains( const SkyObject *o ); SkyObject* first() { return obsList.first(); } SkyObject* next() { return obsList.next(); } diff --git a/kstars/kstars/tools/observinglistui.ui b/kstars/kstars/tools/observinglistui.ui index 040f6970..48cda78b 100644 --- a/kstars/kstars/tools/observinglistui.ui +++ b/kstars/kstars/tools/observinglistui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ObservingListUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout68</cstring> + <cstring>tqlayout68</cstring> </property> <hbox> <property name="name"> @@ -39,13 +39,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -73,13 +73,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -107,13 +107,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -141,13 +141,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -173,7 +173,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>350</width> <height>20</height> @@ -192,13 +192,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -218,7 +218,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -350,7 +350,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -488,7 +488,7 @@ <verstretch>4</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>100</height> @@ -518,7 +518,7 @@ <property name="text"> <string>observing notes for object:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> @@ -534,13 +534,13 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>100</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>160</height> @@ -554,7 +554,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/tools/obslistwizard.cpp b/kstars/kstars/tools/obslistwizard.cpp index 7dbbbc3d..50e5b200 100644 --- a/kstars/kstars/tools/obslistwizard.cpp +++ b/kstars/kstars/tools/obslistwizard.cpp @@ -195,13 +195,13 @@ void ObsListWizard::slotShowStackWidget( TQListViewItem *i ) if ( i ) { TQString t = i->text(0); - if ( t.contains( i18n( "Object type(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ObjTypePage ); - if ( t.contains( i18n( "Region" ) ) ) olw->FilterStack->raiseWidget( olw->RegionPage ); - if ( t.contains( i18n( "In constellation(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ConstellationPage ); - if ( t.contains( i18n( "Circular" ) ) ) olw->FilterStack->raiseWidget( olw->CircRegionPage ); - if ( t.contains( i18n( "Rectangular" ) ) ) olw->FilterStack->raiseWidget( olw->RectRegionPage ); -// if ( t.contains( i18n( "Observable on date" ) ) ) olw->FilterStack->raiseWidget( olw->ObsDatePage ); - if ( t.contains( i18n( "Magnitude limit" ) ) ) olw->FilterStack->raiseWidget( olw->MagLimitPage ); + if ( t.tqcontains( i18n( "Object type(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ObjTypePage ); + if ( t.tqcontains( i18n( "Region" ) ) ) olw->FilterStack->raiseWidget( olw->RegionPage ); + if ( t.tqcontains( i18n( "In constellation(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ConstellationPage ); + if ( t.tqcontains( i18n( "Circular" ) ) ) olw->FilterStack->raiseWidget( olw->CircRegionPage ); + if ( t.tqcontains( i18n( "Rectangular" ) ) ) olw->FilterStack->raiseWidget( olw->RectRegionPage ); +// if ( t.tqcontains( i18n( "Observable on date" ) ) ) olw->FilterStack->raiseWidget( olw->ObsDatePage ); + if ( t.tqcontains( i18n( "Magnitude limit" ) ) ) olw->FilterStack->raiseWidget( olw->MagLimitPage ); } } diff --git a/kstars/kstars/tools/obslistwizardui.ui b/kstars/kstars/tools/obslistwizardui.ui index a501e152..7ea62d44 100644 --- a/kstars/kstars/tools/obslistwizardui.ui +++ b/kstars/kstars/tools/obslistwizardui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ObsListWizardUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout79</cstring> + <cstring>tqlayout79</cstring> </property> <hbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout55</cstring> + <cstring>tqlayout55</cstring> </property> <vbox> <property name="name"> @@ -117,7 +117,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <vbox> <property name="name"> @@ -164,7 +164,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> @@ -225,7 +225,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <vbox> <property name="name"> @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>90</height> @@ -342,7 +342,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout48</cstring> + <cstring>tqlayout48</cstring> </property> <grid> <property name="name"> @@ -371,7 +371,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -393,7 +393,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -455,7 +455,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -477,7 +477,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -496,7 +496,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>215</height> @@ -529,7 +529,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> @@ -574,7 +574,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -596,7 +596,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -629,7 +629,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>170</height> @@ -659,7 +659,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -669,7 +669,7 @@ <property name="name"> <cstring>Date</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>160</width> <height>0</height> @@ -686,7 +686,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -697,7 +697,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -736,7 +736,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout5_2</cstring> + <cstring>tqlayout5_2</cstring> </property> <hbox> <property name="name"> @@ -752,7 +752,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -780,7 +780,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -799,7 +799,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>176</height> @@ -829,7 +829,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout36</cstring> + <cstring>tqlayout36</cstring> </property> <hbox> <property name="name"> @@ -861,7 +861,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>295</width> <height>20</height> @@ -895,7 +895,7 @@ have &no magnitude</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>179</height> @@ -930,7 +930,7 @@ c. select objects in a circular region Choose one of these sub-items to select from a region on the sky.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -1012,7 +1012,7 @@ select from a region on the sky.</string> <data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>klistbox.h</includehint> diff --git a/kstars/kstars/tools/optionstreeview.ui b/kstars/kstars/tools/optionstreeview.ui index acae2c0d..5322c368 100644 --- a/kstars/kstars/tools/optionstreeview.ui +++ b/kstars/kstars/tools/optionstreeview.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>OptionsTreeView</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -62,7 +62,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>80</width> <height>20</height> @@ -130,7 +130,7 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kstars/kstars/tools/planetviewer.cpp b/kstars/kstars/tools/planetviewer.cpp index cd0aba3d..eb149b6e 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( TQWidget::StrongFocus ); setMouseTracking (true); - pv = (PlanetViewer*)topLevelWidget(); + pv = (PlanetViewer*)tqtopLevelWidget(); } 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( TQWidget::StrongFocus ); setMouseTracking (true); - pv = (PlanetViewer*)topLevelWidget(); + pv = (PlanetViewer*)tqtopLevelWidget(); } PVPlotWidget::~ PVPlotWidget() {} diff --git a/kstars/kstars/tools/planetviewerui.ui b/kstars/kstars/tools/planetviewerui.ui index 77f3e085..735f4e19 100644 --- a/kstars/kstars/tools/planetviewerui.ui +++ b/kstars/kstars/tools/planetviewerui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>PlanetViewerUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -26,7 +26,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -44,7 +44,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>34</width> <height>34</height> @@ -69,7 +69,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>120</width> <height>20</height> @@ -151,7 +151,7 @@ <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>timestepbox.h</includehint> diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp index b7538432..96ef19d0 100644 --- a/kstars/kstars/tools/scriptbuilder.cpp +++ b/kstars/kstars/tools/scriptbuilder.cpp @@ -649,7 +649,7 @@ void ScriptBuilder::initViewOptions() { new TQListViewItem( opsSkymap, "UseAltAz", i18n( "Use Horizontal coordinates? (otherwise, use Equatorial)" ), i18n( "bool" ) ); new TQListViewItem( opsSkymap, "ZoomFactor", i18n( "Set the Zoom Factor" ), i18n( "double" ) ); new TQListViewItem( opsSkymap, "FOV Size", i18n( "Select angular size for the FOV symbol (in arcmin)" ), i18n( "double" ) ); - new TQListViewItem( opsSkymap, "FOV Shape", i18n( "Select shape for the FOV symbol (0=Square, 1=Circle, 2=Crosshairs, 4=Bullseye)" ), i18n( "int" ) ); + new TQListViewItem( opsSkymap, "FOV Shape", i18n( "Select tqshape for the FOV symbol (0=Square, 1=Circle, 2=Crosshairs, 4=Bullseye)" ), i18n( "int" ) ); new TQListViewItem( opsSkymap, "FOV Color", i18n( "Select color for the FOV symbol" ), i18n( "string" ) ); new TQListViewItem( opsSkymap, "AnimateSlewing", i18n( "Use animated slewing? (otherwise, \"snap\" to new focus)" ), i18n( "bool" ) ); new TQListViewItem( opsSkymap, "UseRefraction", i18n( "Correct for atmospheric refraction?" ), i18n( "bool" ) ); @@ -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::currentDateTime().toString() << endl; + ostream << "#last modified: " << KStarsDateTime::tqcurrentDateTime().toString() << endl; ostream << "#" << endl; ostream << "KSTARS=`dcopfind -a 'kstars*'`" << endl; ostream << "MAIN=KStarsInterface" << endl; @@ -946,7 +946,7 @@ void ScriptBuilder::writeScript( TQTextStream &ostream ) { sf->setINDIProperty("PARK"); } - if ( sf->argVal(0).contains(" ")) + if ( sf->argVal(0).tqcontains(" ")) ostream << mainpre << "waitForINDIAction " << "\"" << sf->argVal(0) << "\" " << sf->INDIProperty() << endl; else ostream << mainpre << "waitForINDIAction " << sf->argVal(0) << " " << sf->INDIProperty() << endl; @@ -965,11 +965,11 @@ void ScriptBuilder::readScript( TQTextStream &istream ) { line = istream.readLine(); //look for name of script - if ( line.contains( "#KStars DCOP script: " ) ) + if ( line.tqcontains( "#KStars DCOP script: " ) ) currentScriptName = line.mid( 21 ).stripWhiteSpace(); //look for author of scriptbuilder - if ( line.contains( "#by " ) ) + if ( line.tqcontains( "#by " ) ) currentAuthor = line.mid( 4 ).stripWhiteSpace(); //Actual script functions @@ -977,7 +977,7 @@ void ScriptBuilder::readScript( TQTextStream &istream ) { //is ClockFunction? bool clockfcn( false ); - if ( line.contains( "$CLOCK" ) ) clockfcn = true; + if ( line.tqcontains( "$CLOCK" ) ) clockfcn = true; //remove leading dcop prefix line = line.mid( 20 ); @@ -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::currentDate() ); + else argSetLocalTime->DateBox->setDate( ExtDate::tqcurrentDate() ); 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 9de4797f..2ba46eff 100644 --- a/kstars/kstars/tools/scriptbuilderui.ui +++ b/kstars/kstars/tools/scriptbuilderui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ScriptBuilderUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -39,13 +39,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -73,13 +73,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -107,13 +107,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -141,13 +141,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -167,13 +167,13 @@ <property name="name"> <cstring>RunButton</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -199,7 +199,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>490</width> <height>20</height> @@ -240,7 +240,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -267,7 +267,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> @@ -277,13 +277,13 @@ <property name="name"> <cstring>AddButton</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -304,13 +304,13 @@ <property name="name"> <cstring>RemoveButton</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -330,13 +330,13 @@ <property name="name"> <cstring>CopyButton</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -356,13 +356,13 @@ <property name="name"> <cstring>UpButton</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -382,13 +382,13 @@ <property name="name"> <cstring>DownButton</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -414,7 +414,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>118</height> @@ -437,7 +437,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>140</height> @@ -554,7 +554,7 @@ </widget> <widget class="QLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> @@ -562,7 +562,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <vbox> <property name="name"> @@ -602,7 +602,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>91</width> <height>20</height> @@ -627,7 +627,7 @@ <slot>slotRemoveFunction()</slot> <slot>slotRunScript()</slot> </slots> -<layoutdefaults spacing="6" margin="4"/> +<tqlayoutdefaults spacing="6" margin="4"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/tools/scriptfunction.cpp b/kstars/kstars/tools/scriptfunction.cpp index c95594f5..1f99af3b 100644 --- a/kstars/kstars/tools/scriptfunction.cpp +++ b/kstars/kstars/tools/scriptfunction.cpp @@ -87,10 +87,10 @@ ScriptFunction::ScriptFunction( TQString name, TQString desc, bool clockfcn, if ( NumArgs ) Description += " "; Description += nameStyle.arg( ")" ) + "</p><p>"; - //before adding description, replace any '%n' instances with the corresponding + //before adding description, tqreplace any '%n' instances with the corresponding //argument name in color. For now, assume that the %n's occur in order, with no skips. //Also assume that '%' is *only* used to indicate argument instances - int narg = desc.contains( '%' ); + int narg = desc.tqcontains( '%' ); switch (narg ) { case 1: Description += desc.arg( paramStyle.arg( an1 ) ); @@ -205,8 +205,8 @@ TQString ScriptFunction::scriptLine() const { TQString out( Name ); unsigned int i=0; while ( ! ArgName[i].isEmpty() && i < 6 ) { - // Wrap arg in quotes if it contains a space - if ( ArgVal[i].contains(" ") ) { + // Wrap arg in quotes if it tqcontains a space + if ( ArgVal[i].tqcontains(" ") ) { out += " \"" + ArgVal[i] + "\""; } else { out += " " + ArgVal[i]; diff --git a/kstars/kstars/tools/scriptnamedialog.ui b/kstars/kstars/tools/scriptnamedialog.ui index bc493ad3..0e95605c 100644 --- a/kstars/kstars/tools/scriptnamedialog.ui +++ b/kstars/kstars/tools/scriptnamedialog.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ScriptNameDialog</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -24,7 +24,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> @@ -75,7 +75,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -91,7 +91,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>330</width> <height>20</height> @@ -149,7 +149,7 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/wutdialogui.ui b/kstars/kstars/tools/wutdialogui.ui index 824ffe20..8bc01480 100644 --- a/kstars/kstars/tools/wutdialogui.ui +++ b/kstars/kstars/tools/wutdialogui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>WUTDialogUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout25</cstring> + <cstring>tqlayout25</cstring> </property> <hbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <vbox> <property name="name"> @@ -37,7 +37,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout23</cstring> + <cstring>tqlayout23</cstring> </property> <grid> <property name="name"> @@ -47,7 +47,7 @@ <property name="name"> <cstring>LocationLabel</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>0</height> @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -106,7 +106,7 @@ <property name="name"> <cstring>DateLabel</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>0</height> @@ -125,7 +125,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>108</width> <height>20</height> @@ -162,7 +162,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> @@ -241,7 +241,7 @@ <property name="name"> <cstring>SunRiseLabel</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -261,7 +261,7 @@ <property name="name"> <cstring>MoonRiseLabel</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -281,7 +281,7 @@ <property name="name"> <cstring>MoonSetLabel</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -301,7 +301,7 @@ <property name="name"> <cstring>SunSetLabel</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -321,7 +321,7 @@ <property name="name"> <cstring>NightDurationLabel</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -341,7 +341,7 @@ <property name="name"> <cstring>MoonIllumLabel</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -361,7 +361,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <grid> <property name="name"> @@ -377,7 +377,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>164</width> <height>12</height> @@ -402,7 +402,7 @@ <property name="name"> <cstring>ObjectListBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>0</height> @@ -433,7 +433,7 @@ <property name="text"> <string>Rises at: 22:12</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> <property name="whatsThis" stdset="0"> @@ -447,7 +447,7 @@ <property name="text"> <string>Transits at: 03:45</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> <property name="whatsThis" stdset="0"> @@ -461,7 +461,7 @@ <property name="text"> <string>Sets at: 08:22</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> <property name="whatsThis" stdset="0"> @@ -478,7 +478,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -519,7 +519,7 @@ <property name="name"> <cstring>CategoryListBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -552,7 +552,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> |