diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:31:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:31:39 -0600 |
| commit | 45f529de247fc4b3662f6b474abe03fe904306ec (patch) | |
| tree | d4b70147f7b0aeda4c1cb484553dc8ae048eb7ec | |
| parent | ec1fddcd0d6663ad273af85357f04abbc5689468 (diff) | |
| download | tdegraphics-45f529de247fc4b3662f6b474abe03fe904306ec.tar.gz tdegraphics-45f529de247fc4b3662f6b474abe03fe904306ec.zip | |
Rename old tq methods that no longer need a unique name
325 files changed, 1113 insertions, 1113 deletions
diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp index fe4739de..cb3200f4 100644 --- a/kamera/kcontrol/kamera.cpp +++ b/kamera/kcontrol/kamera.cpp @@ -113,7 +113,7 @@ void KKameraConfig::displayGPSuccessDialogue(void) connect(m_deviceSel, TQT_SIGNAL(selectionChanged(TQIconViewItem *)), TQT_SLOT(slot_deviceSelected(TQIconViewItem *))); - m_deviceSel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + m_deviceSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); // create actions KAction *act; diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp index 9ce6deae..60521d1e 100644 --- a/kamera/kcontrol/kameradevice.cpp +++ b/kamera/kcontrol/kameradevice.cpp @@ -293,7 +293,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de connect(m_modelSel, TQT_SIGNAL(selectionChanged(TQListViewItem *)), TQT_SLOT(slot_setModel(TQListViewItem *))); // make sure listview only as wide as it needs to be - m_modelSel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, + m_modelSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); TQVBoxLayout *rightLayout = new TQVBoxLayout(0L, 0, KDialog::spacingHint()); @@ -347,7 +347,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de for (int i = 0; i < gphoto_ports; i++) { if (gp_port_info_list_get_info(list, i, &info) >= 0) { if (strncmp(info.path, "serial:", 7) == 0) - m_serialPortCombo->insertItem(TQString::tqfromLatin1(info.path).mid(7)); + m_serialPortCombo->insertItem(TQString::fromLatin1(info.path).mid(7)); } } gp_port_info_list_free(list); diff --git a/kamera/kioslave/kamera.cpp b/kamera/kioslave/kamera.cpp index 7e8c9387..7234f039 100644 --- a/kamera/kioslave/kamera.cpp +++ b/kamera/kioslave/kamera.cpp @@ -55,7 +55,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); - static void frontendCameratqStatus(GPContext *context, const char *format, va_list args, void *data); + static void frontendCameraStatus(GPContext *context, const char *format, va_list args, void *data); static unsigned int frontendProgressStart( GPContext *context, float totalsize, const char *format, va_list args, void *data @@ -795,7 +795,7 @@ void KameraProtocol::setHost(const TQString& host, int port, const TQString& use } // register gphoto2 callback functions - gp_context_set_status_func(m_context, frontendCameratqStatus, this); + gp_context_set_status_func(m_context, frontendCameraStatus, this); gp_context_set_progress_funcs(m_context, frontendProgressStart, frontendProgressUpdate, NULL, this); // gp_camera_set_message_func(m_camera, ..., this) @@ -881,7 +881,7 @@ void KameraProtocol::translateFileToUDS(UDSEntry &udsEntry, const CameraFileInfo if (info.file.fields & GP_FILE_INFO_TYPE) { atom.m_uds = UDS_MIME_TYPE; - atom.m_str = TQString::tqfromLatin1(info.file.type); + atom.m_str = TQString::fromLatin1(info.file.type); udsEntry.append(atom); } @@ -1028,7 +1028,7 @@ unsigned int frontendProgressStart( } // this callback function is activated on every status message from gphoto2 -static void frontendCameratqStatus(GPContext * /*context*/, const char *format, va_list args, void *data) +static void frontendCameraStatus(GPContext * /*context*/, const char *format, va_list args, void *data) { KameraProtocol *object = (KameraProtocol*)data; char *status; diff --git a/kdvi/TeXFont_PFB.cpp b/kdvi/TeXFont_PFB.cpp index 45c76512..7db8e171 100644 --- a/kdvi/TeXFont_PFB.cpp +++ b/kdvi/TeXFont_PFB.cpp @@ -74,8 +74,8 @@ TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc, double sl // TeX is only able to address character codes 0-255 while // e.g. Type1 fonts may contain several thousands of characters) if (enc != 0) { - parent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "Encoding" )); - parent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "encoding" )); + parent->fullEncodingName = enc->encodingFullName.remove(TQString::fromLatin1( "Encoding" )); + parent->fullEncodingName = enc->encodingFullName.remove(TQString::fromLatin1( "encoding" )); // An encoding vector is given for this font, i.e. an array of // character names (such as: 'parenleft' or 'dotlessj'). We use diff --git a/kdvi/dviRenderer.cpp b/kdvi/dviRenderer.cpp index acb3dceb..8c39d974 100644 --- a/kdvi/dviRenderer.cpp +++ b/kdvi/dviRenderer.cpp @@ -277,7 +277,7 @@ void dviRenderer::showThatSourceInformationIsPresent() TQLabel *label2 = new TQLabel( i18n("<qt>This DVI file contains source file information. You may click into the text with the " "middle mouse button, and an editor will open the TeX-source file immediately.</qt>"), contents); - label2->setMinimumSize(label2->tqsizeHint()); + label2->setMinimumSize(label2->sizeHint()); lay->add( label2 ); lay->addStretch(1); TQSize extraSize = TQSize(50,30); diff --git a/kdvi/fontprogress.cpp b/kdvi/fontprogress.cpp index 24810714..07b61d91 100644 --- a/kdvi/fontprogress.cpp +++ b/kdvi/fontprogress.cpp @@ -42,7 +42,7 @@ fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString TQVBox *page = makeVBoxMainWidget(); TextLabel1 = new TQLabel( label, page, "TextLabel2" ); - TextLabel1->tqsetAlignment( int( TQLabel::AlignCenter ) ); + TextLabel1->setAlignment( int( TQLabel::AlignCenter ) ); TQWhatsThis::add( TextLabel1, whatsThis ); TQToolTip::add( TextLabel1, ttip ); @@ -55,7 +55,7 @@ fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString ProgressBar1 = NULL; TextLabel2 = new TQLabel( "", page, "TextLabel2" ); - TextLabel2->tqsetAlignment( int( TQLabel::AlignCenter ) ); + TextLabel2->setAlignment( int( TQLabel::AlignCenter ) ); TQWhatsThis::add( TextLabel2, whatsThis ); TQToolTip::add( TextLabel2, ttip ); diff --git a/kdvi/optionDialogFontsWidget_base.ui b/kdvi/optionDialogFontsWidget_base.ui index 766f6b98..bb7e18f4 100644 --- a/kdvi/optionDialogFontsWidget_base.ui +++ b/kdvi/optionDialogFontsWidget_base.ui @@ -44,7 +44,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>121</height> diff --git a/kdvi/optionDialogSpecialWidget_base.ui b/kdvi/optionDialogSpecialWidget_base.ui index e821d761..00688f6a 100644 --- a/kdvi/optionDialogSpecialWidget_base.ui +++ b/kdvi/optionDialogSpecialWidget_base.ui @@ -186,7 +186,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>390</width> <height>21</height> diff --git a/kdvi/special.cpp b/kdvi/special.cpp index 918b7352..11046ca3 100644 --- a/kdvi/special.cpp +++ b/kdvi/special.cpp @@ -453,7 +453,7 @@ void dviRenderer::TPIC_flushPath_special() TQPen pen(TQt::black, (int)(penWidth_in_mInch*resolutionInDPI/1000.0 + 0.5)); // Sets the pen size in milli-inches foreGroundPainter->setPen(pen); - foreGroundPainter->tqdrawPolyline(TPIC_path, 0, number_of_elements_in_path); + foreGroundPainter->drawPolyline(TPIC_path, 0, number_of_elements_in_path); number_of_elements_in_path = 0; } diff --git a/kfax/options.cpp b/kfax/options.cpp index 053bf162..91ba9287 100644 --- a/kfax/options.cpp +++ b/kfax/options.cpp @@ -67,21 +67,21 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name) vbl->addLayout( hbl1 ); displaylabel = new TQLabel(i18n("Display options:"), bg,"displaylabel"); - displaylabel->setFixedSize( displaylabel->tqsizeHint() ); + displaylabel->setFixedSize( displaylabel->sizeHint() ); hbl1->addWidget( displaylabel ); landscape = new TQCheckBox(i18n("Landscape"), bg,"Landscape"); - landscape->setFixedSize( landscape->tqsizeHint() ); + landscape->setFixedSize( landscape->sizeHint() ); hbl1->addSpacing( 10 ); hbl1->addWidget( landscape ); flip = new TQCheckBox(i18n("Upside down"), bg,"upsidedown"); - flip->setFixedSize( flip->tqsizeHint() ); + flip->setFixedSize( flip->sizeHint() ); hbl1->addSpacing( 10 ); hbl1->addWidget( flip ); invert = new TQCheckBox(i18n("Invert"), bg,"invert"); - invert->setFixedSize( invert->tqsizeHint() ); + invert->setFixedSize( invert->sizeHint() ); hbl1->addSpacing( 10 ); hbl1->addWidget( invert ); @@ -139,7 +139,7 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name) rawgroup->setFrameStyle(TQFrame::NoFrame); rawlabel = new TQLabel(i18n("Raw fax format:"),rawgroup,"rawlabel"); - rawlabel->setFixedSize( rawlabel->tqsizeHint() ); + rawlabel->setFixedSize( rawlabel->sizeHint() ); hbl4->addWidget( rawlabel ); g3 = new TQRadioButton("G3",rawgroup,"g3"); diff --git a/kfaxview/libkfaximage/kfaximage.cpp b/kfaxview/libkfaximage/kfaximage.cpp index 0d35f8d7..24d22f43 100644 --- a/kfaxview/libkfaximage/kfaximage.cpp +++ b/kfaxview/libkfaximage/kfaximage.cpp @@ -41,7 +41,7 @@ static const char bigTIFF[] = "\x4d\x4d\x00\x2a"; KFaxImage::KFaxImage( const TQString &filename, TQObject *parent, const char *name ) : TQObject(parent,name) { - KGlobal::locale()->insertCatalogue( TQString::tqfromLatin1("libkfaximage") ); + KGlobal::locale()->insertCatalogue( TQString::fromLatin1("libkfaximage") ); loadImage(filename); } diff --git a/kfile-plugins/jpeg/exif.cpp b/kfile-plugins/jpeg/exif.cpp index 6c621477..5a023dc4 100644 --- a/kfile-plugins/jpeg/exif.cpp +++ b/kfile-plugins/jpeg/exif.cpp @@ -525,11 +525,11 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa switch(Tag){ case TAG_MAKE: - ExifData::CameraMake = TQString::tqfromLatin1((const char*)ValuePtr, 31); + ExifData::CameraMake = TQString::fromLatin1((const char*)ValuePtr, 31); break; case TAG_MODEL: - ExifData::CameraModel = TQString::tqfromLatin1((const char*)ValuePtr, 39); + ExifData::CameraModel = TQString::fromLatin1((const char*)ValuePtr, 39); break; case TAG_ORIENTATION: @@ -537,7 +537,7 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa break; case TAG_DATETIME_ORIGINAL: - DateTime = TQString::tqfromLatin1((const char*)ValuePtr, 19); + DateTime = TQString::fromLatin1((const char*)ValuePtr, 19); break; case TAG_USERCOMMENT: @@ -558,12 +558,12 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa int c; c = (ValuePtr)[a]; if (c != '\0' && c != ' '){ - UserComment = TQString::tqfromLatin1((const char*)(a+ValuePtr), 199); + UserComment = TQString::fromLatin1((const char*)(a+ValuePtr), 199); break; } } }else{ - UserComment = TQString::tqfromLatin1((const char*)ValuePtr, 199); + UserComment = TQString::fromLatin1((const char*)ValuePtr, 199); } break; diff --git a/kfile-plugins/ps/gscreator.cpp b/kfile-plugins/ps/gscreator.cpp index cc4edcfc..c664947b 100644 --- a/kfile-plugins/ps/gscreator.cpp +++ b/kfile-plugins/ps/gscreator.cpp @@ -521,7 +521,7 @@ bool GSCreator::getEPSIPreview(const TQString &path, long start, long return false; } - TQString previewstr = TQString::tqfromLatin1(buf); + TQString previewstr = TQString::fromLatin1(buf); free(buf); int offset = 0; diff --git a/kgamma/kcmkgamma/displaynumber.cpp b/kgamma/kcmkgamma/displaynumber.cpp index 8ca9beed..dd678716 100644 --- a/kgamma/kcmkgamma/displaynumber.cpp +++ b/kgamma/kcmkgamma/displaynumber.cpp @@ -28,7 +28,7 @@ DisplayNumber::DisplayNumber(TQWidget *parent, int digits, \ setFrameStyle(TQFrame::Panel | TQFrame::Sunken); setBackgroundMode(TQt::PaletteBase); - tqsetAlignment(TQt::AlignCenter); + setAlignment(TQt::AlignCenter); setFocusPolicy(TQ_NoFocus); } diff --git a/kgamma/kcmkgamma/kgamma.cpp b/kgamma/kcmkgamma/kgamma.cpp index 7f28dc63..d09e142b 100644 --- a/kgamma/kcmkgamma/kgamma.cpp +++ b/kgamma/kcmkgamma/kgamma.cpp @@ -157,37 +157,37 @@ void KGamma::setupUI() { pic1->setMinimumSize(530, 171); pic1->setBackgroundPixmap(background); pic1->setPixmap(TQPixmap(locate("data", "kgamma/pics/greyscale.png"))); - pic1->tqsetAlignment(AlignCenter); + pic1->setAlignment(AlignCenter); stack->addWidget( pic1, 0 ); TQLabel *pic2 = new TQLabel(stack); pic2->setBackgroundPixmap(background); pic2->setPixmap(TQPixmap(locate("data", "kgamma/pics/rgbscale.png"))); - pic2->tqsetAlignment(AlignCenter); + pic2->setAlignment(AlignCenter); stack->addWidget( pic2, 1 ); TQLabel *pic3 = new TQLabel(stack); pic3->setBackgroundPixmap(background); pic3->setPixmap(TQPixmap(locate("data", "kgamma/pics/cmyscale.png"))); - pic3->tqsetAlignment(AlignCenter); + pic3->setAlignment(AlignCenter); stack->addWidget( pic3, 2 ); TQLabel *pic4 = new TQLabel(stack); pic4->setBackgroundPixmap(background); pic4->setPixmap(TQPixmap(locate("data", "kgamma/pics/darkgrey.png"))); - pic4->tqsetAlignment(AlignCenter); + pic4->setAlignment(AlignCenter); stack->addWidget( pic4, 3 ); TQLabel *pic5 = new TQLabel(stack); pic5->setBackgroundPixmap(background); pic5->setPixmap(TQPixmap(locate("data", "kgamma/pics/midgrey.png"))); - pic5->tqsetAlignment(AlignCenter); + pic5->setAlignment(AlignCenter); stack->addWidget( pic5, 4 ); TQLabel *pic6 = new TQLabel(stack); pic6->setBackgroundPixmap(background); pic6->setPixmap(TQPixmap(locate("data", "kgamma/pics/lightgrey.png"))); - pic6->tqsetAlignment(AlignCenter); + pic6->setAlignment(AlignCenter); stack->addWidget( pic6, 5 ); topLayout->addWidget(stack, 10); @@ -279,7 +279,7 @@ void KGamma::setupUI() { TQLabel *error = new TQLabel(this); error->setText(i18n("Gamma correction is not supported by your" " graphics hardware or driver.")); - error->tqsetAlignment(AlignCenter); + error->setAlignment(AlignCenter); topLayout->addWidget(error); } } diff --git a/kghostview/displayoptions.cpp b/kghostview/displayoptions.cpp index 82ef1f3a..84cae19a 100644 --- a/kghostview/displayoptions.cpp +++ b/kghostview/displayoptions.cpp @@ -76,7 +76,7 @@ TQString DisplayOptions::toString( const DisplayOptions& options ) bool DisplayOptions::fromString( DisplayOptions& out, const TQString& in ) { - TQRegExp regex( TQString::tqfromLatin1( rformat ) ); + TQRegExp regex( TQString::fromLatin1( rformat ) ); if ( regex.search( in ) < 0 ) return false; out.reset(); diff --git a/kghostview/gssettingswidget.ui b/kghostview/gssettingswidget.ui index 756f8b50..7ba9f637 100644 --- a/kghostview/gssettingswidget.ui +++ b/kghostview/gssettingswidget.ui @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>286</width> <height>20</height> diff --git a/kghostview/infodialog.cpp b/kghostview/infodialog.cpp index 431a0ed7..e429d712 100644 --- a/kghostview/infodialog.cpp +++ b/kghostview/infodialog.cpp @@ -90,7 +90,7 @@ namespace { "(?:(\\+|\\-)(\\d\\d)\'?(\\d\\d)\'?)?" "\\)" ); if ( exp.exactMatch( dateStr ) ) { - TQStringList list = exp.tqcapturedTexts(); + TQStringList list = exp.capturedTexts(); TQStringList::iterator iter = list.begin(); ++iter; // whole string! #undef GET diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp index 1d38ba88..37b8ffdc 100644 --- a/kghostview/kgv_miniwidget.cpp +++ b/kghostview/kgv_miniwidget.cpp @@ -534,7 +534,7 @@ void KGVMiniWidget::buildTOC() } } else { - marklist->insertItem( TQString::tqfromLatin1( "1" ), 0 ); + marklist->insertItem( TQString::fromLatin1( "1" ), 0 ); } } diff --git a/kghostview/kgvconfigdialog.cpp b/kghostview/kgvconfigdialog.cpp index 6159a6f2..2f0c8593 100644 --- a/kghostview/kgvconfigdialog.cpp +++ b/kghostview/kgvconfigdialog.cpp @@ -120,7 +120,7 @@ namespace { if ( version < TQString::number( 7.00 ) ) { TQStringList arguments = TQStringList::split( ' ', Configuration::antialiasingArguments() ); - arguments.remove( TQString::tqfromLatin1( "-dMaxBitmap=10000000" ) ); + arguments.remove( TQString::fromLatin1( "-dMaxBitmap=10000000" ) ); TQString antiAliasArgs = arguments.join( " " ); Configuration::setAntialiasingArguments( antiAliasArgs ); @@ -140,9 +140,9 @@ void ConfigDialog::showSettings( KGVPart* main ) { KConfigDialog* dialog = new KConfigDialog( 0, name, Configuration::self(), KDialogBase::IconList ); dialog->addPage( new GeneralSettingsWidget( 0, "general-settings" ), - i18n( "General" ), TQString::tqfromLatin1( "kghostview" ) ); + i18n( "General" ), TQString::fromLatin1( "kghostview" ) ); GSSettingsWidget *gssw = new GSSettingsWidget( 0, "gs-settings" ); - dialog->addPage( gssw, i18n( "Ghostscript\nConfiguration" ), TQString::tqfromLatin1( "pdf" ) ); + dialog->addPage( gssw, i18n( "Ghostscript\nConfiguration" ), TQString::fromLatin1( "pdf" ) ); gssw->setDetectedVersion(Configuration::version()); diff --git a/kghostview/kgvfactory.cpp b/kghostview/kgvfactory.cpp index 0f11e563..c7024c59 100644 --- a/kghostview/kgvfactory.cpp +++ b/kghostview/kgvfactory.cpp @@ -64,7 +64,7 @@ KParts::Part *KGVFactory::createPartObject( TQWidget *parentWidget, const char * * * as we did before. */ - args << TQString::tqfromLatin1( className ); + args << TQString::fromLatin1( className ); if ( !strcmp( className, "Browser/View" ) ) { className = "KParts::ReadOnlyPart"; } diff --git a/kghostview/kgvpagedecorator.cpp b/kghostview/kgvpagedecorator.cpp index a549d95d..b6304c1d 100644 --- a/kghostview/kgvpagedecorator.cpp +++ b/kghostview/kgvpagedecorator.cpp @@ -63,7 +63,7 @@ void KGVPageDecorator::drawFrame( TQPainter* p ) if( !r.isValid() ) return; - const TQColorGroup& cg = tqcolorGroup(); + const TQColorGroup& cg = colorGroup(); r.moveCenter( r.center() + _shadowOffset ); qDrawPlainRect( p, r, cg.shadow(), _shadowOffset.manhattanLength() ); diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp index 568b209b..ea4258fc 100644 --- a/kghostview/kgvshell.cpp +++ b/kghostview/kgvshell.cpp @@ -309,7 +309,7 @@ void KGVShell::slotMaximize() void KGVShell::slotResize() { - resize( m_gvpart->pageView()->tqsizeHint().width(), height() ); + resize( m_gvpart->pageView()->sizeHint().width(), height() ); } void KGVShell::setFullScreen( bool useFullScreen ) diff --git a/kghostview/viewcontrol.cpp b/kghostview/viewcontrol.cpp index 8f1c8f0c..97616a26 100644 --- a/kghostview/viewcontrol.cpp +++ b/kghostview/viewcontrol.cpp @@ -36,7 +36,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name ) vcGroupBox = new TQGroupBox( this ); vcGroupBox->setFrameStyle( TQFrame::NoFrame ); //vcGroupBox->setTitle( i18n("Force Changes To") ); - //vcGroupBox->tqsetAlignment( 1 ); + //vcGroupBox->setAlignment( 1 ); topLayout->addWidget( vcGroupBox, 10 ); @@ -51,7 +51,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name ) magComboBox = new TQComboBox( FALSE, vcGroupBox ); - magComboBox->setFixedHeight( magComboBox->tqsizeHint().height() ); + magComboBox->setFixedHeight( magComboBox->sizeHint().height() ); //magComboBox->hide(); @@ -63,7 +63,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name ) mediaComboBox = new TQComboBox( FALSE, vcGroupBox ); - mediaComboBox->setFixedHeight( magComboBox->tqsizeHint().height() ); + mediaComboBox->setFixedHeight( magComboBox->sizeHint().height() ); connect ( mediaComboBox, TQT_SIGNAL (activated (int)), this, TQT_SLOT (slotMediaSelection (int)) ); @@ -75,7 +75,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name ) orientComboBox->insertItem(i18n("Landscape")); orientComboBox->insertItem(i18n("Seascape")); orientComboBox->insertItem(i18n("Upside Down")); - orientComboBox->setFixedHeight( magComboBox->tqsizeHint().height() ); + orientComboBox->setFixedHeight( magComboBox->sizeHint().height() ); connect ( orientComboBox, TQT_SIGNAL (activated (int)), this, TQT_SLOT (slotOrientSelection (int)) ); @@ -85,9 +85,9 @@ ViewControl::ViewControl( TQWidget *parent, const char *name ) TQLabel* vcLabel; vcLabel = new TQLabel( magComboBox, i18n("&Magnification"), vcGroupBox ); - vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix ); - if ( vcLabel->tqsizeHint().width() > labelWidth ) - labelWidth = vcLabel->tqsizeHint().width(); + vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix ); + if ( vcLabel->sizeHint().width() > labelWidth ) + labelWidth = vcLabel->sizeHint().width(); vcLabel->setMinimumWidth( labelWidth ); vcLabel->hide(); @@ -96,24 +96,24 @@ ViewControl::ViewControl( TQWidget *parent, const char *name ) vcLabel = new TQLabel( mediaComboBox, i18n("M&edia"), vcGroupBox ); - vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix ); - if ( vcLabel->tqsizeHint().width() > labelWidth ) - labelWidth = vcLabel->tqsizeHint().width(); + vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix ); + if ( vcLabel->sizeHint().width() > labelWidth ) + labelWidth = vcLabel->sizeHint().width(); vcLabel->setMinimumWidth( labelWidth ); grid->addWidget( vcLabel, 1, 0 ); vcLabel = new TQLabel( orientComboBox, i18n("&Orientation"), vcGroupBox ); - vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix ); - if ( vcLabel->tqsizeHint().width() > labelWidth ) - labelWidth = vcLabel->tqsizeHint().width(); + vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix ); + if ( vcLabel->sizeHint().width() > labelWidth ) + labelWidth = vcLabel->sizeHint().width(); vcLabel->setMinimumWidth( labelWidth ); grid->addWidget( vcLabel, 2, 0 ); - vcGroupBox->setMinimumHeight( 2*orientComboBox->tqsizeHint().height()+20 ); + vcGroupBox->setMinimumHeight( 2*orientComboBox->sizeHint().height()+20 ); vcGroupBox->setMinimumWidth( - 40 + labelWidth + orientComboBox->tqsizeHint().width() ); + 40 + labelWidth + orientComboBox->sizeHint().width() ); KSeparator* sep = new KSeparator( KSeparator::HLine, this); topLayout->addWidget( sep ); diff --git a/kiconedit/kcolorgrid.cpp b/kiconedit/kcolorgrid.cpp index 35fd9f3e..7d1baae6 100644 --- a/kiconedit/kcolorgrid.cpp +++ b/kiconedit/kcolorgrid.cpp @@ -163,7 +163,7 @@ void KColorGrid::resizeEvent(TQResizeEvent *) } */ -TQSize KColorGrid::tqsizeHint() const +TQSize KColorGrid::sizeHint() const { return TQSize(totalwidth, totalheight); } diff --git a/kiconedit/kcolorgrid.h b/kiconedit/kcolorgrid.h index a5e21fc7..5e466348 100644 --- a/kiconedit/kcolorgrid.h +++ b/kiconedit/kcolorgrid.h @@ -65,7 +65,7 @@ public: virtual void setCellSize( int s ); virtual int cellSize() { return cellsize; } - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; void setSize(const TQSize s) { setNumRows(s.height()); setNumCols(s.width()); } diff --git a/kiconedit/kiconcolors.cpp b/kiconedit/kiconcolors.cpp index 4393379b..8e5daf84 100644 --- a/kiconedit/kiconcolors.cpp +++ b/kiconedit/kiconcolors.cpp @@ -43,7 +43,7 @@ void KDrawColors::paintCell( TQPainter *painter, int row, int col ) int d = spacing(); qDrawShadePanel( painter, d, d, cellSize()-d, cellSize()-d, - tqcolorGroup(), true, 1, &brush); + colorGroup(), true, 1, &brush); if ( row * numCols() + col == selected) painter->drawWinFocusRect( d+1, d+1, cellSize()-(2*d)+1, cellSize()-(2*d)+1 ); } diff --git a/kiconedit/kiconconfig.cpp b/kiconedit/kiconconfig.cpp index d5db3bde..d6144823 100644 --- a/kiconedit/kiconconfig.cpp +++ b/kiconedit/kiconconfig.cpp @@ -49,7 +49,7 @@ static inline TQPixmap loadIcon( const char * name ) { return KGlobal::instance()->iconLoader() - ->loadIcon( TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); + ->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); } KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent) @@ -548,8 +548,8 @@ KIconConfig::KIconConfig(TQWidget *parent) TQSize min(300, 400); - if (300 < tqsizeHint().width()) { min.setWidth(tqsizeHint().width()); } - if (400 < tqsizeHint().height()) { min.setHeight(tqsizeHint().height()); } + if (300 < sizeHint().width()) { min.setWidth(sizeHint().width()); } + if (400 < sizeHint().height()) { min.setHeight(sizeHint().height()); } resize(min); } diff --git a/kiconedit/kiconedit.cpp b/kiconedit/kiconedit.cpp index 8a4a6af1..bf731571 100644 --- a/kiconedit/kiconedit.cpp +++ b/kiconedit/kiconedit.cpp @@ -222,10 +222,10 @@ void KIconEdit::writeConfig() saveMainWindowSettings( config, "MainWindowSettings" ); } -TQSize KIconEdit::tqsizeHint() const +TQSize KIconEdit::sizeHint() const { if(gridview) - return gridview->tqsizeHint(); + return gridview->sizeHint(); else return TQSize(-1, -1); } diff --git a/kiconedit/kiconedit.h b/kiconedit/kiconedit.h index e912e0f7..7af10e74 100644 --- a/kiconedit/kiconedit.h +++ b/kiconedit/kiconedit.h @@ -65,7 +65,7 @@ public: KIconEdit( const TQImage image, const char *name = "kiconedit"); ~KIconEdit(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; static WindowList windowList; signals: diff --git a/kiconedit/kicongrid.cpp b/kiconedit/kicongrid.cpp index b24db091..3389446d 100644 --- a/kiconedit/kicongrid.cpp +++ b/kiconedit/kicongrid.cpp @@ -1035,7 +1035,7 @@ void KIconEditGrid::load( TQImage *image) setColor((y*numCols())+x, *l, false); } //kdDebug(4640) << "Row: " << y << endl; - kapp->tqprocessEvents(200); + kapp->processEvents(200); } updateColors(); diff --git a/kiconedit/knew.cpp b/kiconedit/knew.cpp index e38d58bb..4f4bdb89 100644 --- a/kiconedit/knew.cpp +++ b/kiconedit/knew.cpp @@ -173,7 +173,7 @@ NewSelect::NewSelect(TQWidget *parent) : TQWidget( parent ) l->addWidget( rbtempl, 1 ); //l->addWidget(rbtempl, 5, AlignLeft); - //grp->setMinimumSize(grp->tqchildrenRect().size()); + //grp->setMinimumSize(grp->childrenRect().size()); grp->setButton( 0 ); } diff --git a/kiconedit/palettetoolbar.cpp b/kiconedit/palettetoolbar.cpp index 225e2439..969facac 100644 --- a/kiconedit/palettetoolbar.cpp +++ b/kiconedit/palettetoolbar.cpp @@ -42,7 +42,7 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name ) m_lblPreview = new TQLabel( base ); m_lblPreview->setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); m_lblPreview->setFixedHeight( 64 ); - m_lblPreview->tqsetAlignment( TQt::AlignHCenter|TQt::AlignVCenter ); + m_lblPreview->setAlignment( TQt::AlignHCenter|TQt::AlignVCenter ); TQWhatsThis::add(m_lblPreview, i18n( "Preview\n\nThis is a 1:1 preview" " of the current icon" ) ); m_layout->addWidget( m_lblPreview ); @@ -50,7 +50,7 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name ) m_currentColorView = new TQLabel( base ); m_currentColorView->setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); m_currentColorView->setFixedHeight( 24 ); - m_currentColorView->tqsetAlignment( TQt::AlignHCenter|TQt::AlignVCenter ); + m_currentColorView->setAlignment( TQt::AlignHCenter|TQt::AlignVCenter ); TQWhatsThis::add(m_currentColorView, i18n( "Current color\n\nThis is the currently selected color" ) ); m_layout->addWidget( m_currentColorView ); diff --git a/kmrml/kmrml/algorithmdialog.cpp b/kmrml/kmrml/algorithmdialog.cpp index 68060bb3..0678fe6b 100644 --- a/kmrml/kmrml/algorithmdialog.cpp +++ b/kmrml/kmrml/algorithmdialog.cpp @@ -49,8 +49,8 @@ protected: virtual void viewportResizeEvent(TQResizeEvent* ev) { TQScrollView::viewportResizeEvent(ev); - m_frame->resize( kMax(m_frame->tqsizeHint().width(), ev->size().width()), - kMax(m_frame->tqsizeHint().height(), ev->size().height())); + m_frame->resize( kMax(m_frame->sizeHint().width(), ev->size().width()), + kMax(m_frame->sizeHint().height(), ev->size().height())); }; private: @@ -106,7 +106,7 @@ AlgorithmDialog::AlgorithmDialog( const AlgorithmList& algorithms, mainLayout->activate(); algoHLayout->move( groupBox->x() + 10, groupBox->y() - 12 ); - box->setMinimumWidth( algoHLayout->tqsizeHint().width() + + box->setMinimumWidth( algoHLayout->sizeHint().width() + 4 * KDialog::spacingHint() ); } diff --git a/kmrml/kmrml/kcontrol/indexcleaner.cpp b/kmrml/kmrml/kcontrol/indexcleaner.cpp index 2183cc5b..c184c10c 100644 --- a/kmrml/kmrml/kcontrol/indexcleaner.cpp +++ b/kmrml/kmrml/kcontrol/indexcleaner.cpp @@ -78,7 +78,7 @@ void IndexCleaner::startNext() if ( index != -1 ) cmd.replace( index, 2, TQUOTE( dir ) ); else // no %d? What else can we do? - cmd.append( TQString::tqfromLatin1(" ") + TQUOTE( dir ) ); + cmd.append( TQString::fromLatin1(" ") + TQUOTE( dir ) ); *m_process << cmd; diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.cpp b/kmrml/kmrml/kcontrol/kcmkmrml.cpp index 42aaf534..dfee10fd 100644 --- a/kmrml/kmrml/kcontrol/kcmkmrml.cpp +++ b/kmrml/kmrml/kcontrol/kcmkmrml.cpp @@ -86,9 +86,9 @@ void KCMKMrml::checkGiftInstallation() KMessageBox::error( this, errorMessage ); m_mainPage->hide(); TQLabel *errorLabel = new TQLabel( errorMessage, this ); - errorLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + errorLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); KURLLabel *urlLabel = new KURLLabel( "http://www.gnu.org/software/gift", TQString(), this ); - urlLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + urlLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& )), kapp, TQT_SLOT( invokeBrowser( const TQString& )) ); TQLayout *l = tqlayout(); l->addItem( new TQSpacerItem( 0, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); diff --git a/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp index 84ba61a2..a3fa97e8 100644 --- a/kmrml/kmrml/kcontrol/mainpage.cpp +++ b/kmrml/kmrml/kcontrol/mainpage.cpp @@ -186,7 +186,7 @@ TQStringList MainPage::difference( const TQStringList& oldIndexDirs, { TQStringList result; - TQString slash = TQString::tqfromLatin1("/"); + TQString slash = TQString::fromLatin1("/"); TQStringList::ConstIterator oldIt = oldIndexDirs.begin(); TQString oldDir, newDir; diff --git a/kmrml/kmrml/kcontrol/serverconfigwidget.ui b/kmrml/kmrml/kcontrol/serverconfigwidget.ui index e577b221..5f3a34cd 100644 --- a/kmrml/kmrml/kcontrol/serverconfigwidget.ui +++ b/kmrml/kmrml/kcontrol/serverconfigwidget.ui @@ -135,7 +135,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>200</width> <height>0</height> @@ -200,7 +200,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp index 219a36a6..43298376 100644 --- a/kmrml/kmrml/lib/kmrml_config.cpp +++ b/kmrml/kmrml/lib/kmrml_config.cpp @@ -104,7 +104,7 @@ bool Config::sync() void Config::setDefaultHost( const TQString& host ) { m_defaultHost = host.isEmpty() ? - TQString::tqfromLatin1(DEFAULT_HOST) : host; + TQString::fromLatin1(DEFAULT_HOST) : host; m_config->setGroup( CONFIG_GROUP ); m_config->writeEntry( "Default Host", m_defaultHost ); diff --git a/kmrml/kmrml/lib/kmrml_config.h b/kmrml/kmrml/lib/kmrml_config.h index 4e39d3bf..2208030a 100644 --- a/kmrml/kmrml/lib/kmrml_config.h +++ b/kmrml/kmrml/lib/kmrml_config.h @@ -108,7 +108,7 @@ namespace KMrml TQString settingsGroup( const TQString& host ) const { - return TQString::tqfromLatin1( "SettingsFor: " ).append( host ); + return TQString::fromLatin1( "SettingsFor: " ).append( host ); } bool m_serverStartedIndividually; diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp index 542d3b9c..2a5af3c3 100644 --- a/kmrml/kmrml/mrml_part.cpp +++ b/kmrml/kmrml/mrml_part.cpp @@ -153,13 +153,13 @@ MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */, m_algoButton = new TQPushButton( TQString(), m_panel ); m_algoButton->setPixmap( SmallIcon("configure") ); - m_algoButton->setFixedSize( m_algoButton->tqsizeHint() ); + m_algoButton->setFixedSize( m_algoButton->sizeHint() ); connect( m_algoButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureAlgorithm() )); TQToolTip::add( m_algoButton, i18n("Configure algorithm") ); TQWidget *spacer = new TQWidget( m_panel ); - spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, + spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum ) ); int resultSize = config->readNumEntry( "Result-size", 20 ); @@ -172,7 +172,7 @@ MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */, m_startButton = new TQPushButton( TQString(), tmp ); connect( m_startButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStartClicked() )); - settqStatus( NeedCollection ); + setStatus( NeedCollection ); setWidget( box ); @@ -206,7 +206,7 @@ void MrmlPart::initCollections( const TQDomElement& elem ) KMessageBox::information( widget(), i18n("There is no image collection available\n" "at %1.\n"), i18n("No Image Collection")); - settqStatus( NeedCollection ); + setStatus( NeedCollection ); } else m_collectionCombo->updateGeometry(); // adjust the entire grid @@ -229,7 +229,7 @@ bool MrmlPart::openURL( const KURL& url ) m_url = url; TQString host = url.host().isEmpty() ? - TQString::tqfromLatin1("localhost") : url.host(); + TQString::fromLatin1("localhost") : url.host(); m_hostCombo->setCurrentItem( host ); @@ -285,8 +285,8 @@ bool MrmlPart::openURL( const KURL& url ) == KMessageBox::Yes ) { KApplication::tdeinitExec( "kcmshell", - TQString::tqfromLatin1("kcmkmrml")); - settqStatus( NeedCollection ); + TQString::fromLatin1("kcmkmrml")); + setStatus( NeedCollection ); return false; } } @@ -308,7 +308,7 @@ void MrmlPart::contactServer( const KURL& url ) m_job->addMetaData( MrmlShared::kio_task(), MrmlShared::kio_initialize() ); TQString host = url.host().isEmpty() ? - TQString::tqfromLatin1("localhost") : url.host(); + TQString::fromLatin1("localhost") : url.host(); slotSetStatusBar( i18n("Connecting to indexing server at %1...").tqarg( host )); } @@ -376,7 +376,7 @@ bool MrmlPart::closeURL() m_job = 0L; } - settqStatus( NeedCollection ); + setStatus( NeedCollection ); return true; } @@ -400,7 +400,7 @@ KIO::TransferJob * MrmlPart::transferJob( const KURL& url ) emit started( job ); emit setWindowCaption( url.prettyURL() ); - settqStatus( InProgress ); + setStatus( InProgress ); return job; } @@ -423,7 +423,7 @@ void MrmlPart::slotResult( KIO::Job *job ) bool auto_random = m_view->isEmpty() && m_queryList.isEmpty(); m_random->setChecked( auto_random ); m_random->setEnabled( !auto_random ); - settqStatus( job->error() ? NeedCollection : CanSearch ); + setStatus( job->error() ? NeedCollection : CanSearch ); if ( !job->error() && !m_queryList.isEmpty() ) { // we have a connection and we got a list of relevant URLs to query for @@ -776,7 +776,7 @@ void MrmlPart::slotHostComboActivated( const TQString& host ) openURL( settings.getUrl() ); } -void MrmlPart::settqStatus( tqStatus status ) +void MrmlPart::setStatus( Status status ) { switch ( status ) { diff --git a/kmrml/kmrml/mrml_part.h b/kmrml/kmrml/mrml_part.h index 1451b833..0bfec704 100644 --- a/kmrml/kmrml/mrml_part.h +++ b/kmrml/kmrml/mrml_part.h @@ -57,7 +57,7 @@ class MrmlPart : public KParts::ReadOnlyPart TQ_OBJECT public: - enum tqStatus { NeedCollection, CanSearch, InProgress }; + enum Status { NeedCollection, CanSearch, InProgress }; MrmlPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& args ); @@ -116,7 +116,7 @@ private: void initHostCombo(); void enableServerDependentWidgets( bool enable ); - void settqStatus( tqStatus status ); + void setStatus( Status status ); void contactServer( const KURL& url ); void downloadReferenceFiles( const KURL::List& downloadList ); @@ -143,7 +143,7 @@ private: CollectionList m_collections; AlgorithmList m_algorithms; - tqStatus m_status; + Status m_status; static uint s_sessionId; }; diff --git a/kmrml/kmrml/mrml_view.cpp b/kmrml/kmrml/mrml_view.cpp index d5b26117..fa70124b 100644 --- a/kmrml/kmrml/mrml_view.cpp +++ b/kmrml/kmrml/mrml_view.cpp @@ -57,7 +57,7 @@ MrmlView::MrmlView( TQWidget *parent, const char *name ) // query result image TQLabel l( i18n( "No thumbnail available" ), 0L ); l.setFixedSize( 80, 80 ); - l.tqsetAlignment( WordBreak | AlignCenter ); + l.setAlignment( WordBreak | AlignCenter ); // l.setFrameStyle( TQLabel::Box | TQLabel::Plain ); // l.setLineWidth( 1 ); l.setPaletteBackgroundColor( TQt::white ); @@ -176,7 +176,7 @@ void MrmlView::slotLayout() TQPtrListIterator<MrmlViewItem> it( m_items ); for ( ; it.current(); ++it ) { - itemWidth = TQMAX( itemWidth, it.current()->tqsizeHint().width() ); + itemWidth = TQMAX( itemWidth, it.current()->sizeHint().width() ); } if ( itemWidth == 0 ) @@ -202,7 +202,7 @@ void MrmlView::slotLayout() if ( item == 0 ) rowIt = it; - rowHeight = TQMAX( rowHeight, it.current()->tqsizeHint().height() ); + rowHeight = TQMAX( rowHeight, it.current()->sizeHint().height() ); addChild( it.current(), margin + item * itemWidth, y ); it.current()->show(); @@ -306,11 +306,11 @@ MrmlViewItem::MrmlViewItem( const KURL& url, const KURL& thumbURL, /* if ( similarity > -1 ) - TQToolTip::add( this, TQString::tqfromLatin1("<qt>%1<br>%1</qt>") + TQToolTip::add( this, TQString::fromLatin1("<qt>%1<br>%1</qt>") .tqarg( url ) .tqarg(i18n("Similarity: %1").tqarg( TQString::number(similarity)))); else - TQToolTip::add( this, TQString::tqfromLatin1("<qt>%1</qt>").tqarg( url ) ); + TQToolTip::add( this, TQString::fromLatin1("<qt>%1</qt>").tqarg( url ) ); */ setMinimumSize( 130, 130 ); // ### @@ -342,14 +342,14 @@ void MrmlViewItem::paintEvent( TQPaintEvent *e ) if ( m_similarity >= 0 ) { TQPainter p( this ); - TQPen pen( tqcolorGroup().highlight(), 1, TQPen::SolidLine ); + TQPen pen( colorGroup().highlight(), 1, TQPen::SolidLine ); p.setPen( pen ); int x = margin; int y = m_combo->y() - similarityHeight - 2; int w = (int) (similarityFullWidth * m_similarity); int h = similarityHeight; p.drawRect( x, y, similarityFullWidth, h ); - p.fillRect( x, y, w, h, tqcolorGroup().highlight() ); + p.fillRect( x, y, w, h, colorGroup().highlight() ); } } @@ -361,7 +361,7 @@ void MrmlViewItem::resizeEvent( TQResizeEvent *e ) m_combo->move( width()/2 - m_combo->width()/2, y ); } -TQSize MrmlViewItem::tqsizeHint() const +TQSize MrmlViewItem::sizeHint() const { int w = TQMAX( TQMAX(minimumHeight(), m_combo->width()), m_pixmap.width() ); w += 2 * margin; diff --git a/kmrml/kmrml/mrml_view.h b/kmrml/kmrml/mrml_view.h index a9f1aad1..f73634a8 100644 --- a/kmrml/kmrml/mrml_view.h +++ b/kmrml/kmrml/mrml_view.h @@ -126,7 +126,7 @@ public: void setSimilarity( double value ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; const KURL& url() const { return m_url; } const KURL& thumbURL() const { return m_thumbURL; } diff --git a/kolourpaint/kpcommandhistory.cpp b/kolourpaint/kpcommandhistory.cpp index 06948815..186a80fa 100644 --- a/kolourpaint/kpcommandhistory.cpp +++ b/kolourpaint/kpcommandhistory.cpp @@ -257,13 +257,13 @@ kpCommandHistoryBase::kpCommandHistoryBase (bool doReadConfig, : d (new kpCommandHistoryBasePrivate ()) { m_actionUndo = new KToolBarPopupAction (undoActionText (), - TQString::tqfromLatin1 ("undo"), + TQString::fromLatin1 ("undo"), KStdAccel::shortcut (KStdAccel::Undo), this, TQT_SLOT (undo ()), ac, KStdAction::name (KStdAction::Undo)); m_actionRedo = new KToolBarPopupAction (redoActionText (), - TQString::tqfromLatin1 ("redo"), + TQString::fromLatin1 ("redo"), KStdAccel::shortcut (KStdAccel::Redo), this, TQT_SLOT (redo ()), ac, KStdAction::name (KStdAction::Redo)); diff --git a/kolourpaint/kpdefs.h b/kolourpaint/kpdefs.h index d0343f9e..c509ae0f 100644 --- a/kolourpaint/kpdefs.h +++ b/kolourpaint/kpdefs.h @@ -65,71 +65,71 @@ // Settings // -#define kpSettingsGroupGeneral TQString::tqfromLatin1 ("General Settings") -#define kpSettingFirstTime TQString::tqfromLatin1 ("First Time") -#define kpSettingShowGrid TQString::tqfromLatin1 ("Show Grid") -#define kpSettingShowPath TQString::tqfromLatin1 ("Show Path") -#define kpSettingColorSimilarity TQString::tqfromLatin1 ("Color Similarity") -#define kpSettingDitherOnOpen TQString::tqfromLatin1 ("Dither on Open if Screen is 15/16bpp and Image Num Colors More Than") -#define kpSettingPrintImageCenteredOnPage TQString::tqfromLatin1 ("Print Image Centered On Page") +#define kpSettingsGroupGeneral TQString::fromLatin1 ("General Settings") +#define kpSettingFirstTime TQString::fromLatin1 ("First Time") +#define kpSettingShowGrid TQString::fromLatin1 ("Show Grid") +#define kpSettingShowPath TQString::fromLatin1 ("Show Path") +#define kpSettingColorSimilarity TQString::fromLatin1 ("Color Similarity") +#define kpSettingDitherOnOpen TQString::fromLatin1 ("Dither on Open if Screen is 15/16bpp and Image Num Colors More Than") +#define kpSettingPrintImageCenteredOnPage TQString::fromLatin1 ("Print Image Centered On Page") -#define kpSettingsGroupFileSaveAs TQString::tqfromLatin1 ("File/Save As") -#define kpSettingsGroupFileExport TQString::tqfromLatin1 ("File/Export") -#define kpSettingsGroupEditCopyTo TQString::tqfromLatin1 ("Edit/Copy To") +#define kpSettingsGroupFileSaveAs TQString::fromLatin1 ("File/Save As") +#define kpSettingsGroupFileExport TQString::fromLatin1 ("File/Export") +#define kpSettingsGroupEditCopyTo TQString::fromLatin1 ("Edit/Copy To") -#define kpSettingForcedMimeType TQString::tqfromLatin1 ("Forced MimeType") -#define kpSettingForcedColorDepth TQString::tqfromLatin1 ("Forced Color Depth") -#define kpSettingForcedDither TQString::tqfromLatin1 ("Forced Dither") -#define kpSettingForcedQuality TQString::tqfromLatin1 ("Forced Quality") +#define kpSettingForcedMimeType TQString::fromLatin1 ("Forced MimeType") +#define kpSettingForcedColorDepth TQString::fromLatin1 ("Forced Color Depth") +#define kpSettingForcedDither TQString::fromLatin1 ("Forced Dither") +#define kpSettingForcedQuality TQString::fromLatin1 ("Forced Quality") -#define kpSettingLastDocSize TQString::tqfromLatin1 ("Last Document Size") +#define kpSettingLastDocSize TQString::fromLatin1 ("Last Document Size") -#define kpSettingMoreEffectsLastEffect TQString::tqfromLatin1 ("More Effects - Last Effect") +#define kpSettingMoreEffectsLastEffect TQString::fromLatin1 ("More Effects - Last Effect") -#define kpSettingResizeScaleLastKeepAspect TQString::tqfromLatin1 ("Resize Scale - Last Keep Aspect") +#define kpSettingResizeScaleLastKeepAspect TQString::fromLatin1 ("Resize Scale - Last Keep Aspect") -#define kpSettingsGroupMimeTypeProperties TQString::tqfromLatin1 ("MimeType Properties Version 1.2-2") -#define kpSettingMimeTypeMaximumColorDepth TQString::tqfromLatin1 ("Maximum Color Depth") -#define kpSettingMimeTypeHasConfigurableColorDepth TQString::tqfromLatin1 ("Configurable Color Depth") -#define kpSettingMimeTypeHasConfigurableQuality TQString::tqfromLatin1 ("Configurable Quality Setting") +#define kpSettingsGroupMimeTypeProperties TQString::fromLatin1 ("MimeType Properties Version 1.2-2") +#define kpSettingMimeTypeMaximumColorDepth TQString::fromLatin1 ("Maximum Color Depth") +#define kpSettingMimeTypeHasConfigurableColorDepth TQString::fromLatin1 ("Configurable Color Depth") +#define kpSettingMimeTypeHasConfigurableQuality TQString::fromLatin1 ("Configurable Quality Setting") -#define kpSettingsGroupUndoRedo TQString::tqfromLatin1 ("Undo/Redo Settings") -#define kpSettingUndoMinLimit TQString::tqfromLatin1 ("Min Limit") -#define kpSettingUndoMaxLimit TQString::tqfromLatin1 ("Max Limit") -#define kpSettingUndoMaxLimitSizeLimit TQString::tqfromLatin1 ("Max Limit Size Limit") +#define kpSettingsGroupUndoRedo TQString::fromLatin1 ("Undo/Redo Settings") +#define kpSettingUndoMinLimit TQString::fromLatin1 ("Min Limit") +#define kpSettingUndoMaxLimit TQString::fromLatin1 ("Max Limit") +#define kpSettingUndoMaxLimitSizeLimit TQString::fromLatin1 ("Max Limit Size Limit") -#define kpSettingsGroupThumbnail TQString::tqfromLatin1 ("Thumbnail Settings") -#define kpSettingThumbnailShown TQString::tqfromLatin1 ("Shown") -#define kpSettingThumbnailGeometry TQString::tqfromLatin1 ("Geometry") -#define kpSettingThumbnailZoomed TQString::tqfromLatin1 ("Zoomed") -#define kpSettingThumbnailShowRectangle TQString::tqfromLatin1 ("ShowRectangle") +#define kpSettingsGroupThumbnail TQString::fromLatin1 ("Thumbnail Settings") +#define kpSettingThumbnailShown TQString::fromLatin1 ("Shown") +#define kpSettingThumbnailGeometry TQString::fromLatin1 ("Geometry") +#define kpSettingThumbnailZoomed TQString::fromLatin1 ("Zoomed") +#define kpSettingThumbnailShowRectangle TQString::fromLatin1 ("ShowRectangle") -#define kpSettingsGroupPreviewSave TQString::tqfromLatin1 ("Save Preview Settings") -#define kpSettingPreviewSaveGeometry TQString::tqfromLatin1 ("Geometry") -#define kpSettingPreviewSaveUpdateDelay TQString::tqfromLatin1 ("Update Delay") +#define kpSettingsGroupPreviewSave TQString::fromLatin1 ("Save Preview Settings") +#define kpSettingPreviewSaveGeometry TQString::fromLatin1 ("Geometry") +#define kpSettingPreviewSaveUpdateDelay TQString::fromLatin1 ("Update Delay") -#define kpSettingsGroupTools TQString::tqfromLatin1 ("Tool Settings") -#define kpSettingLastTool TQString::tqfromLatin1 ("Last Used Tool") -#define kpSettingToolBoxIconSize TQString::tqfromLatin1 ("Tool Box Icon Size") +#define kpSettingsGroupTools TQString::fromLatin1 ("Tool Settings") +#define kpSettingLastTool TQString::fromLatin1 ("Last Used Tool") +#define kpSettingToolBoxIconSize TQString::fromLatin1 ("Tool Box Icon Size") -#define kpSettingsGroupText TQString::tqfromLatin1 ("Text Settings") -#define kpSettingFontFamily TQString::tqfromLatin1 ("Font Family") -#define kpSettingFontSize TQString::tqfromLatin1 ("Font Size") -#define kpSettingBold TQString::tqfromLatin1 ("Bold") -#define kpSettingItalic TQString::tqfromLatin1 ("Italic") -#define kpSettingUnderline TQString::tqfromLatin1 ("Underline") -#define kpSettingStrikeThru TQString::tqfromLatin1 ("Strike Thru") +#define kpSettingsGroupText TQString::fromLatin1 ("Text Settings") +#define kpSettingFontFamily TQString::fromLatin1 ("Font Family") +#define kpSettingFontSize TQString::fromLatin1 ("Font Size") +#define kpSettingBold TQString::fromLatin1 ("Bold") +#define kpSettingItalic TQString::fromLatin1 ("Italic") +#define kpSettingUnderline TQString::fromLatin1 ("Underline") +#define kpSettingStrikeThru TQString::fromLatin1 ("Strike Thru") -#define kpSettingsGroupFlattenEffect TQString::tqfromLatin1 ("Flatten Effect Settings") -#define kpSettingFlattenEffectColor1 TQString::tqfromLatin1 ("Color1") -#define kpSettingFlattenEffectColor2 TQString::tqfromLatin1 ("Color2") +#define kpSettingsGroupFlattenEffect TQString::fromLatin1 ("Flatten Effect Settings") +#define kpSettingFlattenEffectColor1 TQString::fromLatin1 ("Color1") +#define kpSettingFlattenEffectColor2 TQString::fromLatin1 ("Color2") // @@ -140,11 +140,11 @@ // // This key only exists if the document does. If it exists, it can be empty. // The URL need not point to a file that exists e.g. "kolourpaint doesnotexist.png". -#define kpSessionSettingDocumentUrl TQString::tqfromLatin1 ("Session Document Url") +#define kpSessionSettingDocumentUrl TQString::fromLatin1 ("Session Document Url") // The size of a document which is not from a URL e.g. "kolourpaint doesnotexist.png". // This key does not exist for documents from URLs. -#define kpSessionSettingNotFromUrlDocumentSize TQString::tqfromLatin1 ("Session Not-From-Url Document Size") +#define kpSessionSettingNotFromUrlDocumentSize TQString::fromLatin1 ("Session Not-From-Url Document Size") #endif // __kp_defs_h__ diff --git a/kolourpaint/kpdocument.cpp b/kolourpaint/kpdocument.cpp index fe91bfee..c5a1c442 100644 --- a/kolourpaint/kpdocument.cpp +++ b/kolourpaint/kpdocument.cpp @@ -156,7 +156,7 @@ TQPixmap kpDocument::convertToPixmapAsLosslessAsPossible ( metaInfo->setDotsPerMeterY (image.dotsPerMeterY ()); metaInfo->setOffset (image.offset ()); - TQValueList <TQImageTextKeyLang> keyList = image.tqtextList (); + TQValueList <TQImageTextKeyLang> keyList = image.textList (); for (TQValueList <TQImageTextKeyLang>::const_iterator it = keyList.begin (); it != keyList.end (); it++) @@ -475,7 +475,7 @@ bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap, // low maximum colour depth i18n ("Lossy File Format"), KStdGuiItem::save (), - TQString::tqfromLatin1 ("SaveInLossyMimeTypeDontAskAgain"))); + TQString::fromLatin1 ("SaveInLossyMimeTypeDontAskAgain"))); } else if (lossyType & kpDocumentSaveOptions::ColorDepthLow) { @@ -490,7 +490,7 @@ bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap, .arg (saveOptions.colorDepth ()), i18n ("Low Color Depth"), KStdGuiItem::save (), - TQString::tqfromLatin1 ("SaveAtLowColorDepthDontAskAgain"))); + TQString::fromLatin1 ("SaveAtLowColorDepthDontAskAgain"))); } #undef TQUIT_IF_CANCEL @@ -628,8 +628,8 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap, << ",overwritePrompt=" << overwritePrompt << ",lossyPrompt=" << lossyPrompt << ")" << endl; - saveOptions.printDebug (TQString::tqfromLatin1 ("\tsaveOptions")); - metaInfo.printDebug (TQString::tqfromLatin1 ("\tmetaInfo")); + saveOptions.printDebug (TQString::fromLatin1 ("\tsaveOptions")); + metaInfo.printDebug (TQString::fromLatin1 ("\tmetaInfo")); #endif if (overwritePrompt && KIO::NetAccess::exists (url, false/*write*/, parent)) diff --git a/kolourpaint/kpdocumentmetainfo.cpp b/kolourpaint/kpdocumentmetainfo.cpp index f0b9f0f0..01728efa 100644 --- a/kolourpaint/kpdocumentmetainfo.cpp +++ b/kolourpaint/kpdocumentmetainfo.cpp @@ -82,7 +82,7 @@ kpDocumentMetaInfo &kpDocumentMetaInfo::operator= (const kpDocumentMetaInfo &rhs void kpDocumentMetaInfo::printDebug (const TQString &prefix) const { const TQString usedPrefix = !prefix.isEmpty () ? - prefix + TQString::tqfromLatin1 (":") : + prefix + TQString::fromLatin1 (":") : TQString(); kdDebug () << usedPrefix << endl; diff --git a/kolourpaint/kpdocumentsaveoptions.cpp b/kolourpaint/kpdocumentsaveoptions.cpp index 3c312e42..6bbb81d4 100644 --- a/kolourpaint/kpdocumentsaveoptions.cpp +++ b/kolourpaint/kpdocumentsaveoptions.cpp @@ -114,7 +114,7 @@ kpDocumentSaveOptions &kpDocumentSaveOptions::operator= (const kpDocumentSaveOpt void kpDocumentSaveOptions::printDebug (const TQString &prefix) const { const TQString usedPrefix = !prefix.isEmpty () ? - prefix + TQString::tqfromLatin1 (": ") : + prefix + TQString::fromLatin1 (": ") : TQString(); kdDebug () << usedPrefix @@ -246,7 +246,7 @@ bool kpDocumentSaveOptions::qualityIsInvalid () const TQString kpDocumentSaveOptions::defaultMimeType (KConfigBase *config) { return config->readEntry (kpSettingForcedMimeType, - TQString::tqfromLatin1 ("image/png")); + TQString::fromLatin1 ("image/png")); } // public static @@ -445,19 +445,19 @@ int kpDocumentSaveOptions::mimeTypeMaximumColorDepth (const TQString &mimeType) // SYNC: update mime info here // Greyscale actually (unenforced since depth not set to configurable) - defaultList << TQString::tqfromLatin1 ("image/x-eps:32"); + defaultList << TQString::fromLatin1 ("image/x-eps:32"); - defaultList << TQString::tqfromLatin1 ("image/x-portable-bitmap:1"); + defaultList << TQString::fromLatin1 ("image/x-portable-bitmap:1"); // Greyscale actually (unenforced since depth not set to configurable) - defaultList << TQString::tqfromLatin1 ("image/x-portable-greymap:8"); + defaultList << TQString::fromLatin1 ("image/x-portable-greymap:8"); - defaultList << TQString::tqfromLatin1 ("image/x-xbm:1"); + defaultList << TQString::fromLatin1 ("image/x-xbm:1"); const TQStringList mimeTypeList = mimeTypesSupportingProperty ( kpSettingMimeTypeMaximumColorDepth, defaultList); - const TQString mimeTypeColon = mimeType + TQString::tqfromLatin1 (":"); + const TQString mimeTypeColon = mimeType + TQString::fromLatin1 (":"); for (TQStringList::const_iterator it = mimeTypeList.begin (); it != mimeTypeList.end (); it++) @@ -488,16 +488,16 @@ bool kpDocumentSaveOptions::mimeTypeHasConfigurableColorDepth (const TQString &m TQStringList defaultMimeTypes; // SYNC: update mime info here - defaultMimeTypes << TQString::tqfromLatin1 ("image/png"); - defaultMimeTypes << TQString::tqfromLatin1 ("image/x-bmp"); - defaultMimeTypes << TQString::tqfromLatin1 ("image/x-pcx"); + defaultMimeTypes << TQString::fromLatin1 ("image/png"); + defaultMimeTypes << TQString::fromLatin1 ("image/x-bmp"); + defaultMimeTypes << TQString::fromLatin1 ("image/x-pcx"); // TODO: Only 1, 24 not 8; TQt only sees 32 but "file" cmd realises // it's either 1 or 24. - defaultMimeTypes << TQString::tqfromLatin1 ("image/x-rgb"); + defaultMimeTypes << TQString::fromLatin1 ("image/x-rgb"); // TODO: Only 8 and 24 - no 1. - defaultMimeTypes << TQString::tqfromLatin1 ("image/x-xpm"); + defaultMimeTypes << TQString::fromLatin1 ("image/x-xpm"); return mimeTypeSupportsProperty (mimeType, kpSettingMimeTypeHasConfigurableColorDepth, @@ -517,8 +517,8 @@ bool kpDocumentSaveOptions::mimeTypeHasConfigurableQuality (const TQString &mime TQStringList defaultMimeTypes; // SYNC: update mime info here - defaultMimeTypes << TQString::tqfromLatin1 ("image/jp2"); - defaultMimeTypes << TQString::tqfromLatin1 ("image/jpeg"); + defaultMimeTypes << TQString::fromLatin1 ("image/jp2"); + defaultMimeTypes << TQString::fromLatin1 ("image/jpeg"); return mimeTypeSupportsProperty (mimeType, kpSettingMimeTypeHasConfigurableQuality, diff --git a/kolourpaint/kpmainwindow.cpp b/kolourpaint/kpmainwindow.cpp index 3b117803..6ec2a944 100644 --- a/kolourpaint/kpmainwindow.cpp +++ b/kolourpaint/kpmainwindow.cpp @@ -731,7 +731,7 @@ void kpMainWindow::setDocument (kpDocument *newDoc) connect (m_document, TQT_SIGNAL (selectionIsTextChanged (bool)), this, TQT_SLOT (slotImageMenuUpdateDueToSelection ())); - // tqStatus bar + // Status bar connect (m_document, TQT_SIGNAL (documentOpened ()), this, TQT_SLOT (recalculateStatusBar ())); diff --git a/kolourpaint/kpmainwindow.h b/kolourpaint/kpmainwindow.h index bd0df32b..3da1e570 100644 --- a/kolourpaint/kpmainwindow.h +++ b/kolourpaint/kpmainwindow.h @@ -640,7 +640,7 @@ private slots: /* - * tqStatus Bar + * Status Bar */ private: diff --git a/kolourpaint/kpmainwindow_settings.cpp b/kolourpaint/kpmainwindow_settings.cpp index 9fc82440..c4f339db 100644 --- a/kolourpaint/kpmainwindow_settings.cpp +++ b/kolourpaint/kpmainwindow_settings.cpp @@ -195,7 +195,7 @@ void kpMainWindow::slotNewToolBarConfig () KMessageBox::information (this, i18n ("You have to restart KolourPaint for these changes to take effect."), i18n ("Toolbar Settings Changed"), - TQString::tqfromLatin1 ("ToolBarSettingsChanged")); + TQString::fromLatin1 ("ToolBarSettingsChanged")); //createGUI(); //applyMainWindowSettings (kapp->config (), autoSaveGroup ()); diff --git a/kolourpaint/kpmainwindow_text.cpp b/kolourpaint/kpmainwindow_text.cpp index 859e33f0..44bea619 100644 --- a/kolourpaint/kpmainwindow_text.cpp +++ b/kolourpaint/kpmainwindow_text.cpp @@ -80,7 +80,7 @@ void kpMainWindow::readAndApplyTextSettings () KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText); KConfigBase *cfg = cfgGroupSaver.config (); - m_actionTextFontFamily->setFont (cfg->readEntry (kpSettingFontFamily, TQString::tqfromLatin1 ("Times"))); + m_actionTextFontFamily->setFont (cfg->readEntry (kpSettingFontFamily, TQString::fromLatin1 ("Times"))); m_actionTextFontSize->setFontSize (cfg->readNumEntry (kpSettingFontSize, 14)); m_actionTextBold->setChecked (cfg->readBoolEntry (kpSettingBold, false)); m_actionTextItalic->setChecked (cfg->readBoolEntry (kpSettingItalic, false)); diff --git a/kolourpaint/kpmainwindow_view.cpp b/kolourpaint/kpmainwindow_view.cpp index 8be4beb8..4906b7ba 100644 --- a/kolourpaint/kpmainwindow_view.cpp +++ b/kolourpaint/kpmainwindow_view.cpp @@ -289,7 +289,7 @@ void kpMainWindow::zoomTo (int zoomLevel, bool centerUnderCursor) // Ordinary flicker is better than the whole view moving TQPainter p (m_mainView); p.fillRect (m_mainView->rect (), - m_scrollView->viewport ()->tqcolorGroup ().background ()); + m_scrollView->viewport ()->colorGroup ().background ()); } } diff --git a/kolourpaint/kpselection.cpp b/kolourpaint/kpselection.cpp index 43f81984..c5381d7d 100644 --- a/kolourpaint/kpselection.cpp +++ b/kolourpaint/kpselection.cpp @@ -373,7 +373,7 @@ TQBitmap kpSelection::maskForOwnType (bool nullForRectangular) const points.detach (); points.translate (-m_rect.x (), -m_rect.y ()); - painter.tqdrawPolygon (points, false/*even-odd algo*/); + painter.drawPolygon (points, false/*even-odd algo*/); } painter.end (); @@ -921,7 +921,7 @@ TQString kpSelection::textForTextLines (const TQValueVector <TQString> &textLine it != textLines_.end (); it++) { - bigString += TQString::tqfromLatin1 ("\n"); + bigString += TQString::fromLatin1 ("\n"); bigString += (*it); } @@ -1049,7 +1049,7 @@ int kpSelection::minimumHeightForTextStyle (const kpTextStyle &) } // public static -TQSize kpSelection::tqminimumSizeForTextStyle (const kpTextStyle &textStyle) +TQSize kpSelection::minimumSizeForTextStyle (const kpTextStyle &textStyle) { return TQSize (minimumWidthForTextStyle (textStyle), minimumHeightForTextStyle (textStyle)); @@ -1061,7 +1061,7 @@ int kpSelection::preferredMinimumWidthForTextStyle (const kpTextStyle &textStyle { const int about15CharsWidth = textStyle.fontMetrics ().width ( - TQString::tqfromLatin1 ("1234567890abcde")); + TQString::fromLatin1 ("1234567890abcde")); const int preferredMinWidth = TQMAX (150, @@ -1108,7 +1108,7 @@ int kpSelection::minimumHeight () const } // public -TQSize kpSelection::tqminimumSize () const +TQSize kpSelection::minimumSize () const { return TQSize (minimumWidth (), minimumHeight ()); } diff --git a/kolourpaint/kpselection.h b/kolourpaint/kpselection.h index 24b1ba39..a227fef2 100644 --- a/kolourpaint/kpselection.h +++ b/kolourpaint/kpselection.h @@ -169,7 +169,7 @@ public: // Be more robust when external enforcement fails. static int minimumWidthForTextStyle (const kpTextStyle &); static int minimumHeightForTextStyle (const kpTextStyle &); - static TQSize tqminimumSizeForTextStyle (const kpTextStyle &); + static TQSize minimumSizeForTextStyle (const kpTextStyle &); static int preferredMinimumWidthForTextStyle (const kpTextStyle &textStyle); static int preferredMinimumHeightForTextStyle (const kpTextStyle &textStyle); @@ -177,7 +177,7 @@ public: int minimumWidth () const; int minimumHeight () const; - TQSize tqminimumSize () const; + TQSize minimumSize () const; int textRowForPoint (const TQPoint &globalPoint) const; int textColForPoint (const TQPoint &globalPoint) const; diff --git a/kolourpaint/kpselectiondrag.cpp b/kolourpaint/kpselectiondrag.cpp index 22cdeb4a..9c680abb 100644 --- a/kolourpaint/kpselectiondrag.cpp +++ b/kolourpaint/kpselectiondrag.cpp @@ -143,10 +143,10 @@ bool kpSelectionDrag::provides (const char *mimeType) const } // public virtual [base TQMimeSource] -TQByteArray kpSelectionDrag::tqencodedData (const char *mimeType) const +TQByteArray kpSelectionDrag::encodedData (const char *mimeType) const { #if DEBUG_KP_SELECTION_DRAG - kdDebug () << "kpSelectionDrag::tqencodedData(" << mimeType << ")" << endl; + kdDebug () << "kpSelectionDrag::encodedData(" << mimeType << ")" << endl; #endif if (!mimeType) @@ -192,7 +192,7 @@ TQByteArray kpSelectionDrag::tqencodedData (const char *mimeType) const } else { - kdError () << "kpSelectionDrag::tqencodedData(" << mimeType << ")" + kdError () << "kpSelectionDrag::encodedData(" << mimeType << ")" << " kpSelectionDrag(TQImage) could not decode data into TQImage" << endl; stream << kpSelection (); @@ -207,7 +207,7 @@ TQByteArray kpSelectionDrag::tqencodedData (const char *mimeType) const kdDebug () << "\twant it as TQImage in TQByteArray" << endl; #endif - return TQImageDrag::tqencodedData (mimeType); + return TQImageDrag::encodedData (mimeType); } } @@ -255,7 +255,7 @@ bool kpSelectionDrag::decode (const TQMimeSource *e, kpSelection &sel, #if DEBUG_KP_SELECTION_DRAG kdDebug () << "\tmimeSource provides selection - just return it in TQByteArray" << endl; #endif - TQByteArray data = e->tqencodedData (kpSelectionDrag::selectionMimeType); + TQByteArray data = e->encodedData (kpSelectionDrag::selectionMimeType); TQDataStream stream (data, IO_ReadOnly); // (no need for wali as kpSelection's by definition only support TQPixmap's) diff --git a/kolourpaint/kpselectiondrag.h b/kolourpaint/kpselectiondrag.h index 93473509..4ed90d7f 100644 --- a/kolourpaint/kpselectiondrag.h +++ b/kolourpaint/kpselectiondrag.h @@ -56,7 +56,7 @@ protected: public: virtual const char *format (int which = 0) const; virtual bool provides (const char *mimeType) const; - virtual TQByteArray tqencodedData (const char *mimeType) const; + virtual TQByteArray encodedData (const char *mimeType) const; static bool canDecode (const TQMimeSource *e); static bool decode (const TQMimeSource *e, TQImage &img); diff --git a/kolourpaint/kpthumbnail.cpp b/kolourpaint/kpthumbnail.cpp index 84923c1d..06949f24 100644 --- a/kolourpaint/kpthumbnail.cpp +++ b/kolourpaint/kpthumbnail.cpp @@ -63,12 +63,12 @@ kpThumbnail::kpThumbnail (kpMainWindow *parent, const char *name) } - TQSize layoutMinimumSize = tqlayout () ? tqlayout ()->tqminimumSize () : TQSize (); + TQSize layoutMinimumSize = tqlayout () ? tqlayout ()->minimumSize () : TQSize (); #if DEBUG_KP_THUMBNAIL kdDebug () << "\ttqlayout=" << tqlayout () - << " minSize=" << (tqlayout () ? tqlayout ()->tqminimumSize () : TQSize ()) << endl; + << " minSize=" << (tqlayout () ? tqlayout ()->minimumSize () : TQSize ()) << endl; kdDebug () << "\tboxLayout=" << boxLayout () - << " minSize=" << (boxLayout () ? boxLayout ()->tqminimumSize () : TQSize ()) + << " minSize=" << (boxLayout () ? boxLayout ()->minimumSize () : TQSize ()) << endl; #endif if (tqlayout ()) diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp index da240492..a5da9c5a 100644 --- a/kolourpaint/kptool.cpp +++ b/kolourpaint/kptool.cpp @@ -153,7 +153,7 @@ void kpTool::createAction () m_action = new kpToolAction (text (), iconName (), shortcutForKey (m_key), this, TQT_SLOT (slotActionActivated ()), m_mainWindow->actionCollection (), name ()); - m_action->setExclusiveGroup (TQString::tqfromLatin1 ("Tool Box Actions")); + m_action->setExclusiveGroup (TQString::fromLatin1 ("Tool Box Actions")); m_action->setWhatsThis (description ()); connect (m_action, TQT_SIGNAL (toolTipChanged (const TQString &)), @@ -1046,7 +1046,7 @@ void kpTool::mouseMoveEvent (TQMouseEvent *e) << " viewUnderCursorTQt=" << (v1 ? v1->name () : "(none)") << " viewUnderStartPoint=" << (v2 ? v2->name () : "(none)") << endl; - kdDebug () << "\ttqfocusWidget=" << kapp->tqfocusWidget () << endl; + kdDebug () << "\tfocusWidget=" << kapp->focusWidget () << endl; #endif TQt::ButtonState buttonState = e->stateAfter (); @@ -1652,7 +1652,7 @@ bool kpTool::warnIfBigImageSize (int oldWidth, int oldHeight, text, caption, continueButtonText, - TQString::tqfromLatin1 ("BigImageDontAskAgain")); + TQString::fromLatin1 ("BigImageDontAskAgain")); return (accept == KMessageBox::Continue); } diff --git a/kolourpaint/kptool.h b/kolourpaint/kptool.h index 03bedb0a..b5555d64 100644 --- a/kolourpaint/kptool.h +++ b/kolourpaint/kptool.h @@ -341,7 +341,7 @@ protected: /* - * User Notifications (tqStatus Bar) + * User Notifications (Status Bar) */ public: diff --git a/kolourpaint/kpviewscrollablecontainer.cpp b/kolourpaint/kpviewscrollablecontainer.cpp index e8ea5a5d..c632b814 100644 --- a/kolourpaint/kpviewscrollablecontainer.cpp +++ b/kolourpaint/kpviewscrollablecontainer.cpp @@ -184,7 +184,7 @@ void kpGrip::updatePixmap () return; TQPixmap pixmap (width (), height ()); - pixmap.fill (tqcolorGroup ().highlight ()); + pixmap.fill (colorGroup ().highlight ()); kpPixmapFX::ensureTransparentAt (&pixmap, pixmap.rect ()); const TQRect hr = hotRect (); #if DEBUG_KP_VIEW_SCROLLABLE_CONTAINER diff --git a/kolourpaint/pixmapfx/kpeffectbalance.cpp b/kolourpaint/pixmapfx/kpeffectbalance.cpp index 946814d5..1906ab7f 100644 --- a/kolourpaint/pixmapfx/kpeffectbalance.cpp +++ b/kolourpaint/pixmapfx/kpeffectbalance.cpp @@ -277,7 +277,7 @@ kpEffectBalanceWidget::kpEffectBalanceWidget (bool actOnSelection, // TODO: This doesn't seem to be wide enough with some fonts so the // whole tqlayout moves when we drag the gamma slider. m_gammaLabel->setMinimumWidth (m_gammaLabel->fontMetrics ().width (" 10.00 ")); - m_gammaLabel->tqsetAlignment (m_gammaLabel->tqalignment () | TQt::AlignRight); + m_gammaLabel->setAlignment (m_gammaLabel->tqalignment () | TQt::AlignRight); TQPushButton *gammaResetPushButton = new TQPushButton (i18n ("Rese&t"), this); diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.cpp b/kolourpaint/pixmapfx/kpeffectsdialog.cpp index 098e0396..ce39de75 100644 --- a/kolourpaint/pixmapfx/kpeffectsdialog.cpp +++ b/kolourpaint/pixmapfx/kpeffectsdialog.cpp @@ -255,11 +255,11 @@ void kpEffectsDialog::selectEffect (int which) // Don't resize the preview when showing the widget: // TODO: actually work - TQSize previewGroupBoxMinSize = m_previewGroupBox->tqminimumSize (); - TQSize previewGroupBoxMaxSize = m_previewGroupBox->tqmaximumSize (); + TQSize previewGroupBoxMinSize = m_previewGroupBox->minimumSize (); + TQSize previewGroupBoxMaxSize = m_previewGroupBox->maximumSize (); TQLayout::ResizeMode previewGroupBoxResizeMode = m_previewGroupBox->tqlayout () ? - m_previewGroupBox->tqlayout ()->tqresizeMode () : + m_previewGroupBox->tqlayout ()->resizeMode () : TQLayout::Auto; #if DEBUG_KP_EFFECTS_DIALOG kdDebug () << "\tpreviewGroupBox: minSize=" << previewGroupBoxMinSize diff --git a/kolourpaint/pixmapfx/kppixmapfx.cpp b/kolourpaint/pixmapfx/kppixmapfx.cpp index 5b281606..2543f962 100644 --- a/kolourpaint/pixmapfx/kppixmapfx.cpp +++ b/kolourpaint/pixmapfx/kppixmapfx.cpp @@ -1403,12 +1403,12 @@ static TQPixmap xForm (const TQPixmap &pm, const TQWMatrix &transformMatrix_, painter.setWorldMatrix (transformMatrix); #if DEBUG_KP_PIXMAP_FX && 0 kdDebug () << "\ttranslate top=" << painter.xForm (TQPoint (0, 0)) << endl; - kdDebug () << "\tmatrix: m11=" << painter.tqworldMatrix ().m11 () - << " m12=" << painter.tqworldMatrix ().m12 () - << " m21=" << painter.tqworldMatrix ().m21 () - << " m22=" << painter.tqworldMatrix ().m22 () - << " dx=" << painter.tqworldMatrix ().dx () - << " dy=" << painter.tqworldMatrix ().dy () + kdDebug () << "\tmatrix: m11=" << painter.worldMatrix ().m11 () + << " m12=" << painter.worldMatrix ().m12 () + << " m21=" << painter.worldMatrix ().m21 () + << " m22=" << painter.worldMatrix ().m22 () + << " dx=" << painter.worldMatrix ().dx () + << " dy=" << painter.worldMatrix ().dy () << endl; #endif painter.drawPixmap (TQPoint (0, 0), pm); diff --git a/kolourpaint/tools/kptoolresizescale.cpp b/kolourpaint/tools/kptoolresizescale.cpp index 40270e1f..27d8ab15 100644 --- a/kolourpaint/tools/kptoolresizescale.cpp +++ b/kolourpaint/tools/kptoolresizescale.cpp @@ -665,17 +665,17 @@ void kpToolResizeScaleDialog::createOperationGroupBox (TQWidget *baseWidget) // TODO: ALT+R doesn't select the button. m_resizeButton = new TQToolButton (m_operationGroupBox); toolButtonSetLook (m_resizeButton, - TQString::tqfromLatin1 ("resize"), + TQString::fromLatin1 ("resize"), i18n ("&Resize")); m_scaleButton = new TQToolButton (m_operationGroupBox); toolButtonSetLook (m_scaleButton, - TQString::tqfromLatin1 ("scale"), + TQString::fromLatin1 ("scale"), i18n ("&Scale")); m_smoothScaleButton = new TQToolButton (m_operationGroupBox); toolButtonSetLook (m_smoothScaleButton, - TQString::tqfromLatin1 ("smooth_scale"), + TQString::fromLatin1 ("smooth_scale"), i18n ("S&mooth Scale")); @@ -684,9 +684,9 @@ void kpToolResizeScaleDialog::createOperationGroupBox (TQWidget *baseWidget) //m_smoothScaleLabel = new TQLabel (i18n ("S&mooth scale"), m_operationGroupBox); - //m_resizeLabel->tqsetAlignment (m_resizeLabel->tqalignment () | TQt::ShowPrefix); - //m_scaleLabel->tqsetAlignment (m_scaleLabel->tqalignment () | TQt::ShowPrefix); - //m_smoothScaleLabel->tqsetAlignment (m_smoothScaleLabel->tqalignment () | TQt::ShowPrefix); + //m_resizeLabel->setAlignment (m_resizeLabel->tqalignment () | TQt::ShowPrefix); + //m_scaleLabel->setAlignment (m_scaleLabel->tqalignment () | TQt::ShowPrefix); + //m_smoothScaleLabel->setAlignment (m_smoothScaleLabel->tqalignment () | TQt::ShowPrefix); TQButtonGroup *resizeScaleButtonGroup = new TQButtonGroup (baseWidget); @@ -727,9 +727,9 @@ void kpToolResizeScaleDialog::createDimensionsGroupBox (TQWidget *baseWidget) m_dimensionsGroupBox = new TQGroupBox (i18n ("Dimensions"), baseWidget); TQLabel *widthLabel = new TQLabel (i18n ("Width:"), m_dimensionsGroupBox); - widthLabel->tqsetAlignment (widthLabel->tqalignment () | TQt::AlignHCenter); + widthLabel->setAlignment (widthLabel->tqalignment () | TQt::AlignHCenter); TQLabel *heightLabel = new TQLabel (i18n ("Height:"), m_dimensionsGroupBox); - heightLabel->tqsetAlignment (heightLabel->tqalignment () | TQt::AlignHCenter); + heightLabel->setAlignment (heightLabel->tqalignment () | TQt::AlignHCenter); TQLabel *originalLabel = new TQLabel (i18n ("Original:"), m_dimensionsGroupBox); m_originalWidthInput = new KIntNumInput ( diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.cpp b/kolourpaint/widgets/kpcolorsimilaritycube.cpp index b2f3441a..edea872e 100644 --- a/kolourpaint/widgets/kpcolorsimilaritycube.cpp +++ b/kolourpaint/widgets/kpcolorsimilaritycube.cpp @@ -138,7 +138,7 @@ void kpColorSimilarityCube::setColorSimilarity (double similarity) // protected virtual [base TQWidget] -TQSize kpColorSimilarityCube::tqsizeHint () const +TQSize kpColorSimilarityCube::sizeHint () const { return TQSize (52, 52); } @@ -247,8 +247,8 @@ void kpColorSimilarityCube::drawFace (TQPainter *p, #if DEBUG_KP_COLOR_SIMILARITY_CUBE kdDebug () << "\tnot enabled - making us grey" << endl; #endif - colors [0] = tqcolorGroup ().background (); - colors [1] = tqcolorGroup ().background (); + colors [0] = colorGroup ().background (); + colors [1] = colorGroup ().background (); } #if DEBUG_KP_COLOR_SIMILARITY_CUBE @@ -274,7 +274,7 @@ void kpColorSimilarityCube::drawContents (TQPainter *p) TQRect cr (contentsRect ()); TQPixmap backBuffer (cr.width (), cr.height ()); - backBuffer.fill (tqcolorGroup ().background ()); + backBuffer.fill (colorGroup ().background ()); TQPainter backBufferPainter (&backBuffer); diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.h b/kolourpaint/widgets/kpcolorsimilaritycube.h index 0cf9f92a..a5f1db9f 100644 --- a/kolourpaint/widgets/kpcolorsimilaritycube.h +++ b/kolourpaint/widgets/kpcolorsimilaritycube.h @@ -55,7 +55,7 @@ public: double colorSimilarity () const; void setColorSimilarity (double similarity); - virtual TQSize tqsizeHint () const; + virtual TQSize sizeHint () const; protected: TQColor color (int redOrGreenOrBlue, int baseBrightness, int similarityDirection) const; diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp index cfdb6820..c66cedb4 100644 --- a/kolourpaint/widgets/kpcolortoolbar.cpp +++ b/kolourpaint/widgets/kpcolortoolbar.cpp @@ -150,7 +150,7 @@ kpColor kpDualColorButton::oldBackgroundColor () const // public virtual [base TQWidget] -TQSize kpDualColorButton::tqsizeHint () const +TQSize kpDualColorButton::sizeHint () const { return TQSize (52, 52); } @@ -318,14 +318,14 @@ void kpDualColorButton::drawContents (TQPainter *p) else { backBufferPainter.fillRect (m_backBuffer->rect (), - tqcolorGroup ().color (TQColorGroup::Background)); + colorGroup ().color (TQColorGroup::Background)); } TQPixmap swapPixmap = UserIcon ("colorbutton_swap_16x16"); if (!isEnabled ()) { // swapPixmap has a mask after all - swapPixmap.fill (tqcolorGroup ().color (TQColorGroup::Dark)); + swapPixmap.fill (colorGroup ().color (TQColorGroup::Dark)); } backBufferPainter.drawPixmap (swapPixmapRect ().topLeft (), swapPixmap); @@ -346,8 +346,8 @@ void kpDualColorButton::drawContents (TQPainter *p) backBufferPainter.drawPixmap (bgRectInside, UserIcon ("color_transparent_26x26")); } else - backBufferPainter.fillRect (bgRectInside, tqcolorGroup ().color (TQColorGroup::Button)); - qDrawShadePanel (&backBufferPainter, bgRect, tqcolorGroup (), + backBufferPainter.fillRect (bgRectInside, colorGroup ().color (TQColorGroup::Button)); + qDrawShadePanel (&backBufferPainter, bgRect, colorGroup (), false/*not sunken*/, 2/*lineWidth*/, 0/*never fill*/); @@ -366,8 +366,8 @@ void kpDualColorButton::drawContents (TQPainter *p) backBufferPainter.drawPixmap (fgRectInside, UserIcon ("color_transparent_26x26")); } else - backBufferPainter.fillRect (fgRectInside, tqcolorGroup ().color (TQColorGroup::Button)); - qDrawShadePanel (&backBufferPainter, fgRect, tqcolorGroup (), + backBufferPainter.fillRect (fgRectInside, colorGroup ().color (TQColorGroup::Button)); + qDrawShadePanel (&backBufferPainter, fgRect, colorGroup (), false/*not sunken*/, 2/*lineWidth*/, 0/*never fill*/); @@ -768,7 +768,7 @@ kpTransparentColorCell::~kpTransparentColorCell () // public virtual [base TQWidget] -TQSize kpTransparentColorCell::tqsizeHint () const +TQSize kpTransparentColorCell::sizeHint () const { return TQSize (m_pixmap.width () + frameWidth () * 2, m_pixmap.height () + frameWidth () * 2); @@ -829,7 +829,7 @@ kpColorPalette::kpColorPalette (TQWidget *parent, #endif m_transparentColorCell = new kpTransparentColorCell (this); - m_transparentColorCell->tqsetSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_transparentColorCell->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed); connect (m_transparentColorCell, TQT_SIGNAL (foregroundColorChanged (const kpColor &)), this, TQT_SIGNAL (foregroundColorChanged (const kpColor &))); connect (m_transparentColorCell, TQT_SIGNAL (backgroundColorChanged (const kpColor &)), @@ -964,7 +964,7 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow, 5/*margin*/, (10 * 4)/*spacing*/); m_dualColorButton = new kpDualColorButton (mainWindow, base); - m_dualColorButton->tqsetSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_dualColorButton->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed); connect (m_dualColorButton, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)), this, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &))); connect (m_dualColorButton, TQT_SIGNAL (foregroundColorChanged (const kpColor &)), @@ -981,7 +981,7 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow, m_boxLayout->addWidget (m_colorPalette, 0/*stretch*/); m_colorSimilarityToolBarItem = new kpColorSimilarityToolBarItem (mainWindow, base); - m_colorSimilarityToolBarItem->tqsetSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_colorSimilarityToolBarItem->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed); connect (m_colorSimilarityToolBarItem, TQT_SIGNAL (colorSimilarityChanged (double, int)), this, TQT_SIGNAL (colorSimilarityChanged (double, int))); m_boxLayout->addWidget (m_colorSimilarityToolBarItem, 0/*stretch*/); diff --git a/kolourpaint/widgets/kpcolortoolbar.h b/kolourpaint/widgets/kpcolortoolbar.h index 59f13fb7..7c005441 100644 --- a/kolourpaint/widgets/kpcolortoolbar.h +++ b/kolourpaint/widgets/kpcolortoolbar.h @@ -91,7 +91,7 @@ public: kpColor oldBackgroundColor () const; public: - virtual TQSize tqsizeHint () const; + virtual TQSize sizeHint () const; protected: TQRect swapPixmapRect () const; @@ -163,7 +163,7 @@ public: kpTransparentColorCell (TQWidget *parent, const char *name = 0); virtual ~kpTransparentColorCell (); - virtual TQSize tqsizeHint () const; + virtual TQSize sizeHint () const; signals: void transparentColorSelected (int mouseButton); diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.cpp b/kolourpaint/widgets/kpsqueezedtextlabel.cpp index 6e7386ec..dc500b12 100644 --- a/kolourpaint/widgets/kpsqueezedtextlabel.cpp +++ b/kolourpaint/widgets/kpsqueezedtextlabel.cpp @@ -53,11 +53,11 @@ kpSqueezedTextLabel::kpSqueezedTextLabel (const TQString &text, TQWidget *parent // public virtual -TQSize kpSqueezedTextLabel::tqminimumSizeHint () const +TQSize kpSqueezedTextLabel::minimumSizeHint () const { #if DEBUG_KP_STQUEEZED_TEXT_LABEL && 1 - kdDebug () << "kpSqueezedTextLabel::tqminimumSizeHint() qLabel prefers" - << TQLabel::tqminimumSizeHint () << endl; + kdDebug () << "kpSqueezedTextLabel::minimumSizeHint() qLabel prefers" + << TQLabel::minimumSizeHint () << endl; #endif return TQSize (-1/*no minimum width*/, TQLabel::minimumHeight ()); } diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.h b/kolourpaint/widgets/kpsqueezedtextlabel.h index 4697af8a..e4828b54 100644 --- a/kolourpaint/widgets/kpsqueezedtextlabel.h +++ b/kolourpaint/widgets/kpsqueezedtextlabel.h @@ -43,7 +43,7 @@ public: kpSqueezedTextLabel (TQWidget *parent, const char *name = 0); kpSqueezedTextLabel (const TQString &text, TQWidget *parent, const char *name = 0); - virtual TQSize tqminimumSizeHint () const; + virtual TQSize minimumSizeHint () const; // TODO: maybe text() should return the full text? TQString fullText () const; diff --git a/kolourpaint/widgets/kptoolwidgetbase.cpp b/kolourpaint/widgets/kptoolwidgetbase.cpp index 3d1d3cff..18177804 100644 --- a/kolourpaint/widgets/kptoolwidgetbase.cpp +++ b/kolourpaint/widgets/kptoolwidgetbase.cpp @@ -175,10 +175,10 @@ TQPair <int, int> kpToolWidgetBase::defaultSelectedRowAndCol () const KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools); KConfigBase *cfg = cfgGroupSaver.config (); - TQString nameString = TQString::tqfromLatin1 (name ()); + TQString nameString = TQString::fromLatin1 (name ()); - row = cfg->readNumEntry (nameString + TQString::tqfromLatin1 (" Row"), -1); - col = cfg->readNumEntry (nameString + TQString::tqfromLatin1 (" Col"), -1); + row = cfg->readNumEntry (nameString + TQString::fromLatin1 (" Row"), -1); + col = cfg->readNumEntry (nameString + TQString::fromLatin1 (" Col"), -1); } #if DEBUG_KP_TOOL_WIDGET_BASE @@ -218,9 +218,9 @@ void kpToolWidgetBase::saveSelectedAsDefault () const KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools); KConfigBase *cfg = cfgGroupSaver.config (); - TQString nameString = TQString::tqfromLatin1 (name ()); - cfg->writeEntry (nameString + TQString::tqfromLatin1 (" Row"), m_selectedRow); - cfg->writeEntry (nameString + TQString::tqfromLatin1 (" Col"), m_selectedCol); + TQString nameString = TQString::fromLatin1 (name ()); + cfg->writeEntry (nameString + TQString::fromLatin1 (" Row"), m_selectedRow); + cfg->writeEntry (nameString + TQString::fromLatin1 (" Col"), m_selectedCol); cfg->sync (); } diff --git a/kooka/img_saver.cpp b/kooka/img_saver.cpp index 847023d1..dee577b4 100644 --- a/kooka/img_saver.cpp +++ b/kooka/img_saver.cpp @@ -116,7 +116,7 @@ FormatDialog::FormatDialog( TQWidget *parent, const TQString&, const char *name Q_CHECK_PTR(l_help); l_help->setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); l_help->setText( i18n("-No format selected-" )); - l_help->tqsetAlignment( AlignVCenter | AlignHCenter ); + l_help->setAlignment( AlignVCenter | AlignHCenter ); l_help->setMinimumWidth(230); // Insert Selbox for subformat @@ -208,11 +208,11 @@ TQCString FormatDialog::getSubFormat( ) const #include "formathelp.h" void FormatDialog::buildHelp( void ) { - format_help.insert( TQString::tqfromLatin1("BMP"), HELP_BMP ); - format_help.insert( TQString::tqfromLatin1("PNM"), HELP_PNM ); - format_help.insert( TQString::tqfromLatin1("JPEG"), HELP_JPG ); - format_help.insert( TQString::tqfromLatin1("JPG"), HELP_JPG ); - format_help.insert( TQString::tqfromLatin1("EPS"), HELP_EPS ); + format_help.insert( TQString::fromLatin1("BMP"), HELP_BMP ); + format_help.insert( TQString::fromLatin1("PNM"), HELP_PNM ); + format_help.insert( TQString::fromLatin1("JPEG"), HELP_JPG ); + format_help.insert( TQString::fromLatin1("JPG"), HELP_JPG ); + format_help.insert( TQString::fromLatin1("EPS"), HELP_EPS ); } diff --git a/kooka/imgnamecombo.cpp b/kooka/imgnamecombo.cpp index 8190d5bc..9364bef3 100644 --- a/kooka/imgnamecombo.cpp +++ b/kooka/imgnamecombo.cpp @@ -51,7 +51,7 @@ ImageNameCombo::~ImageNameCombo() void ImageNameCombo::slotPathRemove( KFileTreeBranch *branch, const TQString& relPath ) { - TQString path = branch->name() + TQString::tqfromLatin1(" - ") + relPath; + TQString path = branch->name() + TQString::fromLatin1(" - ") + relPath; kdDebug(28000) << "ImageNameCombo: Removing " << path << endl; TQString select = currentText(); @@ -82,7 +82,7 @@ void ImageNameCombo::slotGalleryPathChanged( KFileTreeBranch* branch, const TQSt { TQString newPath; - newPath = branch->name() + TQString::tqfromLatin1(" - ") + relativPath; + newPath = branch->name() + TQString::fromLatin1(" - ") + relativPath; kdDebug( 28000) << "Inserting " << newPath << " to combobox" << endl; diff --git a/kooka/imgprintdialog.cpp b/kooka/imgprintdialog.cpp index e79c92df..f96a47c9 100644 --- a/kooka/imgprintdialog.cpp +++ b/kooka/imgprintdialog.cpp @@ -127,7 +127,7 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n TQWidget *spaceEater = new TQWidget( this ); - spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); + spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); tqlayout->addWidget( spaceEater ); /* Set start values */ diff --git a/kooka/kocrbase.cpp b/kooka/kocrbase.cpp index 2cd5d20b..0de5c88c 100644 --- a/kooka/kocrbase.cpp +++ b/kooka/kocrbase.cpp @@ -129,7 +129,7 @@ void KOCRBase::imgIntro() m_previewPix = new TQLabel( m_imgHBox ); m_previewPix->setPixmap(TQPixmap()); m_previewPix->setFixedSize(m_previewSize); - m_previewPix->tqsetAlignment( TQt::AlignCenter ); + m_previewPix->setAlignment( TQt::AlignCenter ); m_previewPix->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); // m_previewPix->resize(m_previewSize); @@ -164,7 +164,7 @@ void KOCRBase::ocrIntro( ) hb_cap->setSpacing( KDialog::spacingHint()); TQLabel *imgLab = new TQLabel( hb_cap ); - imgLab->tqsetAlignment( TQt::AlignHCenter | TQt::AlignTop ); + imgLab->setAlignment( TQt::AlignHCenter | TQt::AlignTop ); imgLab->setPixmap( pix ); pa = hb_cap; } @@ -188,7 +188,7 @@ void KOCRBase::spellCheckIntro() KSpellConfig *sCfg = new KSpellConfig( m_gbSpellOpts, "SPELLCHK", m_spellConfig, false ); /* A space eater */ TQWidget *spaceEater = new TQWidget(m_spellchkPage); - spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); + spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); /* connect toggle button */ connect( m_cbWantCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slWantSpellcheck(bool))); @@ -285,7 +285,7 @@ void KOCRBase::introduceImage( KookaImage* img) } } TQWidget *spaceEater = new TQWidget( m_metaBox ); - spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); + spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); m_metaBox->show(); } diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp index dc05a622..4750bf07 100644 --- a/kooka/kooka.cpp +++ b/kooka/kooka.cpp @@ -96,7 +96,7 @@ Kooka::Kooka( const TQCString& deviceToUse) changeCaption( i18n( "KDE Scanning" )); - setAutoSaveSettings( TQString::tqfromLatin1("General Options"), + setAutoSaveSettings( TQString::fromLatin1("General Options"), true ); } diff --git a/kooka/kookapref.cpp b/kooka/kookapref.cpp index bebd60fa..45d0ee01 100644 --- a/kooka/kookapref.cpp +++ b/kooka/kookapref.cpp @@ -149,7 +149,7 @@ void KookaPreferences::setupOCRPage() #endif top->addWidget( kgp ); TQWidget *spaceEater = new TQWidget( page ); - spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); + spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); top->addWidget( spaceEater ); /* @@ -418,8 +418,8 @@ void KookaPreferences::setupThumbnailPage() /* Frame Stuff */ int frameWidth = konf->readNumEntry( THUMB_MARGIN, 3 ); - TQColor col1 = konf->readColorEntry( MARGIN_COLOR1, &(tqcolorGroup().base())); - TQColor col2 = konf->readColorEntry( MARGIN_COLOR2, &(tqcolorGroup().foreground())); + TQColor col1 = konf->readColorEntry( MARGIN_COLOR1, &(colorGroup().base())); + TQColor col2 = konf->readColorEntry( MARGIN_COLOR2, &(colorGroup().foreground())); TQGrid *fGrid = new TQGrid( 2, hgb3 ); fGrid->setSpacing( 2 ); @@ -457,7 +457,7 @@ void KookaPreferences::slotApply( void ) /* ** startup options ** */ /** write the global one, to read from libkscan also */ - konf->setGroup(TQString::tqfromLatin1(GROUP_STARTUP)); + konf->setGroup(TQString::fromLatin1(GROUP_STARTUP)); bool cbVal = !(cbShowScannerSelection->isChecked()); kdDebug(28000) << "Writing for " << STARTUP_SKIP_ASK << ": " << cbVal << endl; konf->writeEntry( STARTUP_SKIP_ASK, cbVal, true, true ); /* global flag goes to kdeglobals */ @@ -532,8 +532,8 @@ void KookaPreferences::slotDefault( void ) m_tileSelector->setURL( KURL(bgImg) ); m_thumbWidth->setValue( 100 ); m_thumbHeight->setValue( 120 ); - TQColor col1 = TQColor( tqcolorGroup().base()); - TQColor col2 = TQColor( tqcolorGroup().foreground()); + TQColor col1 = TQColor( colorGroup().base()); + TQColor col2 = TQColor( colorGroup().foreground()); m_frameWidth->setValue( 3 ); m_colButt1->setColor( col1 ); diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp index 5586ee43..e177df5c 100644 --- a/kooka/kookaview.cpp +++ b/kooka/kookaview.cpp @@ -164,7 +164,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU TQHBox *recentBox = new TQHBox( m_dockRecent ); recentBox->setMargin(KDialog::marginHint()); TQLabel *lab = new TQLabel( i18n("Gallery:"), recentBox ); - lab->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) ); + lab->setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) ); recentFolder = new ImageNameCombo( recentBox ); m_dockRecent->setWidget( recentBox ); @@ -277,7 +277,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU packager->openRoots(); - /* tqStatus Bar */ + /* Status Bar */ KStatusBar *statBar = m_mainWindow->statusBar(); // statBar->insertItem(TQString("1"), SBAR_ZOOM, 0, true ); @@ -842,7 +842,7 @@ void KookaView::slShowAImage( KookaImage *img ) ocrFabric->slSetImage( img ); } - /* tqStatus Bar */ + /* Status Bar */ KStatusBar *statBar = m_mainWindow->statusBar(); if( img_canvas ) statBar->changeItem( img_canvas->imageInfoString(), StatusImage ); diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp index 9a8c9d3a..c553a7ae 100644 --- a/kooka/scanpackager.cpp +++ b/kooka/scanpackager.cpp @@ -463,7 +463,7 @@ void ScanPackager::slotSelectDirectory( const TQString & dirString ) { kdDebug(28000) << "Trying to decode directory string " << dirString << endl; - TQString searchFor = TQString::tqfromLatin1(" - "); + TQString searchFor = TQString::fromLatin1(" - "); int pos = dirString.find( searchFor ); if( pos > -1 ) diff --git a/kooka/thumbview.cpp b/kooka/thumbview.cpp index a431f1ea..570459f4 100644 --- a/kooka/thumbview.cpp +++ b/kooka/thumbview.cpp @@ -91,14 +91,14 @@ bool ThumbView::readSettings() bool dirty = false; TQColor color; - color = cfg->readColorEntry( MARGIN_COLOR1, &(tqcolorGroup().base())); + color = cfg->readColorEntry( MARGIN_COLOR1, &(colorGroup().base())); if( color != m_marginColor1 ) { dirty = true; m_marginColor1 = color; } - color = cfg->readColorEntry( MARGIN_COLOR2, &(tqcolorGroup().foreground())); + color = cfg->readColorEntry( MARGIN_COLOR2, &(colorGroup().foreground())); if( color != m_marginColor2 ) { dirty = true; diff --git a/kpdf/conf/dlgaccessibility.ui b/kpdf/conf/dlgaccessibility.ui index 9d7b9da2..113a3671 100644 --- a/kpdf/conf/dlgaccessibility.ui +++ b/kpdf/conf/dlgaccessibility.ui @@ -154,7 +154,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -196,7 +196,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -234,7 +234,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>48</width> <height>21</height> @@ -262,7 +262,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -290,7 +290,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>48</width> <height>21</height> @@ -318,7 +318,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -375,7 +375,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>48</width> <height>21</height> @@ -392,7 +392,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -409,7 +409,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -426,7 +426,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>48</width> <height>21</height> diff --git a/kpdf/conf/dlggeneral.ui b/kpdf/conf/dlggeneral.ui index b042d261..517db931 100644 --- a/kpdf/conf/dlggeneral.ui +++ b/kpdf/conf/dlggeneral.ui @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>1</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kpdf/conf/dlgperformance.ui b/kpdf/conf/dlgperformance.ui index dab4ffcc..b495e05f 100644 --- a/kpdf/conf/dlgperformance.ui +++ b/kpdf/conf/dlgperformance.ui @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>1</height> @@ -210,7 +210,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>1</height> @@ -231,7 +231,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>16</height> diff --git a/kpdf/conf/dlgpresentation.ui b/kpdf/conf/dlgpresentation.ui index 8d3a6c8c..a7bb5c28 100644 --- a/kpdf/conf/dlgpresentation.ui +++ b/kpdf/conf/dlgpresentation.ui @@ -258,7 +258,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>1</height> diff --git a/kpdf/core/document.cpp b/kpdf/core/document.cpp index 2074789d..84566364 100644 --- a/kpdf/core/document.cpp +++ b/kpdf/core/document.cpp @@ -1067,7 +1067,7 @@ void KPDFDocument::processLink( const KPDFLink * link ) case KPDFLink::Browse: { const KPDFLinkBrowse * browse = static_cast< const KPDFLinkBrowse * >( link ); // if the url is a mailto one, invoke mailer - if ( browse->url().tqstartsWith( "mailto:", false ) ) + if ( browse->url().startsWith( "mailto:", false ) ) kapp->invokeMailer( browse->url() ); else { diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp index 6550a543..0133e010 100644 --- a/kpdf/core/generator_pdf/generator_pdf.cpp +++ b/kpdf/core/generator_pdf/generator_pdf.cpp @@ -1017,10 +1017,10 @@ void PDFGenerator::addTransition( int pageNumber, KPDFPage * page ) switch ( pdfTransition->getAlignment() ) { case PageTransition::Horizontal: - transition->tqsetAlignment( KPDFPageTransition::Horizontal ); + transition->setAlignment( KPDFPageTransition::Horizontal ); break; case PageTransition::Vertical: - transition->tqsetAlignment( KPDFPageTransition::Vertical ); + transition->setAlignment( KPDFPageTransition::Vertical ); break; } diff --git a/kpdf/core/pagetransition.h b/kpdf/core/pagetransition.h index 25280437..bc2740ab 100644 --- a/kpdf/core/pagetransition.h +++ b/kpdf/core/pagetransition.h @@ -67,7 +67,7 @@ class KPDFPageTransition inline void setType( Type type ) { m_type = type; } inline void setDuration( int duration ) { m_duration = duration; } - inline void tqsetAlignment( Alignment tqalignment ) { m_tqalignment = tqalignment; } + inline void setAlignment( Alignment tqalignment ) { m_tqalignment = tqalignment; } inline void setDirection( Direction direction ) { m_direction = direction; } inline void setAngle( int angle ) { m_angle = angle; } inline void setScale( double scale ) { m_scale = scale; } diff --git a/kpdf/part.cpp b/kpdf/part.cpp index eec5e95b..1e222000 100644 --- a/kpdf/part.cpp +++ b/kpdf/part.cpp @@ -151,7 +151,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName, connect( m_document, TQT_SIGNAL( openURL(const KURL &) ), this, TQT_SLOT( openURLFromDocument(const KURL &) ) ); connect( m_document, TQT_SIGNAL( close() ), this, TQT_SLOT( close() ) ); - if (parent && parent->tqmetaObject()->slotNames(true).contains("slotQuit()")) + if (parent && parent->metaObject()->slotNames(true).contains("slotQuit()")) connect( m_document, TQT_SIGNAL( quit() ), parent, TQT_SLOT( slotQuit() ) ); else connect( m_document, TQT_SIGNAL( quit() ), this, TQT_SLOT( cannotQuit() ) ); diff --git a/kpdf/ui/minibar.cpp b/kpdf/ui/minibar.cpp index fed4602e..864291c5 100644 --- a/kpdf/ui/minibar.cpp +++ b/kpdf/ui/minibar.cpp @@ -198,7 +198,7 @@ void MiniBar::notifyViewportChanged( bool /*smoothMove*/ ) void MiniBar::resizeEvent( TQResizeEvent * e ) { // auto-hide 'prev' and 'next' buttons if not enough space - const TQSize & myHint = tqminimumSizeHint(); + const TQSize & myHint = minimumSizeHint(); bool shown = m_prevButton->isVisible() && m_nextButton->isVisible(); if ( shown && e->size().width() < myHint.width() ) { @@ -208,7 +208,7 @@ void MiniBar::resizeEvent( TQResizeEvent * e ) } else if ( !shown ) { - int histeresis = m_prevButton->tqsizeHint().width() * 2 + 2; + int histeresis = m_prevButton->sizeHint().width() * 2 + 2; if ( e->size().width() > (myHint.width() + histeresis) ) { m_prevButton->show(); @@ -337,7 +337,7 @@ PagesEdit::PagesEdit( MiniBar * parent ) setValidator( m_validator ); // customize text properties - tqsetAlignment( TQt::AlignCenter ); + setAlignment( TQt::AlignCenter ); setMaxLength( 4 ); } diff --git a/kpdf/ui/pagepainter.cpp b/kpdf/ui/pagepainter.cpp index 21e9c37f..27a9626e 100644 --- a/kpdf/ui/pagepainter.cpp +++ b/kpdf/ui/pagepainter.cpp @@ -139,7 +139,7 @@ void PagePainter::paintPageOnPainter( const KPDFPage * page, int id, int flags, { case KpdfSettings::EnumRenderMode::Inverted: // Invert image pixels using TQImage internal function - backImage.tqinvertPixels(false); + backImage.invertPixels(false); break; case KpdfSettings::EnumRenderMode::Recolor: // Recolor image using KImageEffect::flatten with dither:0 diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp index de5fad0c..b44b320c 100644 --- a/kpdf/ui/pageview.cpp +++ b/kpdf/ui/pageview.cpp @@ -592,7 +592,7 @@ void PageView::viewportPaintEvent( TQPaintEvent * pe ) TQImage blendedImage = blendedPixmap.convertToImage(); KImageEffect::blend( selBlendColor.dark(140), blendedImage, 0.2 ); // copy the blended pixmap back to its place - pixmapPainter.tqdrawPixmap( blendRect.left(), blendRect.top(), blendedImage ); + pixmapPainter.drawPixmap( blendRect.left(), blendRect.top(), blendedImage ); } // draw border (red if the selection is too small) pixmapPainter.setPen( selBlendColor ); @@ -1105,16 +1105,16 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e ) for ( ; iIt != iEnd; ++iIt ) { PageViewItem * item = *iIt; - const TQRect & tqitemRect = item->tqgeometry(); - if ( selectionRect.intersects( tqitemRect ) ) + const TQRect & itemRect = item->tqgeometry(); + if ( selectionRect.intersects( itemRect ) ) { // request the textpage if there isn't one const KPDFPage * kpdfPage = item->page(); if ( !kpdfPage->hasSearchPage() ) d->document->requestTextPage( kpdfPage->number() ); - // grab text in the rect that intersects tqitemRect - TQRect relativeRect = selectionRect.intersect( tqitemRect ); - relativeRect.moveBy( -tqitemRect.left(), -tqitemRect.top() ); + // grab text in the rect that intersects itemRect + TQRect relativeRect = selectionRect.intersect( itemRect ); + relativeRect.moveBy( -itemRect.left(), -itemRect.top() ); NormalizedRect normRect( relativeRect, item->width(), item->height() ); selectedText += kpdfPage->getText( normRect ); } diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp index 6e8f52c2..4e8373ca 100644 --- a/kpdf/ui/presentationwidget.cpp +++ b/kpdf/ui/presentationwidget.cpp @@ -837,14 +837,14 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const case KpdfSettings::EnumSlidesTransition::BlindsHorizontal: { KPDFPageTransition transition( KPDFPageTransition::Blinds ); - transition.tqsetAlignment( KPDFPageTransition::Horizontal ); + transition.setAlignment( KPDFPageTransition::Horizontal ); return transition; break; } case KpdfSettings::EnumSlidesTransition::BlindsVertical: { KPDFPageTransition transition( KPDFPageTransition::Blinds ); - transition.tqsetAlignment( KPDFPageTransition::Vertical ); + transition.setAlignment( KPDFPageTransition::Vertical ); return transition; break; } @@ -896,7 +896,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const case KpdfSettings::EnumSlidesTransition::SplitHorizontalIn: { KPDFPageTransition transition( KPDFPageTransition::Split ); - transition.tqsetAlignment( KPDFPageTransition::Horizontal ); + transition.setAlignment( KPDFPageTransition::Horizontal ); transition.setDirection( KPDFPageTransition::Inward ); return transition; break; @@ -904,7 +904,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const case KpdfSettings::EnumSlidesTransition::SplitHorizontalOut: { KPDFPageTransition transition( KPDFPageTransition::Split ); - transition.tqsetAlignment( KPDFPageTransition::Horizontal ); + transition.setAlignment( KPDFPageTransition::Horizontal ); transition.setDirection( KPDFPageTransition::Outward ); return transition; break; @@ -912,7 +912,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const case KpdfSettings::EnumSlidesTransition::SplitVerticalIn: { KPDFPageTransition transition( KPDFPageTransition::Split ); - transition.tqsetAlignment( KPDFPageTransition::Vertical ); + transition.setAlignment( KPDFPageTransition::Vertical ); transition.setDirection( KPDFPageTransition::Inward ); return transition; break; @@ -920,7 +920,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const case KpdfSettings::EnumSlidesTransition::SplitVerticalOut: { KPDFPageTransition transition( KPDFPageTransition::Split ); - transition.tqsetAlignment( KPDFPageTransition::Vertical ); + transition.setAlignment( KPDFPageTransition::Vertical ); transition.setDirection( KPDFPageTransition::Outward ); return transition; break; diff --git a/kpdf/ui/propertiesdialog.cpp b/kpdf/ui/propertiesdialog.cpp index d9cee932..d49f28be 100644 --- a/kpdf/ui/propertiesdialog.cpp +++ b/kpdf/ui/propertiesdialog.cpp @@ -82,10 +82,10 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc) } // current width: left column + right column + dialog borders - int width = tqlayout->tqminimumSize().width() + valMaxWidth + marginHint() + spacingHint() + marginHint() + 30; + int width = tqlayout->minimumSize().width() + valMaxWidth + marginHint() + spacingHint() + marginHint() + 30; if (page2Layout) { - width = TQMAX( width, page2Layout->tqsizeHint().width() + marginHint() + spacingHint() + 31 ); + width = TQMAX( width, page2Layout->sizeHint().width() + marginHint() + spacingHint() + 31 ); } // stay inside the 2/3 of the screen width TQRect screenContainer = KGlobalSettings::desktopGeometry( this ); diff --git a/kpdf/ui/thumbnaillist.h b/kpdf/ui/thumbnaillist.h index 549ea20c..fb128045 100644 --- a/kpdf/ui/thumbnaillist.h +++ b/kpdf/ui/thumbnaillist.h @@ -102,7 +102,7 @@ class ThumbnailsBox : public TQVBox { public: ThumbnailsBox( TQWidget * parent ) : TQVBox( parent ) {}; - TQSize tqsizeHint() const { return TQSize(); } + TQSize sizeHint() const { return TQSize(); } }; /** diff --git a/kpovmodeler/pmactions.cpp b/kpovmodeler/pmactions.cpp index 18af4c37..0229c518 100644 --- a/kpovmodeler/pmactions.cpp +++ b/kpovmodeler/pmactions.cpp @@ -29,7 +29,7 @@ #include "pmdebug.h" // Fixed widths are calculated wrong in a toolbar. -// Fixed tqsizeHint for the combo box to return +// Fixed sizeHint for the combo box to return // at least the minimum size class PMComboBox : public TQComboBox { @@ -39,15 +39,15 @@ public: { } - virtual TQSize tqminimumSizeHint( ) const + virtual TQSize minimumSizeHint( ) const { - TQSize s = TQComboBox::tqminimumSizeHint( ); - return s.expandedTo( tqminimumSize( ) ); + TQSize s = TQComboBox::minimumSizeHint( ); + return s.expandedTo( minimumSize( ) ); } - virtual TQSize tqsizeHint( ) const + virtual TQSize sizeHint( ) const { - TQSize s = TQComboBox::tqsizeHint( ); - return s.expandedTo( tqminimumSize( ) ); + TQSize s = TQComboBox::sizeHint( ); + return s.expandedTo( minimumSize( ) ); } }; @@ -126,7 +126,7 @@ public: setText( text ); } protected: - TQSize tqsizeHint( ) const + TQSize sizeHint( ) const { int w = fontMetrics( ).width( text( ) ); int h = fontMetrics( ).height( ); @@ -135,10 +135,10 @@ protected: void drawButton( TQPainter* p ) { // Draw the background - tqstyle( ).tqdrawComplexControl( TQStyle::CC_ToolButton, p, this, rect( ), tqcolorGroup( ), + tqstyle( ).drawComplexControl( TQStyle::CC_ToolButton, p, this, rect( ), colorGroup( ), TQStyle::Style_Enabled, TQStyle::SC_ToolButton ); // Draw the label - tqstyle( ).tqdrawControl( TQStyle::CE_ToolButtonLabel, p, this, rect( ), tqcolorGroup( ), + tqstyle( ).drawControl( TQStyle::CE_ToolButtonLabel, p, this, rect( ), colorGroup( ), TQStyle::Style_Enabled ); } }; diff --git a/kpovmodeler/pmbicubicpatch.cpp b/kpovmodeler/pmbicubicpatch.cpp index dd281ceb..b4c363d5 100644 --- a/kpovmodeler/pmbicubicpatch.cpp +++ b/kpovmodeler/pmbicubicpatch.cpp @@ -209,11 +209,11 @@ void PMBicubicPatch::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMBicubicPatch::tqmetaObject( ) const +PMMetaObject* PMBicubicPatch::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "BicubicPatch", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "BicubicPatch", Base::metaObject( ), createNewBicubicPatch ); s_pMetaObject->addProperty( new PMBicubicPatchProperty( "patchType", &PMBicubicPatch::setPatchType, diff --git a/kpovmodeler/pmbicubicpatch.h b/kpovmodeler/pmbicubicpatch.h index 54baae43..d14f7821 100644 --- a/kpovmodeler/pmbicubicpatch.h +++ b/kpovmodeler/pmbicubicpatch.h @@ -55,7 +55,7 @@ public: /** */ virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmblendmapmodifiers.cpp b/kpovmodeler/pmblendmapmodifiers.cpp index e28fa7fb..9d26419e 100644 --- a/kpovmodeler/pmblendmapmodifiers.cpp +++ b/kpovmodeler/pmblendmapmodifiers.cpp @@ -57,11 +57,11 @@ PMBlendMapModifiers::~PMBlendMapModifiers( ) { } -PMMetaObject* PMBlendMapModifiers::tqmetaObject( ) const +PMMetaObject* PMBlendMapModifiers::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "BlendMapModifiers", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "BlendMapModifiers", Base::metaObject( ), createBlendMapModifiers ); s_pMetaObject->addProperty( new PMBlendMapModifiersProperty( "frequencyEnabled", &PMBlendMapModifiers::enableFrequency, diff --git a/kpovmodeler/pmblendmapmodifiers.h b/kpovmodeler/pmblendmapmodifiers.h index be5a863e..ecf0bfed 100644 --- a/kpovmodeler/pmblendmapmodifiers.h +++ b/kpovmodeler/pmblendmapmodifiers.h @@ -57,7 +57,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmblob.cpp b/kpovmodeler/pmblob.cpp index 317c18d7..6621cadf 100644 --- a/kpovmodeler/pmblob.cpp +++ b/kpovmodeler/pmblob.cpp @@ -77,11 +77,11 @@ void PMBlob::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMBlob::tqmetaObject( ) const +PMMetaObject* PMBlob::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Blob", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Blob", Base::metaObject( ), createNewBlob ); s_pMetaObject->addProperty( new PMBlobProperty( "threshold", &PMBlob::setThreshold, &PMBlob::threshold ) ); diff --git a/kpovmodeler/pmblob.h b/kpovmodeler/pmblob.h index 6bdbef31..2c764590 100644 --- a/kpovmodeler/pmblob.h +++ b/kpovmodeler/pmblob.h @@ -52,7 +52,7 @@ public: /** */ virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmblobcylinder.cpp b/kpovmodeler/pmblobcylinder.cpp index 114f4fa0..d166a6a3 100644 --- a/kpovmodeler/pmblobcylinder.cpp +++ b/kpovmodeler/pmblobcylinder.cpp @@ -93,11 +93,11 @@ void PMBlobCylinder::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMBlobCylinder::tqmetaObject( ) const +PMMetaObject* PMBlobCylinder::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "BlobCylinder", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "BlobCylinder", Base::metaObject( ), createNewBlobCylinder ); s_pMetaObject->addProperty( new PMBlobCylinderProperty( "end1", &PMBlobCylinder::setEnd1, diff --git a/kpovmodeler/pmblobcylinder.h b/kpovmodeler/pmblobcylinder.h index a07df1f6..1e9a10f1 100644 --- a/kpovmodeler/pmblobcylinder.h +++ b/kpovmodeler/pmblobcylinder.h @@ -57,7 +57,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const; diff --git a/kpovmodeler/pmblobsphere.cpp b/kpovmodeler/pmblobsphere.cpp index 70dcf06c..cbcd33a4 100644 --- a/kpovmodeler/pmblobsphere.cpp +++ b/kpovmodeler/pmblobsphere.cpp @@ -72,11 +72,11 @@ TQString PMBlobSphere::description( ) const return i18n( "blob sphere" ); } -PMMetaObject* PMBlobSphere::tqmetaObject( ) const +PMMetaObject* PMBlobSphere::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "BlobSphere", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "BlobSphere", Base::metaObject( ), createNewBlobSphere ); s_pMetaObject->addProperty( new PMBlobSphereProperty( "center", &PMBlobSphere::setCentre, diff --git a/kpovmodeler/pmblobsphere.h b/kpovmodeler/pmblobsphere.h index e734e399..0abe983e 100644 --- a/kpovmodeler/pmblobsphere.h +++ b/kpovmodeler/pmblobsphere.h @@ -55,7 +55,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const; diff --git a/kpovmodeler/pmboundedby.cpp b/kpovmodeler/pmboundedby.cpp index 467129e8..5cc66e55 100644 --- a/kpovmodeler/pmboundedby.cpp +++ b/kpovmodeler/pmboundedby.cpp @@ -40,11 +40,11 @@ PMBoundedBy::~PMBoundedBy( ) { } -PMMetaObject* PMBoundedBy::tqmetaObject( ) const +PMMetaObject* PMBoundedBy::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "BoundedBy", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "BoundedBy", Base::metaObject( ), createNewBoundedBy ); s_pMetaObject->addProperty( new PMBoundedByProperty( "clippedBy", 0, &PMBoundedBy::clippedBy ) ); diff --git a/kpovmodeler/pmboundedby.h b/kpovmodeler/pmboundedby.h index 256dc5f5..7c88a6aa 100644 --- a/kpovmodeler/pmboundedby.h +++ b/kpovmodeler/pmboundedby.h @@ -49,7 +49,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmbox.cpp b/kpovmodeler/pmbox.cpp index 6ecc2c3c..155ebc68 100644 --- a/kpovmodeler/pmbox.cpp +++ b/kpovmodeler/pmbox.cpp @@ -76,11 +76,11 @@ void PMBox::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMBox::tqmetaObject( ) const +PMMetaObject* PMBox::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Box", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Box", Base::metaObject( ), createNewBox ); s_pMetaObject->addProperty( new PMBoxProperty( "corner1", &PMBox::setCorner1, &PMBox::corner1 ) ); diff --git a/kpovmodeler/pmbox.h b/kpovmodeler/pmbox.h index 7896b779..e6abcf75 100644 --- a/kpovmodeler/pmbox.h +++ b/kpovmodeler/pmbox.h @@ -56,7 +56,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const; diff --git a/kpovmodeler/pmbumpmap.cpp b/kpovmodeler/pmbumpmap.cpp index 5c08040f..21fb29a3 100644 --- a/kpovmodeler/pmbumpmap.cpp +++ b/kpovmodeler/pmbumpmap.cpp @@ -200,11 +200,11 @@ void PMBumpMap::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMBumpMap::tqmetaObject( ) const +PMMetaObject* PMBumpMap::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "BumpMap", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "BumpMap", Base::metaObject( ), createNewBumpMap ); PMBitmapTypeProperty* bp = new PMBitmapTypeProperty( diff --git a/kpovmodeler/pmbumpmap.h b/kpovmodeler/pmbumpmap.h index ade1c1cd..ccdf5b98 100644 --- a/kpovmodeler/pmbumpmap.h +++ b/kpovmodeler/pmbumpmap.h @@ -72,7 +72,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmcamera.cpp b/kpovmodeler/pmcamera.cpp index e65b8341..ca37f751 100644 --- a/kpovmodeler/pmcamera.cpp +++ b/kpovmodeler/pmcamera.cpp @@ -165,11 +165,11 @@ void PMCamera::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMCamera::tqmetaObject( ) const +PMMetaObject* PMCamera::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Camera", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Camera", Base::metaObject( ), createNewCamera ); s_pMetaObject->addProperty( new PMCameraProperty( "location", &PMCamera::setLocation, diff --git a/kpovmodeler/pmcamera.h b/kpovmodeler/pmcamera.h index e0d1206e..7d385909 100644 --- a/kpovmodeler/pmcamera.h +++ b/kpovmodeler/pmcamera.h @@ -60,7 +60,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const; diff --git a/kpovmodeler/pmclippedby.cpp b/kpovmodeler/pmclippedby.cpp index b1499d0c..24ea4e46 100644 --- a/kpovmodeler/pmclippedby.cpp +++ b/kpovmodeler/pmclippedby.cpp @@ -40,11 +40,11 @@ PMClippedBy::~PMClippedBy( ) { } -PMMetaObject* PMClippedBy::tqmetaObject( ) const +PMMetaObject* PMClippedBy::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "ClippedBy", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "ClippedBy", Base::metaObject( ), createNewClippedBy ); s_pMetaObject->addProperty( new PMClippedByProperty( "boundedBy", 0, &PMClippedBy::boundedBy ) ); diff --git a/kpovmodeler/pmclippedby.h b/kpovmodeler/pmclippedby.h index 252a7db2..0e76e2cf 100644 --- a/kpovmodeler/pmclippedby.h +++ b/kpovmodeler/pmclippedby.h @@ -48,7 +48,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmcomment.cpp b/kpovmodeler/pmcomment.cpp index 3f659682..90c817fd 100644 --- a/kpovmodeler/pmcomment.cpp +++ b/kpovmodeler/pmcomment.cpp @@ -108,11 +108,11 @@ void PMComment::setText( const TQString& text ) } } -PMMetaObject* PMComment::tqmetaObject( ) const +PMMetaObject* PMComment::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Comment", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Comment", Base::metaObject( ), createNewComment ); s_pMetaObject->addProperty( new PMCommentProperty( "text", &PMComment::setText, &PMComment::text ) ); diff --git a/kpovmodeler/pmcomment.h b/kpovmodeler/pmcomment.h index 832863bc..d435423d 100644 --- a/kpovmodeler/pmcomment.h +++ b/kpovmodeler/pmcomment.h @@ -62,7 +62,7 @@ public: virtual PMObject* copy( ) const { return new PMComment( *this ); } /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmcompositeobject.cpp b/kpovmodeler/pmcompositeobject.cpp index 3699e716..d8b61e8c 100644 --- a/kpovmodeler/pmcompositeobject.cpp +++ b/kpovmodeler/pmcompositeobject.cpp @@ -67,10 +67,10 @@ PMCompositeObject::~PMCompositeObject( ) delete m_pViewStructure; } -PMMetaObject* PMCompositeObject::tqmetaObject( ) const +PMMetaObject* PMCompositeObject::metaObject( ) const { if( !s_pMetaObject ) - s_pMetaObject = new PMMetaObject( "CompositeObject", Base::tqmetaObject( ) ); + s_pMetaObject = new PMMetaObject( "CompositeObject", Base::metaObject( ) ); return s_pMetaObject; } @@ -84,7 +84,7 @@ void PMCompositeObject::cleanUp( ) const Base::cleanUp( ); } -PMObject* PMCompositeObject::tqchildAt( uint index ) const +PMObject* PMCompositeObject::childAt( uint index ) const { PMObject* tmp; uint i = 0; @@ -136,7 +136,7 @@ bool PMCompositeObject::insertChild( PMObject* o, int i ) } else { - PMObject* tmp = tqchildAt( ( uint ) ( i - 1 ) ); + PMObject* tmp = childAt( ( uint ) ( i - 1 ) ); if( !tmp ) { kdError( PMArea ) << "Index too big" << "\n"; @@ -272,7 +272,7 @@ bool PMCompositeObject::takeChild( PMObject* o ) bool PMCompositeObject::takeChild( uint i ) { - PMObject* tmp = tqchildAt( i ); + PMObject* tmp = childAt( i ); if( tmp ) return takeChild( tmp ); kdError( PMArea ) << "Index too big"; diff --git a/kpovmodeler/pmcompositeobject.h b/kpovmodeler/pmcompositeobject.h index 50298236..b970faf1 100644 --- a/kpovmodeler/pmcompositeobject.h +++ b/kpovmodeler/pmcompositeobject.h @@ -49,7 +49,7 @@ public: virtual ~PMCompositeObject( ); /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; @@ -65,7 +65,7 @@ public: * Returns a pointer to the child object at position index, * or null if the index is out of range. */ - virtual PMObject* tqchildAt( uint index ) const; + virtual PMObject* childAt( uint index ) const; /** * Returns true if the object contains the child object o diff --git a/kpovmodeler/pmcone.cpp b/kpovmodeler/pmcone.cpp index 014fbc0f..c6fd719e 100644 --- a/kpovmodeler/pmcone.cpp +++ b/kpovmodeler/pmcone.cpp @@ -100,11 +100,11 @@ void PMCone::readAttributes( const PMXMLHelper & h ) Base::readAttributes( h ); } -PMMetaObject* PMCone::tqmetaObject( ) const +PMMetaObject* PMCone::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Cone", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Cone", Base::metaObject( ), createNewCone ); s_pMetaObject->addProperty( new PMConeProperty( "end1", &PMCone::setEnd1, &PMCone::end1 ) ); diff --git a/kpovmodeler/pmcone.h b/kpovmodeler/pmcone.h index 25dacfd5..c41f9325 100644 --- a/kpovmodeler/pmcone.h +++ b/kpovmodeler/pmcone.h @@ -62,7 +62,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const; diff --git a/kpovmodeler/pmcsg.cpp b/kpovmodeler/pmcsg.cpp index 66532ac6..0ac7e58a 100644 --- a/kpovmodeler/pmcsg.cpp +++ b/kpovmodeler/pmcsg.cpp @@ -130,11 +130,11 @@ void PMCSG::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMCSG::tqmetaObject( ) const +PMMetaObject* PMCSG::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "CSG", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "CSG", Base::metaObject( ), createNewCSG ); PMCSGTypeProperty* p = new PMCSGTypeProperty( "csgType", &PMCSG::setCSGType, &PMCSG::csgType ); p->addEnumValue( "union", CSGUnion ); diff --git a/kpovmodeler/pmcsg.h b/kpovmodeler/pmcsg.h index 36184883..380bf0ef 100644 --- a/kpovmodeler/pmcsg.h +++ b/kpovmodeler/pmcsg.h @@ -62,7 +62,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmcylinder.cpp b/kpovmodeler/pmcylinder.cpp index c449189d..358cb542 100644 --- a/kpovmodeler/pmcylinder.cpp +++ b/kpovmodeler/pmcylinder.cpp @@ -97,11 +97,11 @@ void PMCylinder::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMCylinder::tqmetaObject( ) const +PMMetaObject* PMCylinder::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Cylinder", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Cylinder", Base::metaObject( ), createNewCylinder ); s_pMetaObject->addProperty( new PMCylinderProperty( "end1", &PMCylinder::setEnd1, &PMCylinder::end1 ) ); diff --git a/kpovmodeler/pmcylinder.h b/kpovmodeler/pmcylinder.h index cae308fe..1bd10901 100644 --- a/kpovmodeler/pmcylinder.h +++ b/kpovmodeler/pmcylinder.h @@ -58,7 +58,7 @@ public: /** */ virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const; diff --git a/kpovmodeler/pmdeclare.cpp b/kpovmodeler/pmdeclare.cpp index 089447bc..a5863582 100644 --- a/kpovmodeler/pmdeclare.cpp +++ b/kpovmodeler/pmdeclare.cpp @@ -47,11 +47,11 @@ PMDeclare::PMDeclare( const PMDeclare& d ) // base constuctor when the tqchildren are copied } -PMMetaObject* PMDeclare::tqmetaObject( ) const +PMMetaObject* PMDeclare::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Declare", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Declare", Base::metaObject( ), createNewDeclare ); s_pMetaObject->addProperty( new PMDeclareProperty( "id", &PMDeclare::setID, &PMDeclare::id ) ); @@ -180,9 +180,9 @@ void PMDeclare::updateDeclareType( ) if( o ) { if( o->isA( "GraphicalObject" ) ) - type = m->tqmetaObject( "GraphicalObject" ); + type = m->metaObject( "GraphicalObject" ); else - type = o->tqmetaObject( ); + type = o->metaObject( ); } setDeclareType( type ); } diff --git a/kpovmodeler/pmdeclare.h b/kpovmodeler/pmdeclare.h index 69915218..89468bf4 100644 --- a/kpovmodeler/pmdeclare.h +++ b/kpovmodeler/pmdeclare.h @@ -55,7 +55,7 @@ public: virtual TQString pixmap( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmdensity.cpp b/kpovmodeler/pmdensity.cpp index a742d514..3935b6be 100644 --- a/kpovmodeler/pmdensity.cpp +++ b/kpovmodeler/pmdensity.cpp @@ -43,11 +43,11 @@ PMDensity::~PMDensity( ) { } -PMMetaObject* PMDensity::tqmetaObject( ) const +PMMetaObject* PMDensity::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Density", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Density", Base::metaObject( ), createNewDensity ); } return s_pMetaObject; diff --git a/kpovmodeler/pmdensity.h b/kpovmodeler/pmdensity.h index c194f846..b1502fe2 100644 --- a/kpovmodeler/pmdensity.h +++ b/kpovmodeler/pmdensity.h @@ -52,7 +52,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmdetailobject.cpp b/kpovmodeler/pmdetailobject.cpp index 050729a4..5abc7e22 100644 --- a/kpovmodeler/pmdetailobject.cpp +++ b/kpovmodeler/pmdetailobject.cpp @@ -47,11 +47,11 @@ PMDetailObject::~PMDetailObject() { } -PMMetaObject* PMDetailObject::tqmetaObject( ) const +PMMetaObject* PMDetailObject::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "DetailObject", Base::tqmetaObject( ) ); + s_pMetaObject = new PMMetaObject( "DetailObject", Base::metaObject( ) ); s_pMetaObject->addProperty( new PMDetailObjectProperty( "globalDetail", &PMDetailObject::setGlobalDetail, &PMDetailObject::globalDetail ) ); s_pMetaObject->addProperty( diff --git a/kpovmodeler/pmdetailobject.h b/kpovmodeler/pmdetailobject.h index 10efae07..846ef8c0 100644 --- a/kpovmodeler/pmdetailobject.h +++ b/kpovmodeler/pmdetailobject.h @@ -43,7 +43,7 @@ public: virtual ~PMDetailObject(); /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmdialogview.cpp b/kpovmodeler/pmdialogview.cpp index 0a7f372e..be91b48e 100644 --- a/kpovmodeler/pmdialogview.cpp +++ b/kpovmodeler/pmdialogview.cpp @@ -69,7 +69,7 @@ void PMDialogEditContent::calculateSize( ) int fw = lineWidth( ) * 2; if( m_pContents ) { - TQSize newSize = m_pContents->tqminimumSizeHint( ); + TQSize newSize = m_pContents->minimumSizeHint( ); setVScrollBarMode( AlwaysOff ); setHScrollBarMode( AlwaysOff ); diff --git a/kpovmodeler/pmdisc.cpp b/kpovmodeler/pmdisc.cpp index 6f7bac55..bda89579 100644 --- a/kpovmodeler/pmdisc.cpp +++ b/kpovmodeler/pmdisc.cpp @@ -96,11 +96,11 @@ void PMDisc::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMDisc::tqmetaObject( ) const +PMMetaObject* PMDisc::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Disc", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Disc", Base::metaObject( ), createNewDisc ); s_pMetaObject->addProperty( new PMDiscProperty( "center", &PMDisc::setCenter, &PMDisc::center ) ); diff --git a/kpovmodeler/pmdisc.h b/kpovmodeler/pmdisc.h index b56e2175..62201bcf 100644 --- a/kpovmodeler/pmdisc.h +++ b/kpovmodeler/pmdisc.h @@ -58,7 +58,7 @@ public: /** */ virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const; diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp index 87fc37ef..733922f2 100644 --- a/kpovmodeler/pmdockwidget.cpp +++ b/kpovmodeler/pmdockwidget.cpp @@ -337,7 +337,7 @@ void PMDockWidgetHeaderDrag::paintEvent( TQPaintEvent* ) paint.begin( this ); - tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), tqcolorGroup()); + tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup()); paint.end(); } @@ -392,7 +392,7 @@ PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* parent, const char* name ) tqlayout->addWidget( stayButton ); tqlayout->addWidget( closeButton ); tqlayout->activate(); - drag->setFixedHeight( tqlayout->tqminimumSize().height() ); + drag->setFixedHeight( tqlayout->minimumSize().height() ); } void PMDockWidgetHeader::setTopLevel( bool isTopLevel ) @@ -436,7 +436,7 @@ void PMDockWidgetHeader::setDragPanel( PMDockWidgetHeaderDrag* nd ) tqlayout->addWidget( stayButton ); tqlayout->addWidget( closeButton ); tqlayout->activate(); - drag->setFixedHeight( tqlayout->tqminimumSize().height() ); + drag->setFixedHeight( tqlayout->minimumSize().height() ); } void PMDockWidgetHeader::slotStayClicked() @@ -1454,7 +1454,7 @@ PMDockWidget* PMDockManager::findDockWidgetAt( const TQPoint& pos ) return 0L; } #if defined(_OS_WIN32_) || defined(Q_OS_WIN32) - p = p->tqtopLevelWidget(); + p = p->topLevelWidget(); #endif TQWidget* w = 0L; findChildDockWidget( w, p, p->mapFromGlobal(pos) ); @@ -1692,7 +1692,7 @@ static TQDomElement createStringEntry(TQDomDocument &doc, const TQString &tagNam static TQDomElement createBoolEntry(TQDomDocument &doc, const TQString &tagName, bool b) { - return createStringEntry(doc, tagName, TQString::tqfromLatin1(b? "true" : "false")); + return createStringEntry(doc, tagName, TQString::fromLatin1(b? "true" : "false")); } @@ -1731,7 +1731,7 @@ static TQDomElement createListEntry(TQDomDocument &doc, const TQString &tagName, TQStrListIterator it(list); for (; it.current(); ++it) { TQDomElement subel = doc.createElement(subTagName); - subel.appendChild(doc.createTextNode(TQString::tqfromLatin1(it.current()))); + subel.appendChild(doc.createTextNode(TQString::fromLatin1(it.current()))); el.appendChild(subel); } @@ -1801,7 +1801,7 @@ void PMDockManager::writeConfig(TQDomElement &base) PMDockWidget *obj1; while ( (obj1=(PMDockWidget*)it.current()) ) { if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) ) - mainWidgetStr = TQString::tqfromLatin1(obj1->name()); + mainWidgetStr = TQString::fromLatin1(obj1->name()); nList.append(obj1->name()); ++it; } @@ -1841,7 +1841,7 @@ void PMDockManager::writeConfig(TQDomElement &base) groupEl = doc.createElement("dock"); } - groupEl.appendChild(createStringEntry(doc, "name", TQString::tqfromLatin1(obj->name()))); + groupEl.appendChild(createStringEntry(doc, "name", TQString::fromLatin1(obj->name()))); groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->parent())); if ( !obj->parent() ) { groupEl.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size()))); @@ -2372,14 +2372,14 @@ void PMDockManager::drawDragRectangle() PMDockMainWindow* pMain = 0L; PMDockWidget* pTLDockWdg = 0L; TQWidget* topWdg; - if (pDockWdgAtRect->tqtopLevelWidget() == main) { + if (pDockWdgAtRect->topLevelWidget() == main) { isOverMainWdg = true; topWdg = pMain = (PMDockMainWindow*) main; unclipped = pMain->testWFlags( WPaintUnclipped ); pMain->setWFlags( WPaintUnclipped ); } else { - topWdg = pTLDockWdg = (PMDockWidget*) pDockWdgAtRect->tqtopLevelWidget(); + topWdg = pTLDockWdg = (PMDockWidget*) pDockWdgAtRect->topLevelWidget(); unclipped = pTLDockWdg->testWFlags( WPaintUnclipped ); pTLDockWdg->setWFlags( WPaintUnclipped ); } diff --git a/kpovmodeler/pmdockwidget_private.cpp b/kpovmodeler/pmdockwidget_private.cpp index 9c97888f..c17b8c62 100644 --- a/kpovmodeler/pmdockwidget_private.cpp +++ b/kpovmodeler/pmdockwidget_private.cpp @@ -69,20 +69,20 @@ void PMDockSplitter::setupMinMaxSize() // Set the minimum and maximum sizes int minx, maxx, miny, maxy; if (orientation ==Qt::Horizontal) { - miny = child0->tqminimumSize().height() + child1->tqminimumSize().height()+4; - maxy = child0->tqmaximumSize().height() + child1->tqmaximumSize().height()+4; - minx = (child0->tqminimumSize().width() > child1->tqminimumSize().width()) ? child0->tqminimumSize().width() : child1->tqminimumSize().width(); - maxx = (child0->tqmaximumSize().width() > child1->tqmaximumSize().width()) ? child0->tqmaximumSize().width() : child1->tqmaximumSize().width(); + miny = child0->minimumSize().height() + child1->minimumSize().height()+4; + maxy = child0->maximumSize().height() + child1->maximumSize().height()+4; + minx = (child0->minimumSize().width() > child1->minimumSize().width()) ? child0->minimumSize().width() : child1->minimumSize().width(); + maxx = (child0->maximumSize().width() > child1->maximumSize().width()) ? child0->maximumSize().width() : child1->maximumSize().width(); miny = (miny > 4) ? miny : 4; maxy = (maxy < 32000) ? maxy : 32000; minx = (minx > 2) ? minx : 2; maxx = (maxx < 32000) ? maxx : 32000; } else { - minx = child0->tqminimumSize().width() + child1->tqminimumSize().width()+4; - maxx = child0->tqmaximumSize().width() + child1->tqmaximumSize().width()+4; - miny = (child0->tqminimumSize().height() > child1->tqminimumSize().height()) ? child0->tqminimumSize().height() : child1->tqminimumSize().height(); - maxy = (child0->tqmaximumSize().height() > child1->tqmaximumSize().height()) ? child0->tqmaximumSize().height() : child1->tqmaximumSize().height(); + minx = child0->minimumSize().width() + child1->minimumSize().width()+4; + maxx = child0->maximumSize().width() + child1->maximumSize().width()+4; + miny = (child0->minimumSize().height() > child1->minimumSize().height()) ? child0->minimumSize().height() : child1->minimumSize().height(); + maxy = (child0->maximumSize().height() > child1->maximumSize().height()) ? child0->maximumSize().height() : child1->maximumSize().height(); minx = (minx > 4) ? minx : 4; maxx = (maxx < 32000) ? maxx : 32000; @@ -143,15 +143,15 @@ int PMDockSplitter::checkValue( int position ) const { if (initialised){ if (orientation ==Qt::Vertical){ - if (position < (child0->tqminimumSize().width())) - position = child0->tqminimumSize().width(); - if ((width()-4-position) < (child1->tqminimumSize().width())) - position = width() - (child1->tqminimumSize().width()) -4; + if (position < (child0->minimumSize().width())) + position = child0->minimumSize().width(); + if ((width()-4-position) < (child1->minimumSize().width())) + position = width() - (child1->minimumSize().width()) -4; } else { - if (position < (child0->tqminimumSize().height())) - position = (child0->tqminimumSize().height()); - if ((height()-4-position) < (child1->tqminimumSize().height())) - position = height() - (child1->tqminimumSize().height()) -4; + if (position < (child0->minimumSize().height())) + position = (child0->minimumSize().height()); + if ((height()-4-position) < (child1->minimumSize().height())) + position = height() - (child1->minimumSize().height()) -4; } } @@ -301,7 +301,7 @@ PMDockButton_Private::~PMDockButton_Private() void PMDockButton_Private::drawButton( TQPainter* p ) { - p->fillRect( 0,0, width(), height(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)) ); + p->fillRect( 0,0, width(), height(), TQBrush(colorGroup().brush(TQColorGroup::Background)) ); p->drawPixmap( (width() - pixmap()->width()) / 2, (height() - pixmap()->height()) / 2, *pixmap() ); if ( moveMouse && !isDown() ){ p->setPen( white ); @@ -309,12 +309,12 @@ void PMDockButton_Private::drawButton( TQPainter* p ) p->lineTo( 0, 0 ); p->lineTo( width() - 1, 0 ); - p->setPen( tqcolorGroup().dark() ); + p->setPen( colorGroup().dark() ); p->lineTo( width() - 1, height() - 1 ); p->lineTo( 0, height() - 1 ); } if ( isOn() || isDown() ){ - p->setPen( tqcolorGroup().dark() ); + p->setPen( colorGroup().dark() ); p->moveTo( 0, height() - 1 ); p->lineTo( 0, 0 ); p->lineTo( width() - 1, 0 ); diff --git a/kpovmodeler/pmfinish.cpp b/kpovmodeler/pmfinish.cpp index 80898d97..52bd92c8 100644 --- a/kpovmodeler/pmfinish.cpp +++ b/kpovmodeler/pmfinish.cpp @@ -130,11 +130,11 @@ PMFinish::~PMFinish( ) { } -PMMetaObject* PMFinish::tqmetaObject( ) const +PMMetaObject* PMFinish::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Finish", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Finish", Base::metaObject( ), createNewFinish ); s_pMetaObject->addProperty( new PMFinishProperty( "ambientColor", &PMFinish::setAmbientColor, &PMFinish::ambientColor ) ); diff --git a/kpovmodeler/pmfinish.h b/kpovmodeler/pmfinish.h index 2a7fda19..c12f31b1 100644 --- a/kpovmodeler/pmfinish.h +++ b/kpovmodeler/pmfinish.h @@ -53,7 +53,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmfog.cpp b/kpovmodeler/pmfog.cpp index 36f39a30..6af4a2cb 100644 --- a/kpovmodeler/pmfog.cpp +++ b/kpovmodeler/pmfog.cpp @@ -81,11 +81,11 @@ PMFog::~PMFog( ) { } -PMMetaObject* PMFog::tqmetaObject( ) const +PMMetaObject* PMFog::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Fog", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Fog", Base::metaObject( ), createNewFog ); s_pMetaObject->addProperty( new PMFogProperty( "fogType", &PMFog::setFogType, &PMFog::fogType ) ); diff --git a/kpovmodeler/pmfog.h b/kpovmodeler/pmfog.h index cfdfa539..fc6d7095 100644 --- a/kpovmodeler/pmfog.h +++ b/kpovmodeler/pmfog.h @@ -54,7 +54,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmformulalabel.cpp b/kpovmodeler/pmformulalabel.cpp index 51b5e13f..c6d9cd70 100644 --- a/kpovmodeler/pmformulalabel.cpp +++ b/kpovmodeler/pmformulalabel.cpp @@ -84,7 +84,7 @@ void PMFormulaLabel::drawContents( TQPainter* p ) // draw dot int center = ( cr.top( ) + cr.bottom( ) ) / 2; int rad = c_dotSize / 2; - p->setBrush( TQBrush( tqcolorGroup( ).text( ) ) ); + p->setBrush( TQBrush( colorGroup( ).text( ) ) ); p->drawEllipse( cr.left( ), center - rad, c_dotSize, c_dotSize ); cr.setLeft( cr.left( ) + c_dotSize + c_indent ); @@ -131,7 +131,7 @@ void PMFormulaLabel::calculateSizeHint( ) TQFontMetrics m1( font( ) ); if( sum == 0 ) - m_tqsizeHint.setWidth( m1.width( s_nullString ) ); + m_sizeHint.setWidth( m1.width( s_nullString ) ); else { TQFontMetrics m2( exponentFont( ) ); @@ -146,19 +146,19 @@ void PMFormulaLabel::calculateSizeHint( ) width += m2.width( s_digit[m_exponents[i]] ) + 1; } } - m_tqsizeHint.setWidth( width ); + m_sizeHint.setWidth( width ); } - m_tqsizeHint.setHeight( m1.height( ) + 7 ); + m_sizeHint.setHeight( m1.height( ) + 7 ); } -TQSize PMFormulaLabel::tqsizeHint( ) const +TQSize PMFormulaLabel::sizeHint( ) const { - return tqminimumSizeHint( ); + return minimumSizeHint( ); } -TQSize PMFormulaLabel::tqminimumSizeHint( ) const +TQSize PMFormulaLabel::minimumSizeHint( ) const { - return m_tqsizeHint; + return m_sizeHint; } void PMFormulaLabel::fontChange( const TQFont& ) diff --git a/kpovmodeler/pmformulalabel.h b/kpovmodeler/pmformulalabel.h index 00d75ed8..f6b50897 100644 --- a/kpovmodeler/pmformulalabel.h +++ b/kpovmodeler/pmformulalabel.h @@ -46,8 +46,8 @@ public: * Destructor */ ~PMFormulaLabel( ); - virtual TQSize tqsizeHint( ) const; - virtual TQSize tqminimumSizeHint( ) const; + virtual TQSize sizeHint( ) const; + virtual TQSize minimumSizeHint( ) const; protected: virtual void drawContents( TQPainter* p ); @@ -58,7 +58,7 @@ private: TQFont exponentFont( ) const; void calculateSizeHint( ); - TQSize m_tqsizeHint; + TQSize m_sizeHint; int m_exponents[3]; static TQString s_xyz[3]; diff --git a/kpovmodeler/pmglobalphotons.cpp b/kpovmodeler/pmglobalphotons.cpp index 5d5835be..ddf32258 100644 --- a/kpovmodeler/pmglobalphotons.cpp +++ b/kpovmodeler/pmglobalphotons.cpp @@ -101,11 +101,11 @@ PMGlobalPhotons::~PMGlobalPhotons( ) { } -PMMetaObject* PMGlobalPhotons::tqmetaObject( ) const +PMMetaObject* PMGlobalPhotons::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "GlobalPhotons", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "GlobalPhotons", Base::metaObject( ), createNewGlobalPhotons ); PMNumberProperty* p1 = new PMNumberProperty( "numberType", diff --git a/kpovmodeler/pmglobalphotons.h b/kpovmodeler/pmglobalphotons.h index 7a32b14e..549e6efc 100644 --- a/kpovmodeler/pmglobalphotons.h +++ b/kpovmodeler/pmglobalphotons.h @@ -55,7 +55,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmglobalsettings.cpp b/kpovmodeler/pmglobalsettings.cpp index 1c75b40a..efa7db36 100644 --- a/kpovmodeler/pmglobalsettings.cpp +++ b/kpovmodeler/pmglobalsettings.cpp @@ -104,11 +104,11 @@ PMGlobalSettings::~PMGlobalSettings( ) { } -PMMetaObject* PMGlobalSettings::tqmetaObject( ) const +PMMetaObject* PMGlobalSettings::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "GlobalSettings", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "GlobalSettings", Base::metaObject( ), createNewGlobalSettings ); s_pMetaObject->addProperty( new PMGlobalSettingsProperty( "adcBailout", &PMGlobalSettings::setAdcBailout, &PMGlobalSettings::adcBailout ) ); diff --git a/kpovmodeler/pmglobalsettings.h b/kpovmodeler/pmglobalsettings.h index fad60d92..a95f86d7 100644 --- a/kpovmodeler/pmglobalsettings.h +++ b/kpovmodeler/pmglobalsettings.h @@ -56,7 +56,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp index 2bd819c4..41a748e0 100644 --- a/kpovmodeler/pmglview.cpp +++ b/kpovmodeler/pmglview.cpp @@ -326,7 +326,7 @@ void PMGLView::initializeGL( ) Window* colorMapWindows = 0; Window* newWindows = 0; int num; - if( XGetWMColormapWindows( display, tqtopLevelWidget( )->winId( ), + if( XGetWMColormapWindows( display, topLevelWidget( )->winId( ), &colorMapWindows, &num ) ) { // create a new list and append the new window @@ -357,7 +357,7 @@ void PMGLView::initializeGL( ) // tell TQt to use this window create( w ); - XSetWMColormapWindows( display, tqtopLevelWidget( )->winId( ), + XSetWMColormapWindows( display, topLevelWidget( )->winId( ), newWindows, num ); delete[] newWindows; @@ -367,7 +367,7 @@ void PMGLView::initializeGL( ) { TQVBoxLayout* topLayout = new TQVBoxLayout( this ); TQLabel* label = new TQLabel( i18n( "No OpenGL support" ), this ); - label->tqsetAlignment( TQt::AlignCenter ); + label->setAlignment( TQt::AlignCenter ); topLayout->addWidget( label ); } diff --git a/kpovmodeler/pmgraphicalobject.cpp b/kpovmodeler/pmgraphicalobject.cpp index 59ace7cf..c60c40cb 100644 --- a/kpovmodeler/pmgraphicalobject.cpp +++ b/kpovmodeler/pmgraphicalobject.cpp @@ -60,11 +60,11 @@ PMGraphicalObject::~PMGraphicalObject( ) { } -PMMetaObject* PMGraphicalObject::tqmetaObject( ) const +PMMetaObject* PMGraphicalObject::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "GraphicalObject", Base::tqmetaObject( ) ); + s_pMetaObject = new PMMetaObject( "GraphicalObject", Base::metaObject( ) ); s_pMetaObject->addProperty( new PMGraphicalObjectProperty( "noShadow", &PMGraphicalObject::setNoShadow, &PMGraphicalObject::noShadow ) ); diff --git a/kpovmodeler/pmgraphicalobject.h b/kpovmodeler/pmgraphicalobject.h index 19ea826d..fd53e919 100644 --- a/kpovmodeler/pmgraphicalobject.h +++ b/kpovmodeler/pmgraphicalobject.h @@ -51,7 +51,7 @@ public: virtual ~PMGraphicalObject( ); /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmheightfield.cpp b/kpovmodeler/pmheightfield.cpp index 154c6f57..6806437a 100644 --- a/kpovmodeler/pmheightfield.cpp +++ b/kpovmodeler/pmheightfield.cpp @@ -107,11 +107,11 @@ void PMHeightField::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMHeightField::tqmetaObject( ) const +PMMetaObject* PMHeightField::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "HeightField", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "HeightField", Base::metaObject( ), createNewHeightField ); s_pMetaObject->addProperty( new PMHeightFieldProperty( "fileName", &PMHeightField::setFileName, &PMHeightField::fileName ) ); diff --git a/kpovmodeler/pmheightfield.h b/kpovmodeler/pmheightfield.h index 92d9724b..443226ba 100644 --- a/kpovmodeler/pmheightfield.h +++ b/kpovmodeler/pmheightfield.h @@ -60,7 +60,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const; diff --git a/kpovmodeler/pmimagemap.cpp b/kpovmodeler/pmimagemap.cpp index e867f72e..5f28c49a 100644 --- a/kpovmodeler/pmimagemap.cpp +++ b/kpovmodeler/pmimagemap.cpp @@ -275,11 +275,11 @@ void PMImageMap::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMImageMap::tqmetaObject( ) const +PMMetaObject* PMImageMap::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "ImageMap", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "ImageMap", Base::metaObject( ), createNewImageMap ); PMBitmapTypeProperty* bp = new PMBitmapTypeProperty( diff --git a/kpovmodeler/pmimagemap.h b/kpovmodeler/pmimagemap.h index 4ee38233..3a43d949 100644 --- a/kpovmodeler/pmimagemap.h +++ b/kpovmodeler/pmimagemap.h @@ -71,7 +71,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pminsertrulesystem.cpp b/kpovmodeler/pminsertrulesystem.cpp index 7bd9e95a..af899947 100644 --- a/kpovmodeler/pminsertrulesystem.cpp +++ b/kpovmodeler/pminsertrulesystem.cpp @@ -905,7 +905,7 @@ bool PMInsertRuleSystem::canInsert( const PMObject* parentObject, bool possible = false; // find rules for target class - PMMetaObject* meta = parentObject->tqmetaObject( ); + PMMetaObject* meta = parentObject->metaObject( ); for( ; meta && !possible; meta = meta->superClass( ) ) { PMRuleTargetClass* tc = m_rulesDict.find( meta->className( ) ); @@ -996,7 +996,7 @@ int PMInsertRuleSystem::canInsert( const PMObject* parentObject, // find rules for target class TQPtrList<PMRuleTargetClass> targetClassList; - PMMetaObject* meta = parentObject->tqmetaObject( ); + PMMetaObject* meta = parentObject->metaObject( ); for( ; meta; meta = meta->superClass( ) ) { PMRuleTargetClass* tc = m_rulesDict.find( meta->className( ) ); diff --git a/kpovmodeler/pminterior.cpp b/kpovmodeler/pminterior.cpp index 7cc2d87c..53a69f79 100644 --- a/kpovmodeler/pminterior.cpp +++ b/kpovmodeler/pminterior.cpp @@ -76,11 +76,11 @@ PMInterior::~PMInterior( ) { } -PMMetaObject* PMInterior::tqmetaObject( ) const +PMMetaObject* PMInterior::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Interior", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Interior", Base::metaObject( ), createNewInterior ); s_pMetaObject->addProperty( new PMInteriorProperty( "ior", &PMInterior::setIor, &PMInterior::ior ) ); diff --git a/kpovmodeler/pminterior.h b/kpovmodeler/pminterior.h index 4f08ff80..8e3c9172 100644 --- a/kpovmodeler/pminterior.h +++ b/kpovmodeler/pminterior.h @@ -53,7 +53,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pminteriortexture.cpp b/kpovmodeler/pminteriortexture.cpp index 191c3c9b..92950050 100644 --- a/kpovmodeler/pminteriortexture.cpp +++ b/kpovmodeler/pminteriortexture.cpp @@ -43,11 +43,11 @@ PMInteriorTexture::~PMInteriorTexture( ) { } -PMMetaObject* PMInteriorTexture::tqmetaObject( ) const +PMMetaObject* PMInteriorTexture::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "InteriorTexture", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "InteriorTexture", Base::metaObject( ), createNewInteriorTexture ); } return s_pMetaObject; diff --git a/kpovmodeler/pminteriortexture.h b/kpovmodeler/pminteriortexture.h index 59f37af7..0711b5c9 100644 --- a/kpovmodeler/pminteriortexture.h +++ b/kpovmodeler/pminteriortexture.h @@ -52,7 +52,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmisosurface.cpp b/kpovmodeler/pmisosurface.cpp index c47373f8..c32c0683 100644 --- a/kpovmodeler/pmisosurface.cpp +++ b/kpovmodeler/pmisosurface.cpp @@ -157,11 +157,11 @@ void PMIsoSurface::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMIsoSurface::tqmetaObject( ) const +PMMetaObject* PMIsoSurface::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "IsoSurface", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "IsoSurface", Base::metaObject( ), createNewIsoSurface ); // TODO /* diff --git a/kpovmodeler/pmisosurface.h b/kpovmodeler/pmisosurface.h index b9b799a0..2a2fb358 100644 --- a/kpovmodeler/pmisosurface.h +++ b/kpovmodeler/pmisosurface.h @@ -60,7 +60,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const; diff --git a/kpovmodeler/pmjuliafractal.cpp b/kpovmodeler/pmjuliafractal.cpp index 04aaead7..5929a058 100644 --- a/kpovmodeler/pmjuliafractal.cpp +++ b/kpovmodeler/pmjuliafractal.cpp @@ -112,11 +112,11 @@ void PMJuliaFractal::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMJuliaFractal::tqmetaObject( ) const +PMMetaObject* PMJuliaFractal::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "JuliaFractal", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "JuliaFractal", Base::metaObject( ), createNewJuliaFractal ); s_pMetaObject->addProperty( new PMJuliaFractalProperty( "juliaParameter", &PMJuliaFractal::setJuliaParameter, diff --git a/kpovmodeler/pmjuliafractal.h b/kpovmodeler/pmjuliafractal.h index 1e68a2d3..1a113aa4 100644 --- a/kpovmodeler/pmjuliafractal.h +++ b/kpovmodeler/pmjuliafractal.h @@ -61,7 +61,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmlathe.cpp b/kpovmodeler/pmlathe.cpp index 8e058a9b..c5021d28 100644 --- a/kpovmodeler/pmlathe.cpp +++ b/kpovmodeler/pmlathe.cpp @@ -198,11 +198,11 @@ void PMLathe::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMLathe::tqmetaObject( ) const +PMMetaObject* PMLathe::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Lathe", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Lathe", Base::metaObject( ), createNewLathe ); s_pMetaObject->addProperty( new PMLatheProperty( "sturm", &PMLathe::setSturm, &PMLathe::sturm ) ); diff --git a/kpovmodeler/pmlathe.h b/kpovmodeler/pmlathe.h index b059b8a8..20fa55b3 100644 --- a/kpovmodeler/pmlathe.h +++ b/kpovmodeler/pmlathe.h @@ -63,7 +63,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmlibraryentrypreview.cpp b/kpovmodeler/pmlibraryentrypreview.cpp index a1ea53a1..0ccfd5b4 100644 --- a/kpovmodeler/pmlibraryentrypreview.cpp +++ b/kpovmodeler/pmlibraryentrypreview.cpp @@ -59,24 +59,24 @@ PMLibraryEntryPreview::PMLibraryEntryPreview( TQWidget* parent ) : gl->setColStretch( 1, 1 ); TQLabel* lbl = new TQLabel( i18n( "Name: " ), this ); m_pName = new TQLineEdit( this ); - m_pName->tqsetAlignment( TQt::AlignLeft ); + m_pName->setAlignment( TQt::AlignLeft ); m_pName->setReadOnly( true ); gl->addWidget( lbl, 0, 0 ); gl->addWidget( m_pName, 0, 1 ); lbl = new TQLabel( i18n( "Description:" ), this ); - lbl->tqsetAlignment( TQt::AlignTop ); + lbl->setAlignment( TQt::AlignTop ); m_pDescription = new TQMultiLineEdit( this ); - m_pDescription->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | + m_pDescription->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak | TQt::DontClip ); m_pDescription->setReadOnly( true ); gl->addWidget( lbl, 1, 0 ); gl->addWidget( m_pDescription, 1, 1 ); m_pKeywordsLabel = new TQLabel( i18n( "Keywords:" ), this ); - m_pKeywordsLabel->tqsetAlignment( TQt::AlignTop ); + m_pKeywordsLabel->setAlignment( TQt::AlignTop ); m_pKeywords = new TQMultiLineEdit( this ); - m_pKeywords->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | + m_pKeywords->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak | TQt::DontClip ); m_pKeywords->setReadOnly( true ); gl->addWidget( m_pKeywordsLabel, 2, 0 ); @@ -302,7 +302,7 @@ bool PMLibraryEntryPreview::saveIfNeeded( bool forceSave ) // Add them to the object to save. PMObjectDrag drag( m_pPart, sortedList ); - objToSave.setObjects( drag.tqencodedData( "application/x-kpovmodeler" ) ); + objToSave.setObjects( drag.encodedData( "application/x-kpovmodeler" ) ); // Add the preview image objToSave.setPreview( m_image.copy( ) ); diff --git a/kpovmodeler/pmlibraryiconview.cpp b/kpovmodeler/pmlibraryiconview.cpp index 39714cf8..976bfcbe 100644 --- a/kpovmodeler/pmlibraryiconview.cpp +++ b/kpovmodeler/pmlibraryiconview.cpp @@ -50,11 +50,11 @@ const char* PMLibraryIconDrag::format( int i ) const } } -TQByteArray PMLibraryIconDrag::tqencodedData( const char* mime ) const +TQByteArray PMLibraryIconDrag::encodedData( const char* mime ) const { TQByteArray a; if ( TQString( mime ) == "application/x-qiconlist" ) - a = TQIconDrag::tqencodedData( mime ); + a = TQIconDrag::encodedData( mime ); else if ( TQString( mime ) == "text/sublib-list" ) { TQString s , l; @@ -80,7 +80,7 @@ bool PMLibraryIconDrag::canDecode( TQMimeSource* e ) bool PMLibraryIconDrag::decode( TQMimeSource* e, TQStringList& strList, TQValueList<bool>& subLibList ) { - TQByteArray a = e->tqencodedData( "text/sublib-list" ); + TQByteArray a = e->encodedData( "text/sublib-list" ); if( a.isEmpty( ) ) return false; diff --git a/kpovmodeler/pmlibraryiconview.h b/kpovmodeler/pmlibraryiconview.h index dc297c26..963ba85d 100644 --- a/kpovmodeler/pmlibraryiconview.h +++ b/kpovmodeler/pmlibraryiconview.h @@ -41,7 +41,7 @@ public: /** @return The ith format, or NULL. */ const char* format( int i ) const; /** @return The encoded payload of this object, in the specified MIME format. */ - TQByteArray tqencodedData( const char* mime ) const; + TQByteArray encodedData( const char* mime ) const; /** @return True if the information in e can be decoded */ static bool canDecode( TQMimeSource* e ); /** diff --git a/kpovmodeler/pmlight.cpp b/kpovmodeler/pmlight.cpp index 22f1862d..554a09c2 100644 --- a/kpovmodeler/pmlight.cpp +++ b/kpovmodeler/pmlight.cpp @@ -268,11 +268,11 @@ void PMLight::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMLight::tqmetaObject( ) const +PMMetaObject* PMLight::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Light", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Light", Base::metaObject( ), createNewLight ); PMTypeProperty* p = new PMTypeProperty( "lightType", &PMLight::setLightType, &PMLight::lightType ); diff --git a/kpovmodeler/pmlight.h b/kpovmodeler/pmlight.h index 59053ab8..4fafb2b0 100644 --- a/kpovmodeler/pmlight.h +++ b/kpovmodeler/pmlight.h @@ -59,7 +59,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const; diff --git a/kpovmodeler/pmlightgroup.cpp b/kpovmodeler/pmlightgroup.cpp index 36f8d17a..acf655e4 100644 --- a/kpovmodeler/pmlightgroup.cpp +++ b/kpovmodeler/pmlightgroup.cpp @@ -69,11 +69,11 @@ void PMLightGroup::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMLightGroup::tqmetaObject( ) const +PMMetaObject* PMLightGroup::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "LightGroup", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "LightGroup", Base::metaObject( ), createNewLightGroup ); s_pMetaObject->addProperty( new PMLightGroupProperty( "globalLights", diff --git a/kpovmodeler/pmlightgroup.h b/kpovmodeler/pmlightgroup.h index 11762efa..9fdf8d6b 100644 --- a/kpovmodeler/pmlightgroup.h +++ b/kpovmodeler/pmlightgroup.h @@ -54,7 +54,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmlistpattern.cpp b/kpovmodeler/pmlistpattern.cpp index 3d368209..721369d2 100644 --- a/kpovmodeler/pmlistpattern.cpp +++ b/kpovmodeler/pmlistpattern.cpp @@ -114,11 +114,11 @@ void PMListPattern::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMListPattern::tqmetaObject( ) const +PMMetaObject* PMListPattern::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "ListPattern", Base::tqmetaObject( ) ); + s_pMetaObject = new PMMetaObject( "ListPattern", Base::metaObject( ) ); PMListTypeProperty* p = new PMListTypeProperty( "listType", &PMListPattern::setListType, @@ -228,11 +228,11 @@ PMTextureList::~PMTextureList( ) { } -PMMetaObject* PMTextureList::tqmetaObject( ) const +PMMetaObject* PMTextureList::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "TextureList", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "TextureList", Base::metaObject( ), createNewTextureList ); } return s_pMetaObject; @@ -267,11 +267,11 @@ PMPigmentList::~PMPigmentList( ) { } -PMMetaObject* PMPigmentList::tqmetaObject( ) const +PMMetaObject* PMPigmentList::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "PigmentList", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "PigmentList", Base::metaObject( ), createNewPigmentList ); } return s_pMetaObject; @@ -306,11 +306,11 @@ PMColorList::~PMColorList( ) { } -PMMetaObject* PMColorList::tqmetaObject( ) const +PMMetaObject* PMColorList::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "ColorList", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "ColorList", Base::metaObject( ), createNewColorList ); } return s_pMetaObject; @@ -345,11 +345,11 @@ PMDensityList::~PMDensityList( ) { } -PMMetaObject* PMDensityList::tqmetaObject( ) const +PMMetaObject* PMDensityList::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "DensityList", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "DensityList", Base::metaObject( ), createNewDensityList ); } return s_pMetaObject; @@ -388,11 +388,11 @@ PMNormalList::~PMNormalList( ) { } -PMMetaObject* PMNormalList::tqmetaObject( ) const +PMMetaObject* PMNormalList::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "NormalList", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "NormalList", Base::metaObject( ), createNewNormalList ); s_pMetaObject->addProperty( new PMNormalListProperty( "depth", &PMNormalList::setDepth, diff --git a/kpovmodeler/pmlistpattern.h b/kpovmodeler/pmlistpattern.h index 876c8c15..6716dadb 100644 --- a/kpovmodeler/pmlistpattern.h +++ b/kpovmodeler/pmlistpattern.h @@ -57,7 +57,7 @@ public: */ virtual TQString listObjectType( ) const = 0; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; @@ -150,7 +150,7 @@ public: virtual TQString listObjectType( ) const { return TQString( "Texture" ); } /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; @@ -189,7 +189,7 @@ public: virtual TQString listObjectType( ) const { return TQString( "Pigment" ); } /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; @@ -228,7 +228,7 @@ public: virtual TQString listObjectType( ) const { return TQString( "SolidColor" ); } /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; @@ -267,7 +267,7 @@ public: virtual TQString listObjectType( ) const { return TQString( "Density" ); } /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; @@ -306,7 +306,7 @@ public: virtual TQString listObjectType( ) const { return TQString( "Normal" ); } /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmlookslike.cpp b/kpovmodeler/pmlookslike.cpp index f6cd5d29..270292e2 100644 --- a/kpovmodeler/pmlookslike.cpp +++ b/kpovmodeler/pmlookslike.cpp @@ -49,11 +49,11 @@ TQString PMLooksLike::description( ) const return i18n( "looks like" ); } -PMMetaObject* PMLooksLike::tqmetaObject( ) const +PMMetaObject* PMLooksLike::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "LooksLike", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "LooksLike", Base::metaObject( ), createNewLooksLike ); // no properties } diff --git a/kpovmodeler/pmlookslike.h b/kpovmodeler/pmlookslike.h index 9e9c9d92..4a191422 100644 --- a/kpovmodeler/pmlookslike.h +++ b/kpovmodeler/pmlookslike.h @@ -53,7 +53,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmmaterial.cpp b/kpovmodeler/pmmaterial.cpp index b37d98bb..66f11f94 100644 --- a/kpovmodeler/pmmaterial.cpp +++ b/kpovmodeler/pmmaterial.cpp @@ -43,11 +43,11 @@ PMMaterial::~PMMaterial( ) { } -PMMetaObject* PMMaterial::tqmetaObject( ) const +PMMetaObject* PMMaterial::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Material", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Material", Base::metaObject( ), createNewMaterial ); } return s_pMetaObject; diff --git a/kpovmodeler/pmmaterial.h b/kpovmodeler/pmmaterial.h index 955e4515..7e790be4 100644 --- a/kpovmodeler/pmmaterial.h +++ b/kpovmodeler/pmmaterial.h @@ -52,7 +52,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmmaterialmap.cpp b/kpovmodeler/pmmaterialmap.cpp index 8ef5dc93..28b2c849 100644 --- a/kpovmodeler/pmmaterialmap.cpp +++ b/kpovmodeler/pmmaterialmap.cpp @@ -186,11 +186,11 @@ void PMMaterialMap::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMMaterialMap::tqmetaObject( ) const +PMMetaObject* PMMaterialMap::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "MaterialMap", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "MaterialMap", Base::metaObject( ), createNewMaterialMap ); PMBitmapTypeProperty* bp = new PMBitmapTypeProperty( diff --git a/kpovmodeler/pmmaterialmap.h b/kpovmodeler/pmmaterialmap.h index f5cc3ca9..6377c7bd 100644 --- a/kpovmodeler/pmmaterialmap.h +++ b/kpovmodeler/pmmaterialmap.h @@ -72,7 +72,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmmedia.cpp b/kpovmodeler/pmmedia.cpp index e487d6e9..c5e32d6e 100644 --- a/kpovmodeler/pmmedia.cpp +++ b/kpovmodeler/pmmedia.cpp @@ -97,11 +97,11 @@ PMMedia::~PMMedia( ) { } -PMMetaObject* PMMedia::tqmetaObject( ) const +PMMetaObject* PMMedia::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Media", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Media", Base::metaObject( ), createNewMedia ); s_pMetaObject->addProperty( new PMMediaProperty( "method", &PMMedia::setMethod, &PMMedia::method ) ); diff --git a/kpovmodeler/pmmedia.h b/kpovmodeler/pmmedia.h index 78adc338..4836bf37 100644 --- a/kpovmodeler/pmmedia.h +++ b/kpovmodeler/pmmedia.h @@ -53,7 +53,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmmesh.cpp b/kpovmodeler/pmmesh.cpp index fc1791bf..d143edf4 100644 --- a/kpovmodeler/pmmesh.cpp +++ b/kpovmodeler/pmmesh.cpp @@ -133,11 +133,11 @@ void PMMesh::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMMesh::tqmetaObject( ) const +PMMetaObject* PMMesh::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Mesh", Base::tqmetaObject( ), createNewMesh ); + s_pMetaObject = new PMMetaObject( "Mesh", Base::metaObject( ), createNewMesh ); s_pMetaObject->addProperty( new PMMeshProperty( "hierarchy", &PMMesh::setHierarchy, &PMMesh::hierarchy ) ); @@ -236,7 +236,7 @@ void PMMesh::restoreMemento( PMMemento* s ) TQPtrList<PMMemento> list = m->triangleMementos( ); TQPtrListIterator<PMMemento> Itr( list ); for ( int i = 0; i < numChildren && ( tm = Itr.current( ) ) != 0; ++i, ++Itr ) - tqchildAt( i )->restoreMemento( tm ); + childAt( i )->restoreMemento( tm ); } Base::restoreMemento( s ); @@ -259,10 +259,10 @@ void PMMesh::controlPoints( PMControlPointList& list ) m_pointToPointList.clear( ); for ( unsigned i = 0; i < numChildren; ++i ) { - if ( tqchildAt( i )->isA( "Triangle" ) ) + if ( childAt( i )->isA( "Triangle" ) ) { - obj = ( PMTriangle * ) tqchildAt( i ); + obj = ( PMTriangle * ) childAt( i ); ptp.object = obj; for ( unsigned j = 0; j < 3; ++j ) { @@ -353,9 +353,9 @@ void PMMesh::controlPointsChangedList( PMControlPointList& list, PMObjectList& o for ( int i = 0; i < numChildren && validTriangles; ++i ) { - if ( tqchildAt( i )->isA( "Triangle" ) ) + if ( childAt( i )->isA( "Triangle" ) ) { - obj = ( PMTriangle* )tqchildAt( i ); + obj = ( PMTriangle* )childAt( i ); obj->createMemento( ); objList.append( obj ); validNormal = false; @@ -538,7 +538,7 @@ void PMMesh::controlPointsChangedList( PMControlPointList& list, PMObjectList& o { if ( ( tm = mementoList.getLast( ) ) ) { - tqchildAt( j )->restoreMemento( tm ); + childAt( j )->restoreMemento( tm ); delete tm; mementoList.removeLast( ); } diff --git a/kpovmodeler/pmmesh.h b/kpovmodeler/pmmesh.h index 6c1c6054..a6fe0089 100644 --- a/kpovmodeler/pmmesh.h +++ b/kpovmodeler/pmmesh.h @@ -56,7 +56,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmnamedobject.cpp b/kpovmodeler/pmnamedobject.cpp index 70f2bc5a..72553cd4 100644 --- a/kpovmodeler/pmnamedobject.cpp +++ b/kpovmodeler/pmnamedobject.cpp @@ -39,11 +39,11 @@ PMNamedObject::~PMNamedObject( ) { } -PMMetaObject* PMNamedObject::tqmetaObject( ) const +PMMetaObject* PMNamedObject::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "NamedObject", Base::tqmetaObject( ) ); + s_pMetaObject = new PMMetaObject( "NamedObject", Base::metaObject( ) ); s_pMetaObject->addProperty( new PMNamedObjectProperty( "name", &PMNamedObject::setName, &PMNamedObject::name ) ); } diff --git a/kpovmodeler/pmnamedobject.h b/kpovmodeler/pmnamedobject.h index 02ee7eb4..8b7b0b62 100644 --- a/kpovmodeler/pmnamedobject.h +++ b/kpovmodeler/pmnamedobject.h @@ -48,7 +48,7 @@ public: ~PMNamedObject( ); /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmnormal.cpp b/kpovmodeler/pmnormal.cpp index b6e7bb07..722a8fc4 100644 --- a/kpovmodeler/pmnormal.cpp +++ b/kpovmodeler/pmnormal.cpp @@ -58,11 +58,11 @@ PMNormal::~PMNormal( ) { } -PMMetaObject* PMNormal::tqmetaObject( ) const +PMMetaObject* PMNormal::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Normal", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Normal", Base::metaObject( ), createNewNormal ); s_pMetaObject->addProperty( new PMNormProperty( "bumpSize", &PMNormal::setBumpSize, &PMNormal::bumpSize ) ); diff --git a/kpovmodeler/pmnormal.h b/kpovmodeler/pmnormal.h index a179a3ed..c798d039 100644 --- a/kpovmodeler/pmnormal.h +++ b/kpovmodeler/pmnormal.h @@ -52,7 +52,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmobject.cpp b/kpovmodeler/pmobject.cpp index 579bd00b..94907482 100644 --- a/kpovmodeler/pmobject.cpp +++ b/kpovmodeler/pmobject.cpp @@ -57,7 +57,7 @@ PMObject::~PMObject( ) { } -PMMetaObject* PMObject::tqmetaObject( ) const +PMMetaObject* PMObject::metaObject( ) const { if( !s_pMetaObject ) { @@ -72,7 +72,7 @@ PMMetaObject* PMObject::tqmetaObject( ) const PMObject* PMObject::newObject( ) const { - return tqmetaObject( )->newObject( m_pPart ); + return metaObject( )->newObject( m_pPart ); } bool PMObject::insertChildAfter( PMObject*, PMObject* ) @@ -215,7 +215,7 @@ void PMObject::cleanUp( ) const bool PMObject::setProperty( const TQString& name, const PMVariant& v ) { - PMPropertyBase* p = tqmetaObject( )->property( name ); + PMPropertyBase* p = metaObject( )->property( name ); if( !p ) return false; return p->setProperty( this, v ); @@ -224,7 +224,7 @@ bool PMObject::setProperty( const TQString& name, const PMVariant& v ) TQStringList PMObject::properties( ) const { TQStringList lst; - PMPropertyIterator it = tqmetaObject( )->properties( ); + PMPropertyIterator it = metaObject( )->properties( ); for( ; it.current( ); ++it ) lst.append( it.current( )->name( ) ); @@ -234,7 +234,7 @@ TQStringList PMObject::properties( ) const PMVariant PMObject::property( const TQString& name ) const { - PMPropertyBase* p = tqmetaObject( )->property( name ); + PMPropertyBase* p = metaObject( )->property( name ); if( !p ) return PMVariant( ); return p->getProperty( this ); @@ -244,12 +244,12 @@ bool PMObject::isA( const TQString& className ) const { if( !m_pPart ) return false; - return m_pPart->prototypeManager( )->isA( tqmetaObject( ), className ); + return m_pPart->prototypeManager( )->isA( metaObject( ), className ); } TQString PMObject::type( ) const { - return tqmetaObject( )->className( ); + return metaObject( )->className( ); } bool PMObject::canInsert( const TQString& className, const PMObject* after, diff --git a/kpovmodeler/pmobject.h b/kpovmodeler/pmobject.h index 3bffb7d3..4a48e450 100644 --- a/kpovmodeler/pmobject.h +++ b/kpovmodeler/pmobject.h @@ -85,7 +85,7 @@ public: /** * Returns the meta object for the class */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** * Returns true if the object is of type t or inherits the object @@ -174,7 +174,7 @@ public: * Returns a pointer to the child object at position index, * or null if the index is out of range. */ - virtual PMObject* tqchildAt( uint ) const { return 0; } + virtual PMObject* childAt( uint ) const { return 0; } /** * Returns the next sibling of that item */ diff --git a/kpovmodeler/pmobjectdrag.cpp b/kpovmodeler/pmobjectdrag.cpp index 879bbc1c..23631df0 100644 --- a/kpovmodeler/pmobjectdrag.cpp +++ b/kpovmodeler/pmobjectdrag.cpp @@ -170,7 +170,7 @@ PMObjectDrag::~PMObjectDrag( ) { } -TQByteArray PMObjectDrag::tqencodedData( const char* format ) const +TQByteArray PMObjectDrag::encodedData( const char* format ) const { TQValueList<TQByteArray>::ConstIterator dit; TQStringList::ConstIterator sit; @@ -211,7 +211,7 @@ bool PMObjectDrag::canDecode( const TQMimeSource* e, PMPart* part ) PMParser* PMObjectDrag::newParser( const TQMimeSource* e, PMPart* part ) { if( e->provides( c_kpmDocumentMimeFormat ) ) - return new PMXMLParser( part, e->tqencodedData( c_kpmDocumentMimeFormat ) ); + return new PMXMLParser( part, e->encodedData( c_kpmDocumentMimeFormat ) ); const TQPtrList<PMIOFormat>& formats = part->ioManager( )->formats( ); TQPtrListIterator<PMIOFormat> fit( formats ); @@ -221,7 +221,7 @@ PMParser* PMObjectDrag::newParser( const TQMimeSource* e, PMPart* part ) TQString str = f->mimeType( ); const char* lat = str.latin1( ); if( f->services( ) & PMIOFormat::Import && e->provides( lat ) ) - return f->newParser( part, e->tqencodedData( lat ) ); + return f->newParser( part, e->encodedData( lat ) ); } return 0; diff --git a/kpovmodeler/pmobjectdrag.h b/kpovmodeler/pmobjectdrag.h index a02b4401..4a6db4b9 100644 --- a/kpovmodeler/pmobjectdrag.h +++ b/kpovmodeler/pmobjectdrag.h @@ -56,7 +56,7 @@ public: * Returns the encoded payload of this object, in the * specified MIME format. */ - virtual TQByteArray tqencodedData( const char* ) const; + virtual TQByteArray encodedData( const char* ) const; /** * Returns the ith format, or NULL. */ diff --git a/kpovmodeler/pmobjectlink.cpp b/kpovmodeler/pmobjectlink.cpp index f99bb92b..0eec53c7 100644 --- a/kpovmodeler/pmobjectlink.cpp +++ b/kpovmodeler/pmobjectlink.cpp @@ -58,11 +58,11 @@ TQString PMObjectLink::description( ) const return i18n( "object link" ); } -PMMetaObject* PMObjectLink::tqmetaObject( ) const +PMMetaObject* PMObjectLink::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "ObjectLink", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "ObjectLink", Base::metaObject( ), createNewObjectLink ); s_pMetaObject->addProperty( new PMObjectLinkProperty( "linkedObject", &PMObjectLink::setLinkedObjectProperty, diff --git a/kpovmodeler/pmobjectlink.h b/kpovmodeler/pmobjectlink.h index 7bc55b59..8ec7b474 100644 --- a/kpovmodeler/pmobjectlink.h +++ b/kpovmodeler/pmobjectlink.h @@ -53,7 +53,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmoutputdevice.cpp b/kpovmodeler/pmoutputdevice.cpp index 1ee91b52..8e6333f2 100644 --- a/kpovmodeler/pmoutputdevice.cpp +++ b/kpovmodeler/pmoutputdevice.cpp @@ -55,7 +55,7 @@ void PMOutputDevice::callSerialization( const PMObject* o, const PMMetaObject* m info->call( o, mo, this ); else { - if( mo == o->tqmetaObject( ) ) + if( mo == o->metaObject( ) ) { printError( i18n( "The object \"%1\" doesn't support %2." ) .tqarg( o->description( ) ).tqarg( description( ) ) ); @@ -70,7 +70,7 @@ void PMOutputDevice::callSerialization( const PMObject* o, const PMMetaObject* m void PMOutputDevice::serialize( PMObject* o ) { - callSerialization( o, o->tqmetaObject( ) ); + callSerialization( o, o->metaObject( ) ); } void PMOutputDevice::close( ) diff --git a/kpovmodeler/pmpattern.cpp b/kpovmodeler/pmpattern.cpp index 95a975fc..2d60e9ce 100644 --- a/kpovmodeler/pmpattern.cpp +++ b/kpovmodeler/pmpattern.cpp @@ -453,11 +453,11 @@ void PMPattern::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMPattern::tqmetaObject( ) const +PMMetaObject* PMPattern::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Pattern", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Pattern", Base::metaObject( ), createNewPattern ); s_pMetaObject->addProperty( new PMPatternProperty( "agateTurbulence", &PMPattern::setAgateTurbulence, &PMPattern::agateTurbulence ) ); diff --git a/kpovmodeler/pmpattern.h b/kpovmodeler/pmpattern.h index ff184e15..7dcf9cff 100644 --- a/kpovmodeler/pmpattern.h +++ b/kpovmodeler/pmpattern.h @@ -76,7 +76,7 @@ public: virtual TQString pixmap( ) const { return TQString( "pmpattern" ); } /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmphotons.cpp b/kpovmodeler/pmphotons.cpp index 8a904f86..cce7665b 100644 --- a/kpovmodeler/pmphotons.cpp +++ b/kpovmodeler/pmphotons.cpp @@ -60,11 +60,11 @@ PMPhotons::~PMPhotons( ) { } -PMMetaObject* PMPhotons::tqmetaObject( ) const +PMMetaObject* PMPhotons::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Photons", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Photons", Base::metaObject( ), createNewPhotons ); s_pMetaObject->addProperty( new PMPhotonsProperty( "target", diff --git a/kpovmodeler/pmphotons.h b/kpovmodeler/pmphotons.h index 34ecf25a..a28041f5 100644 --- a/kpovmodeler/pmphotons.h +++ b/kpovmodeler/pmphotons.h @@ -53,7 +53,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmpigment.cpp b/kpovmodeler/pmpigment.cpp index d6f611b3..be37cfb1 100644 --- a/kpovmodeler/pmpigment.cpp +++ b/kpovmodeler/pmpigment.cpp @@ -45,11 +45,11 @@ PMPigment::~PMPigment( ) { } -PMMetaObject* PMPigment::tqmetaObject( ) const +PMMetaObject* PMPigment::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Pigment", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Pigment", Base::metaObject( ), createNewPigment ); s_pMetaObject->addProperty( new PMPigmentProperty( "uvMapping", &PMPigment::setUVMapping, &PMPigment::uvMapping ) ); diff --git a/kpovmodeler/pmpigment.h b/kpovmodeler/pmpigment.h index 3f88d3ad..b520ad27 100644 --- a/kpovmodeler/pmpigment.h +++ b/kpovmodeler/pmpigment.h @@ -52,7 +52,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmplane.cpp b/kpovmodeler/pmplane.cpp index 12574211..db7af35a 100644 --- a/kpovmodeler/pmplane.cpp +++ b/kpovmodeler/pmplane.cpp @@ -82,11 +82,11 @@ void PMPlane::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMPlane::tqmetaObject( ) const +PMMetaObject* PMPlane::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Plane", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Plane", Base::metaObject( ), createNewPlane ); s_pMetaObject->addProperty( new PMPlaneProperty( "normal", &PMPlane::setNormal, &PMPlane::normal ) ); diff --git a/kpovmodeler/pmplane.h b/kpovmodeler/pmplane.h index 52fb9d4c..d5321dd8 100644 --- a/kpovmodeler/pmplane.h +++ b/kpovmodeler/pmplane.h @@ -57,7 +57,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const; diff --git a/kpovmodeler/pmpluginsettings.cpp b/kpovmodeler/pmpluginsettings.cpp index f53f9f96..c89d1e7e 100644 --- a/kpovmodeler/pmpluginsettings.cpp +++ b/kpovmodeler/pmpluginsettings.cpp @@ -33,14 +33,14 @@ public: { m_info = info; m_enabled = info->enabled( ); - settqStatus( ); + setStatus( ); } - void toggletqStatus( ) + void toggleStatus( ) { m_enabled = !m_enabled; - settqStatus( ); + setStatus( ); } - void settqStatus( ) + void setStatus( ) { if( m_enabled ) setText( 2, i18n( "loaded" ) ); @@ -122,7 +122,7 @@ void PMPluginSettings::slotToggle( ) ( PMPluginListViewItem* ) m_pPluginsList->currentItem( ); if( item ) { - item->toggletqStatus( ); + item->toggleStatus( ); if( item->m_enabled ) m_pToggle->setText( i18n( "Deactivate" ) ); diff --git a/kpovmodeler/pmpolynom.cpp b/kpovmodeler/pmpolynom.cpp index b9d75a13..e44044c5 100644 --- a/kpovmodeler/pmpolynom.cpp +++ b/kpovmodeler/pmpolynom.cpp @@ -130,11 +130,11 @@ void PMPolynom::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMPolynom::tqmetaObject( ) const +PMMetaObject* PMPolynom::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Polynom", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Polynom", Base::metaObject( ), createNewPolynom ); s_pMetaObject->addProperty( new PMPolynomProperty( "polynomOrder", &PMPolynom::setPolynomOrder, diff --git a/kpovmodeler/pmpolynom.h b/kpovmodeler/pmpolynom.h index dc2e9c21..65a9ad20 100644 --- a/kpovmodeler/pmpolynom.h +++ b/kpovmodeler/pmpolynom.h @@ -54,7 +54,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmpovray31serialization.cpp b/kpovmodeler/pmpovray31serialization.cpp index 543fec5b..a31c46de 100644 --- a/kpovmodeler/pmpovray31serialization.cpp +++ b/kpovmodeler/pmpovray31serialization.cpp @@ -21,7 +21,7 @@ const double c_defaultPatchFlatness = 0; -void PMPov31SerBicubicPatch( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerBicubicPatch( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMBicubicPatch* o = ( PMBicubicPatch* ) object; @@ -53,7 +53,7 @@ void PMPov31SerBicubicPatch( const PMObject* object, const PMMetaObject* tqmetaO dev->writeLine( line ); } - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } @@ -102,7 +102,7 @@ void PMPov31SerBlendMapModifiers( const PMObject* object, const PMMetaObject*, P } } -void PMPov31SerBlob( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerBlob( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMBlob* o = ( PMBlob* ) object; @@ -111,7 +111,7 @@ void PMPov31SerBlob( const PMObject* object, const PMMetaObject* tqmetaObject, P dev->writeName( object->name( ) ); dev->writeLine( TQString( "threshold %1" ).tqarg( o->threshold( ) ) ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); if( o->sturm( ) ) dev->writeLine( "sturm" ); @@ -121,7 +121,7 @@ void PMPov31SerBlob( const PMObject* object, const PMMetaObject* tqmetaObject, P dev->objectEnd( ); } -void PMPov31SerBlobCylinder( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerBlobCylinder( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMBlobCylinder* o = ( PMBlobCylinder* ) object; @@ -134,11 +134,11 @@ void PMPov31SerBlobCylinder( const PMObject* object, const PMMetaObject* tqmetaO + ", " + str1 + "," ); dev->writeLine( TQString( "strength %1" ).tqarg( o->strength( ) ) ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerBlobSphere( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerBlobSphere( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMBlobSphere* o = ( PMBlobSphere* ) object; @@ -146,22 +146,22 @@ void PMPov31SerBlobSphere( const PMObject* object, const PMMetaObject* tqmetaObj dev->writeName( object->name( ) ); dev->writeLine( o->centre( ).serialize( ) + TQString( ", %1," ).tqarg( o->radius( ) ) ); dev->writeLine( TQString( "strength %1" ).tqarg( o->strength( ) ) ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerBoundedBy( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerBoundedBy( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMBoundedBy* o = ( PMBoundedBy* ) object; dev->objectBegin( "bounded_by" ); if( o->clippedBy( ) ) dev->writeLine( "clipped_by" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerBox( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerBox( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMBox* o = ( PMBox* ) object; @@ -170,7 +170,7 @@ void PMPov31SerBox( const PMObject* object, const PMMetaObject* tqmetaObject, PM dev->writeName( object->name( ) ); dev->writeLine( o->corner1( ).serialize( ) + ", " + o->corner2( ).serialize( ) ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } @@ -257,7 +257,7 @@ void PMPov31SerBumpMap( const PMObject* object, const PMMetaObject*, PMOutputDev dev->objectEnd( ); } -void PMPov31SerCamera( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerCamera( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMCamera* o = ( PMCamera* ) object; @@ -301,18 +301,18 @@ void PMPov31SerCamera( const PMObject* object, const PMMetaObject* tqmetaObject, dev->writeLine( "variance " + str ); } - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerClippedBy( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerClippedBy( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMClippedBy* o = ( PMClippedBy* ) object; dev->objectBegin( "clipped_by" ); if( o->boundedBy( ) ) dev->writeLine( "bounded_by" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } @@ -334,7 +334,7 @@ void PMPov31SerCompositeObject( const PMObject* object, const PMMetaObject*, PMO dev->serialize( tmp ); } -void PMPov31SerCone( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerCone( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMCone* o = ( PMCone* ) object; @@ -349,11 +349,11 @@ void PMPov31SerCone( const PMObject* object, const PMMetaObject* tqmetaObject, P if( o->open( ) ) dev->writeLine( TQString( "open" ) ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerCSG( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerCSG( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMCSG* o = ( PMCSG* ) object; @@ -374,11 +374,11 @@ void PMPov31SerCSG( const PMObject* object, const PMMetaObject* tqmetaObject, PM } dev->writeName( object->name( ) ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerCylinder( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerCylinder( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMCylinder* o = ( PMCylinder* ) object; @@ -392,22 +392,22 @@ void PMPov31SerCylinder( const PMObject* object, const PMMetaObject* tqmetaObjec if( o->open( ) ) dev->writeLine( TQString( "open" ) ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerDeclare( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerDeclare( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMDeclare* o = ( PMDeclare* ) object; if( o->firstChild( ) ) { dev->declareBegin( o->id( ) ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); } } -void PMPov31SerDensity( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerDensity( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { bool bObject = true; if( object->parent( ) ) @@ -416,12 +416,12 @@ void PMPov31SerDensity( const PMObject* object, const PMMetaObject* tqmetaObject if( bObject ) dev->objectBegin( "density" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); if( bObject ) dev->objectEnd( ); } -void PMPov31SerDisc( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerDisc( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMDisc* o = ( PMDisc* ) object; @@ -439,11 +439,11 @@ void PMPov31SerDisc( const PMObject* object, const PMMetaObject* tqmetaObject, P { dev->writeLine( o->center( ).serialize( ) + "," + o->normal( ).serialize( ) + ", " + str1 ); } - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerFinish( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerFinish( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMFinish* o = ( PMFinish* ) object; @@ -451,7 +451,7 @@ void PMPov31SerFinish( const PMObject* object, const PMMetaObject* tqmetaObject, dev->objectBegin( "finish" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); if( o->isAmbientEnabled( ) ) dev->writeLine( "ambient " + o->ambientColor( ).serialize( ) ); @@ -588,7 +588,7 @@ void PMPov31SerFog( const PMObject* object, const PMMetaObject*, PMOutputDevice* dev->writeLine( "up " + o->up( ).serialize( ) ); } // Serialize the tqchildren of this object - dev->callSerialization( object, object->tqmetaObject( )->superClass( )->superClass( ) ); + dev->callSerialization( object, object->metaObject( )->superClass( )->superClass( ) ); dev->objectEnd( ); } @@ -708,16 +708,16 @@ void PMPov31SerGlobalSettings( const PMObject* object, const PMMetaObject*, PMOu dev->objectEnd( ); } -void PMPov31SerGraphicalObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerGraphicalObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMGraphicalObject* o = ( PMGraphicalObject* ) object; - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); if( o->noShadow( ) ) dev->writeLine( "no_shadow" ); } -void PMPov31SerHeightField( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerHeightField( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMHeightField* o = ( PMHeightField* ) object; @@ -733,7 +733,7 @@ void PMPov31SerHeightField( const PMObject* object, const PMMetaObject* tqmetaOb if( o->smooth( ) ) dev->writeLine( "smooth" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } @@ -842,14 +842,14 @@ void PMPov31SerImageMap( const PMObject* object, const PMMetaObject*, PMOutputDe dev->objectEnd( ); } -void PMPov31SerInterior( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerInterior( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMInterior* o = ( PMInterior* ) object; TQString str1; dev->objectBegin( "interior" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); if( o->isIorEnabled( ) ) { @@ -874,7 +874,7 @@ void PMPov31SerInterior( const PMObject* object, const PMMetaObject* tqmetaObjec dev->objectEnd( ); } -void PMPov31SerJuliaFractal( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerJuliaFractal( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMJuliaFractal* o = ( PMJuliaFractal* ) object; @@ -896,11 +896,11 @@ void PMPov31SerJuliaFractal( const PMObject* object, const PMMetaObject* tqmetaO .tqarg( o->sliceDistance( ) ) ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerLathe( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerLathe( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMLathe* o = ( PMLathe* ) object; @@ -942,14 +942,14 @@ void PMPov31SerLathe( const PMObject* object, const PMMetaObject* tqmetaObject, if( o->sturm( ) ) dev->writeLine( "sturm" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } const double c_defaultLightTightness = 10; const int c_defaultLightAdaptive = 0; -void PMPov31SerLight( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerLight( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMLight* o = ( PMLight* ) object; @@ -997,11 +997,11 @@ void PMPov31SerLight( const PMObject* object, const PMMetaObject* tqmetaObject, if( !o->mediaAttenuation( ) ) dev->writeLine( TQString( "media_attenuation off" ) ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerListPattern( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerListPattern( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMListPattern* o = ( PMListPattern* ) object; @@ -1020,7 +1020,7 @@ void PMPov31SerListPattern( const PMObject* object, const PMMetaObject* tqmetaOb break; } - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); if( o->listType( ) == PMListPattern::ListPatternBrick ) { @@ -1031,24 +1031,24 @@ void PMPov31SerListPattern( const PMObject* object, const PMMetaObject* tqmetaOb } } -void PMPov31SerTextureList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerTextureList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); } -void PMPov31SerPigmentList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerPigmentList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); } -void PMPov31SerColorList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerColorList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); } -void PMPov31SerDensityList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerDensityList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); } void PMPov31SerNormalList( const PMObject* object, const PMMetaObject*, PMOutputDevice* dev ) @@ -1083,22 +1083,22 @@ void PMPov31SerNormalList( const PMObject* object, const PMMetaObject*, PMOutput } } -void PMPov31SerLooksLike( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerLooksLike( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { dev->objectBegin( "looks_like" ); dev->writeName( object->name( ) ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerMaterial( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerMaterial( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { dev->objectBegin( "material" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerMaterialMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerMaterialMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMMaterialMap* o = ( PMMaterialMap* ) object; @@ -1169,7 +1169,7 @@ void PMPov31SerMaterialMap( const PMObject* object, const PMMetaObject* tqmetaOb break; } - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } @@ -1183,7 +1183,7 @@ const double c_defaultMediaRatio = 0.9; const double c_defaultMediaScatteringEccentricity = 0; const double c_defaultMediaScatteringExtinction = 1.0; -void PMPov31SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerMedia( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMMedia* o = ( PMMedia* ) object; @@ -1191,7 +1191,7 @@ void PMPov31SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject, TQString str2; dev->objectBegin( "media" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); if( o->intervals( ) != c_defaultMediaIntervals ) { str1.setNum( o->intervals( ) ); @@ -1248,12 +1248,12 @@ void PMPov31SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject, dev->objectEnd( ); } -void PMPov31SerNamedObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerNamedObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); } -void PMPov31SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerNormal( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMNormal* o = ( PMNormal* ) object; @@ -1266,7 +1266,7 @@ void PMPov31SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject, if( bObject ) dev->objectBegin( "normal" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); if( o->isBumpSizeEnabled( ) ) { str1.setNum( o->bumpSize( ) ); @@ -1276,7 +1276,7 @@ void PMPov31SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject, dev->objectEnd( ); } -void PMPov31SerObjectLink( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerObjectLink( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMObjectLink* o = ( PMObjectLink* ) object; @@ -1289,7 +1289,7 @@ void PMPov31SerObjectLink( const PMObject* object, const PMMetaObject* tqmetaObj dev->writeName( object->name( ) ); dev->writeLine( o->linkedObject( )->id( ) ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); writeComment = false; dev->objectEnd( ); @@ -1453,7 +1453,7 @@ void PMPov31SerPattern( const PMObject* object, const PMMetaObject*, PMOutputDev } } -void PMPov31SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerPigment( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMPigment* o = ( PMPigment* ) object; @@ -1464,12 +1464,12 @@ void PMPov31SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject if( bObject ) dev->objectBegin( "pigment" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); if( bObject ) dev->objectEnd( ); } -void PMPov31SerPlane( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerPlane( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMPlane* o = ( PMPlane* ) object; @@ -1479,11 +1479,11 @@ void PMPov31SerPlane( const PMObject* object, const PMMetaObject* tqmetaObject, TQString str1; str1.setNum( o->distance( ) ); dev->writeLine( o->normal( ).serialize( ) + ", " + str1 ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerPolynom( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerPolynom( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMPolynom* o = ( PMPolynom* ) object; PMVector coefficients = o->coefficients( ); @@ -1537,7 +1537,7 @@ void PMPov31SerPolynom( const PMObject* object, const PMMetaObject* tqmetaObject dev->writeLine( "sturm" ); } - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } @@ -1555,7 +1555,7 @@ void PMPov31SerPovrayMatrix( const PMObject* object, const PMMetaObject*, PMOutp .tqarg( o->values( )[10] ).tqarg( o->values( )[11] ) ); } -void PMPov31SerPrism( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerPrism( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMPrism* o = ( PMPrism* ) object; @@ -1628,7 +1628,7 @@ void PMPov31SerPrism( const PMObject* object, const PMMetaObject* tqmetaObject, if( o->sturm( ) ) dev->writeLine( "sturm" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } @@ -1639,14 +1639,14 @@ void PMPov31SerQuickColor( const PMObject* object, const PMMetaObject*, PMOutput dev->writeLine( "quick_color " + o->color( ).serialize( ) ); } -void PMPov31SerRainbow( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerRainbow( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMRainbow* o = ( PMRainbow* ) object; TQString str1; dev->objectBegin( "rainbow" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); if( o->isDirectionEnabled( ) ) dev->writeLine( "direction " + o->direction( ).serialize( ) ); @@ -1761,15 +1761,15 @@ void PMPov31SerScale( const PMObject* object, const PMMetaObject* , PMOutputDevi dev->writeLine( "scale " + scale.serialize( ) ); } -void PMPov31SerScene( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerScene( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); } -void PMPov31SerSkySphere( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerSkySphere( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { dev->objectBegin( "sky_sphere" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } @@ -1792,11 +1792,11 @@ void PMPov31SerSolidColor( const PMObject* object, const PMMetaObject* , PMOutpu dev->writeLine( o->color( ).serialize( true ) ); } -void PMPov31SerSolidObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerSolidObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMSolidObject* o = ( PMSolidObject* ) object; - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); switch( o->hollow( ) ) { case PMTrue: @@ -1812,7 +1812,7 @@ void PMPov31SerSolidObject( const PMObject* object, const PMMetaObject* tqmetaOb dev->writeLine( "inverse" ); } -void PMPov31SerSurfaceOfRevolution( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerSurfaceOfRevolution( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMSurfaceOfRevolution* o = ( PMSurfaceOfRevolution* ) object; @@ -1840,11 +1840,11 @@ void PMPov31SerSurfaceOfRevolution( const PMObject* object, const PMMetaObject* if( o->sturm( ) ) dev->writeLine( "sturm" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerSphere( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerSphere( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMSphere* o = ( PMSphere* ) object; @@ -1853,11 +1853,11 @@ void PMPov31SerSphere( const PMObject* object, const PMMetaObject* tqmetaObject, TQString str; str.setNum( o->radius( ) ); dev->writeLine( o->centre( ).serialize( ) + ", " + str ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerSuperquadricEllipsoid( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerSuperquadricEllipsoid( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMSuperquadricEllipsoid* o = ( PMSuperquadricEllipsoid* ) object; @@ -1867,11 +1867,11 @@ void PMPov31SerSuperquadricEllipsoid( const PMObject* object, const PMMetaObject dev->writeLine( TQString( "<%1, %2>" ).tqarg( o->eastWestExponent( ) ) .tqarg( o->northSouthExponent( ) ) ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerText( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerText( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMText* o = ( PMText* ) object; @@ -1883,11 +1883,11 @@ void PMPov31SerText( const PMObject* object, const PMMetaObject* tqmetaObject, P dev->writeLine( TQString( "%1, " ).tqarg( o->thickness( ) ) + o->offset( ).serialize( ) ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerTexture( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMTexture* o = ( PMTexture* ) object; @@ -1898,12 +1898,12 @@ void PMPov31SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject if( bObject ) dev->objectBegin( "texture" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); if( bObject ) dev->objectEnd( ); } -void PMPov31SerTextureBase( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerTextureBase( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMTextureBase* o = ( PMTextureBase* ) object; @@ -1926,7 +1926,7 @@ void PMPov31SerTextureBase( const PMObject* object, const PMMetaObject* tqmetaOb } } - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); } void PMPov31SerTextureMapBase( const PMObject* object, const PMMetaObject* , PMOutputDevice* dev ) @@ -1970,49 +1970,49 @@ void PMPov31SerTextureMapBase( const PMObject* object, const PMMetaObject* , PMO } } -void PMPov31SerTextureMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerTextureMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { dev->objectBegin( "texture_map" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerPigmentMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerPigmentMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { dev->objectBegin( "pigment_map" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerColorMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerColorMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { dev->objectBegin( "color_map" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerNormalMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerNormalMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { dev->objectBegin( "normal_map" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerSlopeMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerSlopeMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { dev->objectBegin( "slope_map" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerDensityMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerDensityMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { dev->objectBegin( "density_map" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov31SerTorus( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerTorus( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMTorus* o = ( PMTorus* ) object; @@ -2027,7 +2027,7 @@ void PMPov31SerTorus( const PMObject* object, const PMMetaObject* tqmetaObject, if( o->sturm( ) ) dev->writeLine( TQString( "sturm" ) ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } @@ -2081,7 +2081,7 @@ void PMPov31SerTranslate( const PMObject* object, const PMMetaObject* , PMOutput dev->writeLine( "translate " + vector ); } -void PMPov31SerTriangle( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerTriangle( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMTriangle* o = ( PMTriangle* ) object; @@ -2094,7 +2094,7 @@ void PMPov31SerTriangle( const PMObject* object, const PMMetaObject* tqmetaObjec dev->writeLine( o->point( 1 ).serialize( ) + ", " + o->normal( 1 ).serialize( ) + "," ); dev->writeLine( o->point( 2 ).serialize( ) + ", " + o->normal( 2 ).serialize( ) ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } else @@ -2105,7 +2105,7 @@ void PMPov31SerTriangle( const PMObject* object, const PMMetaObject* tqmetaObjec dev->writeLine( o->point( 0 ).serialize( ) + ", " + o->point( 1 ).serialize( ) + ", " + o->point( 2 ).serialize( ) ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } } @@ -2193,7 +2193,7 @@ void PMPov31SerWarp( const PMObject* object, const PMMetaObject* , PMOutputDevic dev->objectEnd( ); } -void PMPov31SerDetailObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov31SerDetailObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); } diff --git a/kpovmodeler/pmpovray31serialization.h b/kpovmodeler/pmpovray31serialization.h index 397ae9e9..5c48c0cd 100644 --- a/kpovmodeler/pmpovray31serialization.h +++ b/kpovmodeler/pmpovray31serialization.h @@ -24,80 +24,80 @@ class PMOutputDevice; // serialization methods for POV-Ray 3.1 -void PMPov31SerBicubicPatch( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerBlendMapModifiers( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerBlob( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerBlobCylinder( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerBlobSphere( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerBoundedBy( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerBox( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerBumpMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerCamera( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerClippedBy( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerComment( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerCompositeObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerCone( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerCSG( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerCylinder( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerDeclare( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerDensity( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerDisc( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerFinish( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerFog( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerGlobalSettings( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerGraphicalObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerHeightField( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerImageMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerInterior( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerJuliaFractal( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerLathe( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerLight( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerListPattern( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerTextureList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerPigmentList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerColorList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerDensityList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerNormalList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerLooksLike( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerMaterial( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerMaterialMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerNamedObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerObjectLink( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerPattern( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerPlane( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerPolynom( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerPovrayMatrix( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerPrism( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerQuickColor( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerRainbow( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerRaw( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerRotate( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerScale( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerScene( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerSkySphere( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerSlope( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerSolidColor( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerSolidObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerSurfaceOfRevolution( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerSphere( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerSuperquadricEllipsoid( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerText( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerTextureBase( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerTextureMapBase( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerTextureMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerPigmentMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerColorMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerNormalMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerSlopeMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerDensityMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerTorus( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerTranslate( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerTriangle( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerWarp( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov31SerDetailObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); +void PMPov31SerBicubicPatch( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerBlendMapModifiers( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerBlob( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerBlobCylinder( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerBlobSphere( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerBoundedBy( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerBox( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerBumpMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerCamera( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerClippedBy( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerComment( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerCompositeObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerCone( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerCSG( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerCylinder( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerDeclare( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerDensity( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerDisc( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerFinish( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerFog( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerGlobalSettings( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerGraphicalObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerHeightField( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerImageMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerInterior( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerJuliaFractal( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerLathe( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerLight( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerListPattern( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerTextureList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerPigmentList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerColorList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerDensityList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerNormalList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerLooksLike( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerMaterial( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerMaterialMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerMedia( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerNamedObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerNormal( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerObjectLink( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerPattern( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerPigment( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerPlane( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerPolynom( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerPovrayMatrix( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerPrism( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerQuickColor( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerRainbow( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerRaw( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerRotate( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerScale( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerScene( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerSkySphere( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerSlope( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerSolidColor( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerSolidObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerSurfaceOfRevolution( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerSphere( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerSuperquadricEllipsoid( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerText( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerTexture( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerTextureBase( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerTextureMapBase( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerTextureMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerPigmentMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerColorMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerNormalMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerSlopeMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerDensityMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerTorus( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerTranslate( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerTriangle( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerWarp( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerDetailObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); #endif diff --git a/kpovmodeler/pmpovray35serialization.cpp b/kpovmodeler/pmpovray35serialization.cpp index a012c646..457f51a4 100644 --- a/kpovmodeler/pmpovray35serialization.cpp +++ b/kpovmodeler/pmpovray35serialization.cpp @@ -58,7 +58,7 @@ const double c_defaultIsoOpen = false; const int c_defaultIsoMaxTrace = 1; const bool c_defaultIsoAllIntersections = false; -void PMPov35SerIsoSurface( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov35SerIsoSurface( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMIsoSurface* o = ( PMIsoSurface* ) object; TQString str; @@ -116,14 +116,14 @@ void PMPov35SerIsoSurface( const PMObject* object, const PMMetaObject* tqmetaObj if( o->open( ) ) dev->writeLine( "open" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } const double c_defaultLightTightness = 10; const int c_defaultLightAdaptive = 0; -void PMPov35SerLight( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov35SerLight( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMLight* o = ( PMLight* ) object; @@ -178,15 +178,15 @@ void PMPov35SerLight( const PMObject* object, const PMMetaObject* tqmetaObject, if( !o->mediaAttenuation( ) ) dev->writeLine( TQString( "media_attenuation off" ) ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov35SerProjectedThrough( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov35SerProjectedThrough( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { dev->objectBegin( "projected_through" ); dev->writeName( object->name( ) ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } @@ -209,7 +209,7 @@ const double c_defaultGlobalSettingsMinimumReuse = 0.015; const int c_defaultGlobalSettingsNearestCount = 5; const int c_defaultGlobalSettingsRecursionLimit = 2; -void PMPov35SerGlobalSettings( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov35SerGlobalSettings( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMGlobalSettings* o = ( PMGlobalSettings* ) object; @@ -310,7 +310,7 @@ void PMPov35SerGlobalSettings( const PMObject* object, const PMMetaObject* tqmet dev->objectEnd( ); } else - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } @@ -559,14 +559,14 @@ void PMPov35SerPhotons( const PMObject* object, const PMMetaObject*, PMOutputDev dev->objectEnd( ); } -void PMPov35SerInterior( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov35SerInterior( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMInterior* o = ( PMInterior* ) object; TQString str1; dev->objectBegin( "interior" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); if( o->isIorEnabled( ) ) { @@ -601,14 +601,14 @@ void PMPov35SerInterior( const PMObject* object, const PMMetaObject* tqmetaObjec dev->objectEnd( ); } -void PMPov35SerLightGroup( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov35SerLightGroup( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMLightGroup* o = ( PMLightGroup* ) object; dev->objectBegin( "light_group" ); dev->writeName( object->name( ) ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); if ( o->globalLights( ) ) dev->writeLine( "global_lights on" ); @@ -887,7 +887,7 @@ void PMPov35SerPattern( const PMObject* object, const PMMetaObject*, PMOutputDev const double c_defaultNormalAccuracy = 0.02; -void PMPov35SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov35SerNormal( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMNormal* o = ( PMNormal* ) object; @@ -907,7 +907,7 @@ void PMPov35SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject, dev->writeLine( "uv_mapping" ); } - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); if( o->isBumpSizeEnabled( ) ) { @@ -925,10 +925,10 @@ void PMPov35SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject, dev->objectEnd( ); } -void PMPov35SerInteriorTexture( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov35SerInteriorTexture( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { dev->objectBegin( "interior_texture" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } @@ -1057,7 +1057,7 @@ void PMPov35SerWarp( const PMObject* object, const PMMetaObject* , PMOutputDevic const double c_sphereSweepToleranceDefault = 1e-6; -void PMPov35SerSphereSweep( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov35SerSphereSweep( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMSphereSweep* o = ( PMSphereSweep* ) object; @@ -1099,11 +1099,11 @@ void PMPov35SerSphereSweep( const PMObject* object, const PMMetaObject* tqmetaOb dev->writeLine( "tolerance " + str1 ); } - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov35SerFinish( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov35SerFinish( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMFinish* o = ( PMFinish* ) object; @@ -1111,7 +1111,7 @@ void PMPov35SerFinish( const PMObject* object, const PMMetaObject* tqmetaObject, dev->objectBegin( "finish" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); if( o->isAmbientEnabled( ) ) dev->writeLine( "ambient " + o->ambientColor( ).serialize( ) ); @@ -1216,7 +1216,7 @@ void PMPov35SerFinish( const PMObject* object, const PMMetaObject* tqmetaObject, dev->objectEnd( ); } -void PMPov35SerMesh( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov35SerMesh( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMMesh* o = ( PMMesh* ) object; @@ -1225,7 +1225,7 @@ void PMPov35SerMesh( const PMObject* object, const PMMetaObject* tqmetaObject, P if( o->isInsideVectorEnabled( ) ) dev->writeLine( "inside_vector " + o->insideVector( ).serialize( ) ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); if( !o->hierarchy( ) ) dev->writeLine( "hierarchy off" ); @@ -1245,7 +1245,7 @@ const double c_defaultMediaAAThreshold = 0.1; const double c_defaultMediaScatteringEccentricity = 0; const double c_defaultMediaScatteringExtinction = 1.0; -void PMPov35SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov35SerMedia( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMMedia* o = ( PMMedia* ) object; @@ -1253,7 +1253,7 @@ void PMPov35SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject, TQString str2; dev->objectBegin( "media" ); - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); if( o->method( ) != c_defaultMediaMethod ) { @@ -1332,11 +1332,11 @@ void PMPov35SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject, dev->objectEnd( ); } -void PMPov35SerGraphicalObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov35SerGraphicalObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMGraphicalObject* o = ( PMGraphicalObject* ) object; - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); if( o->noShadow( ) ) dev->writeLine( "no_shadow" ); @@ -1351,7 +1351,7 @@ void PMPov35SerGraphicalObject( const PMObject* object, const PMMetaObject* tqme dev->writeLine( "double_illuminate" ); } -void PMPov35SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov35SerPigment( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMPigment* o = ( PMPigment* ) object; @@ -1366,12 +1366,12 @@ void PMPov35SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject if ( o->uvMapping() ) dev->writeLine( "uv_mapping" ); } - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); if( bObject ) dev->objectEnd( ); } -void PMPov35SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov35SerTexture( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMTexture* o = ( PMTexture* ) object; @@ -1386,14 +1386,14 @@ void PMPov35SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject if ( o->uvMapping() ) dev->writeLine( "uv_mapping" ); } - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); if( bObject ) dev->objectEnd( ); } const double c_defaultPatchFlatness = 0; -void PMPov35SerBicubicPatch( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov35SerBicubicPatch( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMBicubicPatch* o = ( PMBicubicPatch* ) object; @@ -1433,11 +1433,11 @@ void PMPov35SerBicubicPatch( const PMObject* object, const PMMetaObject* tqmetaO dev->writeLine( line ); } - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } -void PMPov35SerTriangle( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) +void PMPov35SerTriangle( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ) { PMTriangle* o = ( PMTriangle* ) object; @@ -1466,6 +1466,6 @@ void PMPov35SerTriangle( const PMObject* object, const PMMetaObject* tqmetaObjec " " + o->uvVector( 2 ).serialize( ) ); } - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); dev->objectEnd( ); } diff --git a/kpovmodeler/pmpovray35serialization.h b/kpovmodeler/pmpovray35serialization.h index 507b941b..4e511d55 100644 --- a/kpovmodeler/pmpovray35serialization.h +++ b/kpovmodeler/pmpovray35serialization.h @@ -24,26 +24,26 @@ class PMOutputDevice; // serialization methods for POV-Ray 3.5 -void PMPov35SerIsoSurface( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov35SerLight( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov35SerProjectedThrough( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov35SerGlobalSettings( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov35SerRadiosity( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov35SerGlobalPhotons( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov35SerPhotons( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov35SerInterior( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov35SerLightGroup( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov35SerPattern( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov35SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov35SerInteriorTexture( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov35SerWarp( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov35SerSphereSweep( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov35SerFinish( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov35SerMesh( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov35SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov35SerGraphicalObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov35SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov35SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov35SerBicubicPatch( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); -void PMPov35SerTriangle( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ); +void PMPov35SerIsoSurface( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov35SerLight( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov35SerProjectedThrough( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov35SerGlobalSettings( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov35SerRadiosity( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov35SerGlobalPhotons( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov35SerPhotons( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov35SerInterior( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov35SerLightGroup( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov35SerPattern( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov35SerNormal( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov35SerInteriorTexture( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov35SerWarp( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov35SerSphereSweep( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov35SerFinish( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov35SerMesh( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov35SerMedia( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov35SerGraphicalObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov35SerPigment( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov35SerTexture( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov35SerBicubicPatch( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov35SerTriangle( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev ); #endif diff --git a/kpovmodeler/pmpovraymatrix.cpp b/kpovmodeler/pmpovraymatrix.cpp index fd90ad92..d51610f1 100644 --- a/kpovmodeler/pmpovraymatrix.cpp +++ b/kpovmodeler/pmpovraymatrix.cpp @@ -72,11 +72,11 @@ void PMPovrayMatrix::readAttributes( const PMXMLHelper& h ) m_values.resize( 12 ); } -PMMetaObject* PMPovrayMatrix::tqmetaObject( ) const +PMMetaObject* PMPovrayMatrix::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "PovrayMatrix", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "PovrayMatrix", Base::metaObject( ), createNewPovrayMatrix ); s_pMetaObject->addProperty( new PMPovrayMatrixProperty( "values", &PMPovrayMatrix::setValues, &PMPovrayMatrix::values ) ); diff --git a/kpovmodeler/pmpovraymatrix.h b/kpovmodeler/pmpovraymatrix.h index d42e5f22..c4e0d886 100644 --- a/kpovmodeler/pmpovraymatrix.h +++ b/kpovmodeler/pmpovraymatrix.h @@ -53,7 +53,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmpovrayrenderwidget.cpp b/kpovmodeler/pmpovrayrenderwidget.cpp index ac95309c..6e8b4ef2 100644 --- a/kpovmodeler/pmpovrayrenderwidget.cpp +++ b/kpovmodeler/pmpovrayrenderwidget.cpp @@ -393,7 +393,7 @@ void PMPovrayRenderWidget::cleanup( ) m_pTempFile = 0; } -TQSize PMPovrayRenderWidget::tqsizeHint( ) const +TQSize PMPovrayRenderWidget::sizeHint( ) const { TQSize s; if( m_image.isNull( ) ) @@ -401,7 +401,7 @@ TQSize PMPovrayRenderWidget::tqsizeHint( ) const else s = m_image.size( ); - return s.expandedTo( tqminimumSize( ) ); + return s.expandedTo( minimumSize( ) ); } void PMPovrayRenderWidget::saveConfig( KConfig* cfg ) diff --git a/kpovmodeler/pmpovrayrenderwidget.h b/kpovmodeler/pmpovrayrenderwidget.h index 8f9d0533..7e295172 100644 --- a/kpovmodeler/pmpovrayrenderwidget.h +++ b/kpovmodeler/pmpovrayrenderwidget.h @@ -91,7 +91,7 @@ public: */ static void setPovrayLibraryPaths( const TQStringList& slist ) { s_libraryPaths = slist; } - virtual TQSize tqsizeHint( ) const; + virtual TQSize sizeHint( ) const; virtual void startDrag( ); signals: diff --git a/kpovmodeler/pmpovraywidget.cpp b/kpovmodeler/pmpovraywidget.cpp index c4ce83cb..0d9cea35 100644 --- a/kpovmodeler/pmpovraywidget.cpp +++ b/kpovmodeler/pmpovraywidget.cpp @@ -140,13 +140,13 @@ bool PMPovrayWidget::render( const TQByteArray& scene, const PMRenderMode& m, int w, h; w = maxSize.width( ) + KDialog::spacingHint( ) * 2; - h = maxSize.height( ) + m_pSaveButton->tqsizeHint( ).height( ) * 2 + h = maxSize.height( ) + m_pSaveButton->sizeHint( ).height( ) * 2 + KDialog::spacingHint( ) * 6; - if( m_pProgressLabel->tqsizeHint( ).height( ) - > m_pProgressBar->tqsizeHint( ).height( ) ) - h += m_pProgressLabel->tqsizeHint( ).height( ); + if( m_pProgressLabel->sizeHint( ).height( ) + > m_pProgressBar->sizeHint( ).height( ) ) + h += m_pProgressLabel->sizeHint( ).height( ); else - h += m_pProgressBar->tqsizeHint( ).height( ); + h += m_pProgressBar->sizeHint( ).height( ); w += 16; h += 16; @@ -319,11 +319,11 @@ void PMPovrayWidget::slotPovrayOutput( ) m_pPovrayOutputWidget->show( ); } -void PMPovrayWidget::slotRenderingFinished( int returntqStatus ) +void PMPovrayWidget::slotRenderingFinished( int returnStatus ) { - kdDebug( PMArea ) << "Povray exited with status " << returntqStatus << endl; + kdDebug( PMArea ) << "Povray exited with status " << returnStatus << endl; m_bRunning = false; - if( returntqStatus == 0 ) + if( returnStatus == 0 ) m_pSaveButton->setEnabled( true ); m_pStopButton->setEnabled( false ); m_pSuspendButton->setEnabled( false ); @@ -331,11 +331,11 @@ void PMPovrayWidget::slotRenderingFinished( int returntqStatus ) m_pProgressLabel->setText( i18n( "finished" ) ); m_pProgressTimer->stop( ); - if( ( returntqStatus != 0 ) && !m_stopped ) + if( ( returnStatus != 0 ) && !m_stopped ) { KMessageBox::error( this, i18n( "Povray exited abnormally.\n" "See the povray output for details." ) - .tqarg( returntqStatus ) ); + .tqarg( returnStatus ) ); } else if( m_pRenderWidget->povrayOutput( ).contains( "ERROR" ) ) { diff --git a/kpovmodeler/pmpovraywidget.h b/kpovmodeler/pmpovraywidget.h index c21cdc7b..27c37cb3 100644 --- a/kpovmodeler/pmpovraywidget.h +++ b/kpovmodeler/pmpovraywidget.h @@ -70,7 +70,7 @@ public slots: void slotPovrayOutput( ); protected slots: - void slotRenderingFinished( int returntqStatus ); + void slotRenderingFinished( int returnStatus ); void slotProgress( int i ); void slotLineFinished( int line ); void slotUpdateSpeed( ); diff --git a/kpovmodeler/pmprism.cpp b/kpovmodeler/pmprism.cpp index a7c5c8f7..5e627935 100644 --- a/kpovmodeler/pmprism.cpp +++ b/kpovmodeler/pmprism.cpp @@ -272,11 +272,11 @@ void PMPrism::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMPrism::tqmetaObject( ) const +PMMetaObject* PMPrism::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Prism", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Prism", Base::metaObject( ), createNewPrism ); s_pMetaObject->addProperty( new PMPrismProperty( "sturm", &PMPrism::setSturm, &PMPrism::sturm ) ); diff --git a/kpovmodeler/pmprism.h b/kpovmodeler/pmprism.h index facce467..a22fb748 100644 --- a/kpovmodeler/pmprism.h +++ b/kpovmodeler/pmprism.h @@ -67,7 +67,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmprojectedthrough.cpp b/kpovmodeler/pmprojectedthrough.cpp index 71710395..96c0c00a 100644 --- a/kpovmodeler/pmprojectedthrough.cpp +++ b/kpovmodeler/pmprojectedthrough.cpp @@ -49,11 +49,11 @@ TQString PMProjectedThrough::description( ) const return i18n( "projected through" ); } -PMMetaObject* PMProjectedThrough::tqmetaObject( ) const +PMMetaObject* PMProjectedThrough::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "ProjectedThrough", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "ProjectedThrough", Base::metaObject( ), createNewProjectedThrough ); // no properties } diff --git a/kpovmodeler/pmprojectedthrough.h b/kpovmodeler/pmprojectedthrough.h index 606aa972..4212097f 100644 --- a/kpovmodeler/pmprojectedthrough.h +++ b/kpovmodeler/pmprojectedthrough.h @@ -53,7 +53,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmprototypemanager.cpp b/kpovmodeler/pmprototypemanager.cpp index fd02e50b..ac8f5140 100644 --- a/kpovmodeler/pmprototypemanager.cpp +++ b/kpovmodeler/pmprototypemanager.cpp @@ -147,33 +147,33 @@ void PMPrototypeManager::addPrototype( PMObject* obj ) if( !obj ) return; - PMMetaObject* tqmetaObject = obj->tqmetaObject( ); - PMMetaObject* m2 = m_metaDict.find( tqmetaObject->className( ) ); + PMMetaObject* metaObject = obj->metaObject( ); + PMMetaObject* m2 = m_metaDict.find( metaObject->className( ) ); if( m2 ) { kdError( PMArea ) << "PMPrototypeManager: Class '" - << tqmetaObject->className( ) + << metaObject->className( ) << "' already registered." << endl; } else { - if( tqmetaObject->isAbstract( ) ) + if( metaObject->isAbstract( ) ) kdError( PMArea ) << "PMPrototypeManager: The meta object for the prototype " - << tqmetaObject->className( ) + << metaObject->className( ) << " doesn't have a factory method" << endl; - m_prototypes.append( tqmetaObject ); - m_lowerCaseDict[tqmetaObject->className( ).lower( )] = tqmetaObject->className( ); + m_prototypes.append( metaObject ); + m_lowerCaseDict[metaObject->className( ).lower( )] = metaObject->className( ); // insert the meta object and all super classes into the hash table - while( tqmetaObject ) + while( metaObject ) { - if( m_metaDict.find( tqmetaObject->className( ) ) ) - tqmetaObject = 0; + if( m_metaDict.find( metaObject->className( ) ) ) + metaObject = 0; else { - m_metaDict.insert( tqmetaObject->className( ), tqmetaObject ); - tqmetaObject = tqmetaObject->superClass( ); + m_metaDict.insert( metaObject->className( ), metaObject ); + metaObject = metaObject->superClass( ); } } } @@ -184,7 +184,7 @@ void PMPrototypeManager::addDeclarationType( const TQString& className, const TQString& description, const TQString& pixmap ) { - PMMetaObject* m = tqmetaObject( className ); + PMMetaObject* m = metaObject( className ); if( !m ) kdError( PMArea ) << "PMPrototypeManager::addDeclarationType: Unknown class " << className << endl; else @@ -212,7 +212,7 @@ PMObject* PMPrototypeManager::newObject( const TQString& name ) const return meta->newObject( m_pPart ); } -PMMetaObject* PMPrototypeManager::tqmetaObject( const TQString& name ) const +PMMetaObject* PMPrototypeManager::metaObject( const TQString& name ) const { if( name.isNull( ) ) return 0; @@ -222,13 +222,13 @@ PMMetaObject* PMPrototypeManager::tqmetaObject( const TQString& name ) const bool PMPrototypeManager::isA( const TQString& className, const TQString& baseClass ) const { - return isA( tqmetaObject( className ), baseClass ); + return isA( metaObject( className ), baseClass ); } bool PMPrototypeManager::isA( PMMetaObject* c, const TQString& baseClass ) const { - PMMetaObject* bc = tqmetaObject( baseClass ); + PMMetaObject* bc = metaObject( baseClass ); while( c && c != bc ) c = c->superClass( ); return( c && ( c == bc ) ); diff --git a/kpovmodeler/pmprototypemanager.h b/kpovmodeler/pmprototypemanager.h index f37a5852..bade9e29 100644 --- a/kpovmodeler/pmprototypemanager.h +++ b/kpovmodeler/pmprototypemanager.h @@ -111,13 +111,13 @@ public: * not exist. * @see PMMetaObject */ - PMMetaObject* tqmetaObject( const TQString& name ) const; + PMMetaObject* metaObject( const TQString& name ) const; /** * Returns true if the class exists */ bool existsClass( const TQString& name ) const { - return tqmetaObject( name ); + return metaObject( name ); } /** * Returns true if the second class is a base class for diff --git a/kpovmodeler/pmquickcolor.cpp b/kpovmodeler/pmquickcolor.cpp index d1bcf100..25fc7aff 100644 --- a/kpovmodeler/pmquickcolor.cpp +++ b/kpovmodeler/pmquickcolor.cpp @@ -67,11 +67,11 @@ void PMQuickColor::readAttributes( const PMXMLHelper& h ) m_color = h.colorAttribute( "quickcolor", colorDefault ); } -PMMetaObject* PMQuickColor::tqmetaObject( ) const +PMMetaObject* PMQuickColor::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "QuickColor", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "QuickColor", Base::metaObject( ), createNewQuickColor ); s_pMetaObject->addProperty( new PMQuickColorProperty( "color", &PMQuickColor::setColor, &PMQuickColor::color ) ); diff --git a/kpovmodeler/pmquickcolor.h b/kpovmodeler/pmquickcolor.h index 0fe9ccbe..c64d363f 100644 --- a/kpovmodeler/pmquickcolor.h +++ b/kpovmodeler/pmquickcolor.h @@ -57,7 +57,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmradiosity.cpp b/kpovmodeler/pmradiosity.cpp index 39d61342..86d36e74 100644 --- a/kpovmodeler/pmradiosity.cpp +++ b/kpovmodeler/pmradiosity.cpp @@ -86,11 +86,11 @@ PMRadiosity::~PMRadiosity( ) { } -PMMetaObject* PMRadiosity::tqmetaObject( ) const +PMMetaObject* PMRadiosity::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Radiosity", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Radiosity", Base::metaObject( ), createNewRadiosity ); s_pMetaObject->addProperty( new PMRadiosityProperty( "adcBailout", &PMRadiosity::setAdcBailout, &PMRadiosity::adcBailout ) ); diff --git a/kpovmodeler/pmradiosity.h b/kpovmodeler/pmradiosity.h index 4a1c1ad1..c56ccec2 100644 --- a/kpovmodeler/pmradiosity.h +++ b/kpovmodeler/pmradiosity.h @@ -53,7 +53,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmrainbow.cpp b/kpovmodeler/pmrainbow.cpp index 62def615..1fd9e8ca 100644 --- a/kpovmodeler/pmrainbow.cpp +++ b/kpovmodeler/pmrainbow.cpp @@ -87,11 +87,11 @@ PMRainbow::~PMRainbow( ) { } -PMMetaObject* PMRainbow::tqmetaObject( ) const +PMMetaObject* PMRainbow::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Rainbow", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Rainbow", Base::metaObject( ), createNewRainbow ); s_pMetaObject->addProperty( new PMRainbowProperty( "direction", &PMRainbow::setDirection, &PMRainbow::direction ) ); diff --git a/kpovmodeler/pmrainbow.h b/kpovmodeler/pmrainbow.h index 1b631ed1..64dae5d7 100644 --- a/kpovmodeler/pmrainbow.h +++ b/kpovmodeler/pmrainbow.h @@ -52,7 +52,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmraw.cpp b/kpovmodeler/pmraw.cpp index 4971433c..31d7ec1a 100644 --- a/kpovmodeler/pmraw.cpp +++ b/kpovmodeler/pmraw.cpp @@ -69,11 +69,11 @@ void PMRaw::setCode( const TQString& code ) } } -PMMetaObject* PMRaw::tqmetaObject( ) const +PMMetaObject* PMRaw::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Raw", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Raw", Base::metaObject( ), createNewRaw ); s_pMetaObject->addProperty( new PMRawProperty( "code", &PMRaw::setCode, &PMRaw::code ) ); diff --git a/kpovmodeler/pmraw.h b/kpovmodeler/pmraw.h index 541687c8..11c28ad2 100644 --- a/kpovmodeler/pmraw.h +++ b/kpovmodeler/pmraw.h @@ -67,7 +67,7 @@ public: virtual void readAttributes( const PMXMLHelper& h ); /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmrotate.cpp b/kpovmodeler/pmrotate.cpp index feed0091..5a432c91 100644 --- a/kpovmodeler/pmrotate.cpp +++ b/kpovmodeler/pmrotate.cpp @@ -66,11 +66,11 @@ void PMRotate::readAttributes( const PMXMLHelper& h ) m_rotate = h.vectorAttribute( "value", rotateDefault ); } -PMMetaObject* PMRotate::tqmetaObject( ) const +PMMetaObject* PMRotate::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Rotate", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Rotate", Base::metaObject( ), createNewRotate ); s_pMetaObject->addProperty( new PMRotateProperty( "rotation", &PMRotate::setRotation, &PMRotate::rotation ) ); diff --git a/kpovmodeler/pmrotate.h b/kpovmodeler/pmrotate.h index 5090a933..4ecc6d9a 100644 --- a/kpovmodeler/pmrotate.h +++ b/kpovmodeler/pmrotate.h @@ -54,7 +54,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmscale.cpp b/kpovmodeler/pmscale.cpp index 5e1c4717..af8245b8 100644 --- a/kpovmodeler/pmscale.cpp +++ b/kpovmodeler/pmscale.cpp @@ -66,11 +66,11 @@ void PMScale::readAttributes( const PMXMLHelper& h ) m_scale = h.vectorAttribute( "value", scaleDefault ); } -PMMetaObject* PMScale::tqmetaObject( ) const +PMMetaObject* PMScale::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Scale", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Scale", Base::metaObject( ), createNewScale ); s_pMetaObject->addProperty( new PMScaleProperty( "scale", &PMScale::setScale, &PMScale::scale ) ); diff --git a/kpovmodeler/pmscale.h b/kpovmodeler/pmscale.h index 55a40eaf..72821041 100644 --- a/kpovmodeler/pmscale.h +++ b/kpovmodeler/pmscale.h @@ -55,7 +55,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmscene.cpp b/kpovmodeler/pmscene.cpp index 810fa84c..cd6593cd 100644 --- a/kpovmodeler/pmscene.cpp +++ b/kpovmodeler/pmscene.cpp @@ -52,11 +52,11 @@ TQString PMScene::description( ) const return i18n( "scene" ); } -PMMetaObject* PMScene::tqmetaObject( ) const +PMMetaObject* PMScene::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Scene", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Scene", Base::metaObject( ), createNewScene ); } return s_pMetaObject; diff --git a/kpovmodeler/pmscene.h b/kpovmodeler/pmscene.h index 3a93875f..ed7cf227 100644 --- a/kpovmodeler/pmscene.h +++ b/kpovmodeler/pmscene.h @@ -51,7 +51,7 @@ public: virtual ~PMScene( ); /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmskysphere.cpp b/kpovmodeler/pmskysphere.cpp index 39724548..a31cc475 100644 --- a/kpovmodeler/pmskysphere.cpp +++ b/kpovmodeler/pmskysphere.cpp @@ -44,11 +44,11 @@ PMSkySphere::~PMSkySphere( ) { } -PMMetaObject* PMSkySphere::tqmetaObject( ) const +PMMetaObject* PMSkySphere::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "SkySphere", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "SkySphere", Base::metaObject( ), createNewSkySphere ); } return s_pMetaObject; diff --git a/kpovmodeler/pmskysphere.h b/kpovmodeler/pmskysphere.h index d466cb68..116af543 100644 --- a/kpovmodeler/pmskysphere.h +++ b/kpovmodeler/pmskysphere.h @@ -52,7 +52,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmslope.cpp b/kpovmodeler/pmslope.cpp index 663a19fe..1d2d2977 100644 --- a/kpovmodeler/pmslope.cpp +++ b/kpovmodeler/pmslope.cpp @@ -69,11 +69,11 @@ void PMSlope::readAttributes( const PMXMLHelper& h ) m_slope = h.doubleAttribute( "slope", slopeDefault ); } -PMMetaObject* PMSlope::tqmetaObject( ) const +PMMetaObject* PMSlope::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Slope", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Slope", Base::metaObject( ), createNewSlope ); s_pMetaObject->addProperty( new PMSlopeProperty( "height", &PMSlope::setHeight, &PMSlope::height ) ); diff --git a/kpovmodeler/pmslope.h b/kpovmodeler/pmslope.h index e32455c5..eb860373 100644 --- a/kpovmodeler/pmslope.h +++ b/kpovmodeler/pmslope.h @@ -53,7 +53,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmsolidcolor.cpp b/kpovmodeler/pmsolidcolor.cpp index 8ec9ba6d..dd50d030 100644 --- a/kpovmodeler/pmsolidcolor.cpp +++ b/kpovmodeler/pmsolidcolor.cpp @@ -65,11 +65,11 @@ void PMSolidColor::readAttributes( const PMXMLHelper& h ) m_color = h.colorAttribute( "color", colorDefault ); } -PMMetaObject* PMSolidColor::tqmetaObject( ) const +PMMetaObject* PMSolidColor::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "SolidColor", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "SolidColor", Base::metaObject( ), createNewSolidColor ); s_pMetaObject->addProperty( new PMSolidColorProperty( "color", &PMSolidColor::setColor, &PMSolidColor::color ) ); diff --git a/kpovmodeler/pmsolidcolor.h b/kpovmodeler/pmsolidcolor.h index 8b8b36e9..225a3a5b 100644 --- a/kpovmodeler/pmsolidcolor.h +++ b/kpovmodeler/pmsolidcolor.h @@ -54,7 +54,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmsolidobject.cpp b/kpovmodeler/pmsolidobject.cpp index 0c98ded9..61ddd45c 100644 --- a/kpovmodeler/pmsolidobject.cpp +++ b/kpovmodeler/pmsolidobject.cpp @@ -43,11 +43,11 @@ PMSolidObject::~PMSolidObject( ) { } -PMMetaObject* PMSolidObject::tqmetaObject( ) const +PMMetaObject* PMSolidObject::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "SolidObject", Base::tqmetaObject( ) ); + s_pMetaObject = new PMMetaObject( "SolidObject", Base::metaObject( ) ); s_pMetaObject->addProperty( new PMSolidObjectProperty( "inverse", &PMSolidObject::setInverse, &PMSolidObject::inverse ) ); s_pMetaObject->addProperty( diff --git a/kpovmodeler/pmsolidobject.h b/kpovmodeler/pmsolidobject.h index 9406aa0e..2a2990c0 100644 --- a/kpovmodeler/pmsolidobject.h +++ b/kpovmodeler/pmsolidobject.h @@ -48,7 +48,7 @@ public: */ virtual ~PMSolidObject( ); /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmsor.cpp b/kpovmodeler/pmsor.cpp index 997447c4..f25669e6 100644 --- a/kpovmodeler/pmsor.cpp +++ b/kpovmodeler/pmsor.cpp @@ -194,11 +194,11 @@ void PMSurfaceOfRevolution::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMSurfaceOfRevolution::tqmetaObject( ) const +PMMetaObject* PMSurfaceOfRevolution::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "SurfaceOfRevolution", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "SurfaceOfRevolution", Base::metaObject( ), createNewSurfaceOfRevolution ); s_pMetaObject->addProperty( new PMSurfaceOfRevolutionProperty( "sturm", &PMSurfaceOfRevolution::setSturm, diff --git a/kpovmodeler/pmsor.h b/kpovmodeler/pmsor.h index 720987fc..46db677e 100644 --- a/kpovmodeler/pmsor.h +++ b/kpovmodeler/pmsor.h @@ -60,7 +60,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmsphere.cpp b/kpovmodeler/pmsphere.cpp index bbdd3b88..cca385c9 100644 --- a/kpovmodeler/pmsphere.cpp +++ b/kpovmodeler/pmsphere.cpp @@ -71,11 +71,11 @@ TQString PMSphere::description( ) const return i18n( "sphere" ); } -PMMetaObject* PMSphere::tqmetaObject( ) const +PMMetaObject* PMSphere::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Sphere", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Sphere", Base::metaObject( ), createNewSphere ); s_pMetaObject->addProperty( new PMSphereProperty( "radius", &PMSphere::setRadius, &PMSphere::radius ) ); diff --git a/kpovmodeler/pmsphere.h b/kpovmodeler/pmsphere.h index 871b7375..984bc6d6 100644 --- a/kpovmodeler/pmsphere.h +++ b/kpovmodeler/pmsphere.h @@ -57,7 +57,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const; diff --git a/kpovmodeler/pmspheresweep.cpp b/kpovmodeler/pmspheresweep.cpp index ff2e8e1a..40df90f3 100644 --- a/kpovmodeler/pmspheresweep.cpp +++ b/kpovmodeler/pmspheresweep.cpp @@ -216,11 +216,11 @@ void PMSphereSweep::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMSphereSweep::tqmetaObject( ) const +PMMetaObject* PMSphereSweep::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "SphereSweep", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "SphereSweep", Base::metaObject( ), createNewSphereSweep ); s_pMetaObject->addProperty( new PMSphereSweepProperty( "tolerance", &PMSphereSweep::setTolerance, &PMSphereSweep::tolerance ) ); diff --git a/kpovmodeler/pmspheresweep.h b/kpovmodeler/pmspheresweep.h index f4488e1b..b28d69a5 100644 --- a/kpovmodeler/pmspheresweep.h +++ b/kpovmodeler/pmspheresweep.h @@ -63,7 +63,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmsqe.cpp b/kpovmodeler/pmsqe.cpp index 8a0946fb..61279251 100644 --- a/kpovmodeler/pmsqe.cpp +++ b/kpovmodeler/pmsqe.cpp @@ -80,11 +80,11 @@ void PMSuperquadricEllipsoid::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMSuperquadricEllipsoid::tqmetaObject( ) const +PMMetaObject* PMSuperquadricEllipsoid::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "SuperquadricEllipsoid", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "SuperquadricEllipsoid", Base::metaObject( ), createNewSuperquadricEllipsoid ); s_pMetaObject->addProperty( new PMSuperquadricEllipsoidProperty( "eastWestExponent", diff --git a/kpovmodeler/pmsqe.h b/kpovmodeler/pmsqe.h index 835f52c0..acc4e030 100644 --- a/kpovmodeler/pmsqe.h +++ b/kpovmodeler/pmsqe.h @@ -58,7 +58,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const; diff --git a/kpovmodeler/pmtext.cpp b/kpovmodeler/pmtext.cpp index e4b7f0da..9410228d 100644 --- a/kpovmodeler/pmtext.cpp +++ b/kpovmodeler/pmtext.cpp @@ -89,11 +89,11 @@ void PMText::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMText::tqmetaObject( ) const +PMMetaObject* PMText::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Text", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Text", Base::metaObject( ), createNewText ); s_pMetaObject->addProperty( new PMTextProperty( "font", &PMText::setFont, &PMText::font ) ); diff --git a/kpovmodeler/pmtext.h b/kpovmodeler/pmtext.h index 5b769dc7..7ab4aff7 100644 --- a/kpovmodeler/pmtext.h +++ b/kpovmodeler/pmtext.h @@ -56,7 +56,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmtexture.cpp b/kpovmodeler/pmtexture.cpp index 3ae367dd..a40da8cb 100644 --- a/kpovmodeler/pmtexture.cpp +++ b/kpovmodeler/pmtexture.cpp @@ -45,11 +45,11 @@ PMTexture::~PMTexture( ) { } -PMMetaObject* PMTexture::tqmetaObject( ) const +PMMetaObject* PMTexture::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Texture", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Texture", Base::metaObject( ), createNewTexture ); s_pMetaObject->addProperty( new PMTextureProperty( "uvMapping", &PMTexture::setUVMapping, &PMTexture::uvMapping ) ); diff --git a/kpovmodeler/pmtexture.h b/kpovmodeler/pmtexture.h index daeaf427..b2675b11 100644 --- a/kpovmodeler/pmtexture.h +++ b/kpovmodeler/pmtexture.h @@ -52,7 +52,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmtexturebase.cpp b/kpovmodeler/pmtexturebase.cpp index 93c3cdb3..0a8d087b 100644 --- a/kpovmodeler/pmtexturebase.cpp +++ b/kpovmodeler/pmtexturebase.cpp @@ -49,11 +49,11 @@ PMTextureBase::~PMTextureBase( ) { } -PMMetaObject* PMTextureBase::tqmetaObject( ) const +PMMetaObject* PMTextureBase::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "TextureBase", Base::tqmetaObject( ) ); + s_pMetaObject = new PMMetaObject( "TextureBase", Base::metaObject( ) ); s_pMetaObject->addProperty( new PMTextureBaseProperty( "linkedObject", &PMTextureBase::setLinkedObjectProperty, &PMTextureBase::linkedObjectProperty ) ); diff --git a/kpovmodeler/pmtexturebase.h b/kpovmodeler/pmtexturebase.h index 3d57d70f..a3ecdc0a 100644 --- a/kpovmodeler/pmtexturebase.h +++ b/kpovmodeler/pmtexturebase.h @@ -55,7 +55,7 @@ public: virtual void readAttributes( const PMXMLHelper& h ); /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmtexturemap.cpp b/kpovmodeler/pmtexturemap.cpp index dc9f3b76..8602c9fc 100644 --- a/kpovmodeler/pmtexturemap.cpp +++ b/kpovmodeler/pmtexturemap.cpp @@ -138,11 +138,11 @@ void PMTextureMapBase::stringToValues( const TQString& str ) } } -PMMetaObject* PMTextureMapBase::tqmetaObject( ) const +PMMetaObject* PMTextureMapBase::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "TextureMapBase", Base::tqmetaObject( ) ); + s_pMetaObject = new PMMetaObject( "TextureMapBase", Base::metaObject( ) ); s_pMetaObject->addProperty( new PMValueProperty( ) ); } return s_pMetaObject; @@ -342,11 +342,11 @@ PMTextureMap::~PMTextureMap( ) { } -PMMetaObject* PMTextureMap::tqmetaObject( ) const +PMMetaObject* PMTextureMap::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "TextureMap", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "TextureMap", Base::metaObject( ), createNewTextureMap ); } return s_pMetaObject; @@ -388,11 +388,11 @@ PMPigmentMap::~PMPigmentMap( ) { } -PMMetaObject* PMPigmentMap::tqmetaObject( ) const +PMMetaObject* PMPigmentMap::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "PigmentMap", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "PigmentMap", Base::metaObject( ), createNewPigmentMap ); } return s_pMetaObject; @@ -434,11 +434,11 @@ PMColorMap::~PMColorMap( ) { } -PMMetaObject* PMColorMap::tqmetaObject( ) const +PMMetaObject* PMColorMap::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "ColorMap", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "ColorMap", Base::metaObject( ), createNewColorMap ); } return s_pMetaObject; @@ -480,11 +480,11 @@ PMNormalMap::~PMNormalMap( ) { } -PMMetaObject* PMNormalMap::tqmetaObject( ) const +PMMetaObject* PMNormalMap::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "NormalMap", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "NormalMap", Base::metaObject( ), createNewNormalMap ); } return s_pMetaObject; @@ -526,11 +526,11 @@ PMSlopeMap::~PMSlopeMap( ) { } -PMMetaObject* PMSlopeMap::tqmetaObject( ) const +PMMetaObject* PMSlopeMap::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "SlopeMap", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "SlopeMap", Base::metaObject( ), createNewSlopeMap ); } return s_pMetaObject; @@ -572,11 +572,11 @@ PMDensityMap::~PMDensityMap( ) { } -PMMetaObject* PMDensityMap::tqmetaObject( ) const +PMMetaObject* PMDensityMap::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "DensityMap", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "DensityMap", Base::metaObject( ), createNewDensityMap ); } return s_pMetaObject; diff --git a/kpovmodeler/pmtexturemap.h b/kpovmodeler/pmtexturemap.h index 26907ed3..6a7b020d 100644 --- a/kpovmodeler/pmtexturemap.h +++ b/kpovmodeler/pmtexturemap.h @@ -54,7 +54,7 @@ public: virtual bool dataChangeOnInsertRemove( ) const { return true; } /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; @@ -153,7 +153,7 @@ public: virtual TQString mapType( ) const { return TQString( "Texture" ); } /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; @@ -193,7 +193,7 @@ public: virtual TQString mapType( ) const { return TQString( "Pigment" ); } /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; @@ -233,7 +233,7 @@ public: virtual TQString mapType( ) const { return TQString( "SolidColor" ); } /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; @@ -274,7 +274,7 @@ public: virtual TQString mapType( ) const { return TQString( "Normal" ); } /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; @@ -314,7 +314,7 @@ public: virtual TQString mapType( ) const { return TQString( "Slope" ); } /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; @@ -354,7 +354,7 @@ public: virtual TQString mapType( ) const { return TQString( "Density" ); } /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmtorus.cpp b/kpovmodeler/pmtorus.cpp index a32d04e7..5e5be5ea 100644 --- a/kpovmodeler/pmtorus.cpp +++ b/kpovmodeler/pmtorus.cpp @@ -74,11 +74,11 @@ TQString PMTorus::description( ) const return i18n( "torus" ); } -PMMetaObject* PMTorus::tqmetaObject( ) const +PMMetaObject* PMTorus::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Torus", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Torus", Base::metaObject( ), createNewTorus ); s_pMetaObject->addProperty( new PMTorusProperty( "minorRadius", &PMTorus::setMinorRadius, diff --git a/kpovmodeler/pmtorus.h b/kpovmodeler/pmtorus.h index 59b16e3c..a7f1ee6a 100644 --- a/kpovmodeler/pmtorus.h +++ b/kpovmodeler/pmtorus.h @@ -58,7 +58,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const; diff --git a/kpovmodeler/pmtranslate.cpp b/kpovmodeler/pmtranslate.cpp index 0cbfe58d..a0a09b7b 100644 --- a/kpovmodeler/pmtranslate.cpp +++ b/kpovmodeler/pmtranslate.cpp @@ -65,11 +65,11 @@ void PMTranslate::readAttributes( const PMXMLHelper& h ) m_move = h.vectorAttribute( "value", moveDefault ); } -PMMetaObject* PMTranslate::tqmetaObject( ) const +PMMetaObject* PMTranslate::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Translate", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Translate", Base::metaObject( ), createNewTranslate ); s_pMetaObject->addProperty( new PMTranslateProperty( "translation", &PMTranslate::setTranslation, &PMTranslate::translation ) ); diff --git a/kpovmodeler/pmtranslate.h b/kpovmodeler/pmtranslate.h index e121615d..d1272bf6 100644 --- a/kpovmodeler/pmtranslate.h +++ b/kpovmodeler/pmtranslate.h @@ -54,7 +54,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmtriangle.cpp b/kpovmodeler/pmtriangle.cpp index db88443e..ecf00f8c 100644 --- a/kpovmodeler/pmtriangle.cpp +++ b/kpovmodeler/pmtriangle.cpp @@ -228,11 +228,11 @@ void PMTriangle::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMMetaObject* PMTriangle::tqmetaObject( ) const +PMMetaObject* PMTriangle::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Triangle", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Triangle", Base::metaObject( ), createNewTriangle ); s_pMetaObject->addProperty( new PMTriangleProperty( "smooth", &PMTriangle::setSmoothTriangle, diff --git a/kpovmodeler/pmtriangle.h b/kpovmodeler/pmtriangle.h index aeb590d2..e2ef3026 100644 --- a/kpovmodeler/pmtriangle.h +++ b/kpovmodeler/pmtriangle.h @@ -56,7 +56,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const; diff --git a/kpovmodeler/pmunknownview.cpp b/kpovmodeler/pmunknownview.cpp index 646aa619..7a1e6afb 100644 --- a/kpovmodeler/pmunknownview.cpp +++ b/kpovmodeler/pmunknownview.cpp @@ -26,7 +26,7 @@ PMUnknownView::PMUnknownView( const TQString& viewType, TQHBoxLayout* hl = new TQHBoxLayout( this ); TQLabel* l; l = new TQLabel( i18n( "Unknown view type \"%1\"" ).tqarg( viewType ), this ); - l->tqsetAlignment( TQt::AlignCenter ); + l->setAlignment( TQt::AlignCenter ); hl->addWidget( l ); m_viewType = viewType; } diff --git a/kpovmodeler/pmvectorlistedit.cpp b/kpovmodeler/pmvectorlistedit.cpp index fed18026..fb1fa482 100644 --- a/kpovmodeler/pmvectorlistedit.cpp +++ b/kpovmodeler/pmvectorlistedit.cpp @@ -121,7 +121,7 @@ void PMVectorListEdit::init( int dimensions ) setColumnStretchable( i, true ); connect( this, TQT_SIGNAL( valueChanged( int, int ) ), TQT_SLOT( slotTextChanged( int, int ) ) ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); } void PMVectorListEdit::setVectors( const TQValueList<PMVector>& l, @@ -315,11 +315,11 @@ bool PMVectorListEdit::isDataValid( ) return valid; } -TQSize PMVectorListEdit::tqsizeHint( ) const +TQSize PMVectorListEdit::sizeHint( ) const { return TQSize( c_columnWidth * m_dimension + frameWidth( ) * 2, frameWidth( ) * 2 + horizontalHeader( )->height( ) - + verticalHeader( )->tqsizeHint( ).height( ) ); + + verticalHeader( )->sizeHint( ).height( ) ); } void PMVectorListEdit::slotTextChanged( int, int ) diff --git a/kpovmodeler/pmvectorlistedit.h b/kpovmodeler/pmvectorlistedit.h index d415e9a9..a52be9db 100644 --- a/kpovmodeler/pmvectorlistedit.h +++ b/kpovmodeler/pmvectorlistedit.h @@ -147,7 +147,7 @@ public: bool isDataValid( ); /** */ - virtual TQSize tqsizeHint( ) const; + virtual TQSize sizeHint( ) const; /** */ bool eventFilter( TQObject* o, TQEvent* e ); diff --git a/kpovmodeler/pmwarp.cpp b/kpovmodeler/pmwarp.cpp index e97817bb..166777ce 100644 --- a/kpovmodeler/pmwarp.cpp +++ b/kpovmodeler/pmwarp.cpp @@ -221,11 +221,11 @@ void PMWarp::readAttributes( const PMXMLHelper& h ) } } -PMMetaObject* PMWarp::tqmetaObject( ) const +PMMetaObject* PMWarp::metaObject( ) const { if( !s_pMetaObject ) { - s_pMetaObject = new PMMetaObject( "Warp", Base::tqmetaObject( ), + s_pMetaObject = new PMMetaObject( "Warp", Base::metaObject( ), createNewWarp ); PMWarpTypeProperty* p = new PMWarpTypeProperty( diff --git a/kpovmodeler/pmwarp.h b/kpovmodeler/pmwarp.h index 15e86b65..6b50f498 100644 --- a/kpovmodeler/pmwarp.h +++ b/kpovmodeler/pmwarp.h @@ -56,7 +56,7 @@ public: virtual TQString description( ) const; /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/ksnapshot/ksnapshot.h b/ksnapshot/ksnapshot.h index c0d5becc..4850b314 100644 --- a/ksnapshot/ksnapshot.h +++ b/ksnapshot/ksnapshot.h @@ -29,7 +29,7 @@ class KSnapshotPreview : public TQLabel KSnapshotPreview(TQWidget *parent, const char *name = 0) : TQLabel(parent, name) { - tqsetAlignment(AlignHCenter | AlignVCenter); + setAlignment(AlignHCenter | AlignVCenter); setCursor(TQCursor(TQt::PointingHandCursor)); } virtual ~KSnapshotPreview() {} diff --git a/ksnapshot/ksnapshotwidget.ui b/ksnapshot/ksnapshotwidget.ui index 86e942f2..86a2e4e2 100644 --- a/ksnapshot/ksnapshotwidget.ui +++ b/ksnapshot/ksnapshotwidget.ui @@ -23,7 +23,7 @@ <property name="name"> <cstring>lblImage</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>130</height> @@ -107,7 +107,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>156</width> <height>16</height> @@ -193,7 +193,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> diff --git a/ksnapshot/regiongrabber.cpp b/ksnapshot/regiongrabber.cpp index 74ac960a..bc243da4 100644 --- a/ksnapshot/regiongrabber.cpp +++ b/ksnapshot/regiongrabber.cpp @@ -168,8 +168,8 @@ void RegionGrabber::drawRubber() p.setPen( TQPen( color0, 1 ) ); p.setBrush( NoBrush ); - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, tqcolorGroup(), - TQStyle::Style_Default, TQStyleOption( tqcolorGroup().base() ) ); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(), + TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) ); p.end(); } diff --git a/ksvg/ecma/ksvg_ecma.cpp b/ksvg/ecma/ksvg_ecma.cpp index 7fb9c6c1..aa2af84b 100644 --- a/ksvg/ecma/ksvg_ecma.cpp +++ b/ksvg/ecma/ksvg_ecma.cpp @@ -38,16 +38,16 @@ using namespace KSVG; using namespace KJS; -class AsynctqStatus : public ObjectImp +class AsyncStatus : public ObjectImp { public: - AsynctqStatus() : ObjectImp() { } + AsyncStatus() : ObjectImp() { } virtual bool implementsCall() const { return true; } virtual Value call(ExecState *exec, Object &thisObj, const List &args); }; -Value AsynctqStatus::call(ExecState *exec, Object &, const List &args) +Value AsyncStatus::call(ExecState *exec, Object &, const List &args) { kdDebug(26004) << "[AsyncStatus] " << args[0].toString(exec).ascii() << endl; @@ -194,7 +194,7 @@ void KSVGEcma::finishedWithEvent(SVGEventImpl *event) Value KSVGEcma::getUrl(ExecState *exec, ::KURL url) { - Object *status = new Object(new AsynctqStatus()); + Object *status = new Object(new AsyncStatus()); // FIXME: Security issue, allows local testing of getURL(), REMOVE BEFORE RELEASE! (Niko) TQString svgDocument = KSVGLoader::getUrl(url, true); @@ -214,7 +214,7 @@ Value KSVGEcma::getUrl(ExecState *exec, ::KURL url) void KSVGEcma::postUrl(ExecState *exec, ::KURL url, const TQString &data, const TQString &mimeType, const TQString &contentEncoding, Object &callBackFunction) { - Object *status = new Object(new AsynctqStatus()); + Object *status = new Object(new AsyncStatus()); status->put(exec, Identifier("content"), String("")); status->put(exec, Identifier("success"), Boolean(false)); diff --git a/ksvg/ecma/ksvg_window.cpp b/ksvg/ecma/ksvg_window.cpp index 90194781..a8504b80 100644 --- a/ksvg/ecma/ksvg_window.cpp +++ b/ksvg/ecma/ksvg_window.cpp @@ -330,11 +330,11 @@ Value WindowFunc::call(ExecState *exec, Object &thisObj, const List &args) case KSVG::Window::_GetURL: { KURL url((const_cast<Window *>(window))->doc()->baseUrl(), args[0].toString(exec).qstring()); - Value asynctqStatus = (const_cast<Window *>(window))->doc()->ecmaEngine()->getUrl(exec, url); + Value asyncStatus = (const_cast<Window *>(window))->doc()->ecmaEngine()->getUrl(exec, url); Object callBackFunction = Object::dynamicCast(args[1]); List callBackArgs; - callBackArgs.append(asynctqStatus); + callBackArgs.append(asyncStatus); callBackFunction.call(exec, callBackFunction, callBackArgs); return Undefined(); diff --git a/ksvg/impl/SVGAnimateMotionElementImpl.cc b/ksvg/impl/SVGAnimateMotionElementImpl.cc index 9be742c0..fe816769 100644 --- a/ksvg/impl/SVGAnimateMotionElementImpl.cc +++ b/ksvg/impl/SVGAnimateMotionElementImpl.cc @@ -64,7 +64,7 @@ void SVGAnimateMotionElementImpl::setAttributes() /* if(!m_pathArray) { bool temp; - m_pathArray = m_path->preparePath(&temp, p->tqworldMatrix()); + m_pathArray = m_path->preparePath(&temp, p->worldMatrix()); }*/ //} diff --git a/ksvg/impl/SVGEventImpl.cc b/ksvg/impl/SVGEventImpl.cc index f665d25c..38ab5e64 100644 --- a/ksvg/impl/SVGEventImpl.cc +++ b/ksvg/impl/SVGEventImpl.cc @@ -43,7 +43,7 @@ SVGEventImpl::SVGEventImpl() m_defaultPrevented = false; m_id = SVGEvent::UNKNOWN_EVENT; m_eventPhase = 0; - m_createTime = TQDateTime::tqcurrentDateTime(); + m_createTime = TQDateTime::currentDateTime(); m_defaultHandled = false; m_target = 0; @@ -62,7 +62,7 @@ SVGEventImpl::SVGEventImpl(SVGEvent::EventId _id, bool canBubbleArg, bool cancel m_defaultPrevented = false; m_id = _id; m_eventPhase = 0; - m_createTime = TQDateTime::tqcurrentDateTime(); + m_createTime = TQDateTime::currentDateTime(); m_defaultHandled = false; m_target = 0; diff --git a/kuickshow/src/aboutwidget.cpp b/kuickshow/src/aboutwidget.cpp index d5d3a841..ce85788d 100644 --- a/kuickshow/src/aboutwidget.cpp +++ b/kuickshow/src/aboutwidget.cpp @@ -41,7 +41,7 @@ AboutWidget::AboutWidget( TQWidget *parent, const char *name ) TQGroupBox *gBox = new TQGroupBox( 1,Qt::Horizontal, this); gBox->setGeometry( 10, 10, width()-20, height()-20 ); - gBox->tqsetAlignment( AlignHCenter ); + gBox->setAlignment( AlignHCenter ); gBox->installEventFilter( this ); gBox->setPalette( TQPalette( TQColor( white ) ) ); @@ -57,14 +57,14 @@ AboutWidget::AboutWidget( TQWidget *parent, const char *name ) TQLabel *authors = new TQLabel("Kuickshow " KUICKSHOWVERSION " was brought to you by", gBox); - authors->tqsetAlignment( AlignCenter ); + authors->setAlignment( AlignCenter ); m_homepage = new KURLWidget("Carsten Pfeiffer", gBox); m_homepage->setURL( "http://devel-home.kde.org/~pfeiffer/kuickshow/" ); - m_homepage->tqsetAlignment( AlignCenter ); + m_homepage->setAlignment( AlignCenter ); TQLabel *copy = new TQLabel("(C) 1998-2006", gBox); - copy->tqsetAlignment( AlignCenter ); + copy->setAlignment( AlignCenter ); ImlibWidget *im = new ImlibWidget( 0L, gBox, "KuickShow Logo" ); if ( im->loadImage( file ) ) diff --git a/kuickshow/src/defaultswidget.cpp b/kuickshow/src/defaultswidget.cpp index c0bef522..e4446052 100644 --- a/kuickshow/src/defaultswidget.cpp +++ b/kuickshow/src/defaultswidget.cpp @@ -92,7 +92,7 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name) // -- gbPreview = new TQGroupBox( i18n("Preview"), this ); - gbPreview->tqsetAlignment( AlignCenter ); + gbPreview->setAlignment( AlignCenter ); lbImOrig = new TQLabel( i18n("Original"), gbPreview ); imOrig = new ImlibWidget( 0L, gbPreview, "original image" ); diff --git a/kuickshow/src/filecache.cpp b/kuickshow/src/filecache.cpp index d68bc897..2fb4f6df 100644 --- a/kuickshow/src/filecache.cpp +++ b/kuickshow/src/filecache.cpp @@ -68,7 +68,7 @@ TQString FileCache::tempDir() KTempDir * FileCache::createTempDir() { - TQString tmpName = TQString::tqfromLatin1( KGlobal::instance()->instanceName() ); + TQString tmpName = TQString::fromLatin1( KGlobal::instance()->instanceName() ); tmpName.append( TQString::number( getpid() ) ); TQString dirName = locateLocal( "tmp", tmpName ); KTempDir *dir = new KTempDir( dirName ); diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp index 403269bf..5f8df74d 100644 --- a/kuickshow/src/filewidget.cpp +++ b/kuickshow/src/filewidget.cpp @@ -448,7 +448,7 @@ void FileWidget::slotFinishedLoading() emit finished(); } -TQSize FileWidget::tqsizeHint() const +TQSize FileWidget::sizeHint() const { return TQSize( 300, 300 ); } diff --git a/kuickshow/src/filewidget.h b/kuickshow/src/filewidget.h index 64f11605..82996644 100644 --- a/kuickshow/src/filewidget.h +++ b/kuickshow/src/filewidget.h @@ -71,7 +71,7 @@ protected: virtual bool eventFilter( TQObject *o, TQEvent * ); virtual void resizeEvent( TQResizeEvent * ); virtual void activatedMenu( const KFileItem *, const TQPoint& ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; private slots: void slotReturnPressed( const TQString& text ); diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp index f56c7b30..8b195a71 100644 --- a/kuickshow/src/imagewindow.cpp +++ b/kuickshow/src/imagewindow.cpp @@ -1128,7 +1128,7 @@ int ImageWindow::desktopWidth( bool totalScreen ) const { if ( myIsFullscreen || totalScreen ) { - return KGlobalSettings::desktopGeometry(tqtopLevelWidget()).width(); + return KGlobalSettings::desktopGeometry(topLevelWidget()).width(); } else return Kuick::workArea().width(); } @@ -1137,7 +1137,7 @@ int ImageWindow::desktopWidth( bool totalScreen ) const int ImageWindow::desktopHeight( bool totalScreen ) const { if ( myIsFullscreen || totalScreen ) { - return KGlobalSettings::desktopGeometry(tqtopLevelWidget()).height(); + return KGlobalSettings::desktopGeometry(topLevelWidget()).height(); } else { return Kuick::workArea().height(); } @@ -1146,7 +1146,7 @@ int ImageWindow::desktopHeight( bool totalScreen ) const TQSize ImageWindow::maxImageSize() const { if ( myIsFullscreen ) { - return KGlobalSettings::desktopGeometry(tqtopLevelWidget()).size(); + return KGlobalSettings::desktopGeometry(topLevelWidget()).size(); } else { return Kuick::workArea().size() - Kuick::frameSize( winId() ); @@ -1193,7 +1193,7 @@ bool ImageWindow::canZoomTo( int newWidth, int newHeight ) if ( !ImlibWidget::canZoomTo( newWidth, newHeight ) ) return false; - TQSize desktopSize = KGlobalSettings::desktopGeometry(tqtopLevelWidget()).size(); + TQSize desktopSize = KGlobalSettings::desktopGeometry(topLevelWidget()).size(); int desktopArea = desktopSize.width() * desktopSize.height(); int imageArea = newWidth * newHeight; diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp index 4e0aa573..b20606ae 100644 --- a/kuickshow/src/kuickfile.cpp +++ b/kuickshow/src/kuickfile.cpp @@ -94,7 +94,7 @@ bool KuickFile::download() return m_job != 0L; } -KuickFile::DownloadtqStatus KuickFile::waitForDownload( TQWidget *parent ) +KuickFile::DownloadStatus KuickFile::waitForDownload( TQWidget *parent ) { if ( isAvailable() ) return OK; @@ -152,7 +152,7 @@ void KuickFile::slotResult( KIO::Job *job ) TQString canceledFile = static_cast<KIO::FileCopyJob*>(job)->destURL().path(); TQFile::remove( canceledFile ); - m_progress->tqtopLevelWidget()->hide(); + m_progress->topLevelWidget()->hide(); } else { m_localFile = static_cast<KIO::FileCopyJob*>(job)->destURL().path(); @@ -162,7 +162,7 @@ void KuickFile::slotResult( KIO::Job *job ) m_progress->setProgress( 100 ); #define BUGGY_VERSION KDE_MAKE_VERSION(3,5,2) if ( KDE::version() <= BUGGY_VERSION ) { - m_progress->tqtopLevelWidget()->hide(); // ### workaround broken KProgressDialog + m_progress->topLevelWidget()->hide(); // ### workaround broken KProgressDialog } } } diff --git a/kuickshow/src/kuickfile.h b/kuickshow/src/kuickfile.h index af92355f..49ee3894 100644 --- a/kuickshow/src/kuickfile.h +++ b/kuickshow/src/kuickfile.h @@ -27,7 +27,7 @@ class KuickFile : public TQObject TQ_OBJECT public: - enum DownloadtqStatus + enum DownloadStatus { OK = 1, CANCELED, @@ -72,7 +72,7 @@ public: * immediately. * @return true when the download has finished or false when the user aborted the dialog */ - KuickFile::DownloadtqStatus waitForDownload( TQWidget *parent ); + KuickFile::DownloadStatus waitForDownload( TQWidget *parent ); // bool needsDownload(); diff --git a/kview/config/kviewconfmodules.cpp b/kview/config/kviewconfmodules.cpp index 0a448b1a..6645fb1e 100644 --- a/kview/config/kviewconfmodules.cpp +++ b/kview/config/kviewconfmodules.cpp @@ -38,7 +38,7 @@ KViewGeneralConfig::KViewGeneralConfig( TQWidget * parent, const char * /*name*/ TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); m_pResizeGroup = new TQVButtonGroup( i18n( "Resizing" ), this ); - m_pResizeGroup->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); + m_pResizeGroup->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); connect( m_pResizeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( resizeChanged( int ) ) ); tqlayout->addWidget( m_pResizeGroup ); diff --git a/kview/kview.cpp b/kview/kview.cpp index a67ad03a..7d4ee687 100644 --- a/kview/kview.cpp +++ b/kview/kview.cpp @@ -163,13 +163,13 @@ void KView::load( const KURL & url ) if( url.isLocalFile() ) { // XXX: this code is what - //KRecentDirs::add( TQString::tqfromLatin1( ":load_image" ), url.directory() ); + //KRecentDirs::add( TQString::fromLatin1( ":load_image" ), url.directory() ); // would do: TQString directory = url.directory(); - TQString key = TQString::tqfromLatin1( "load_image" ); + TQString key = TQString::fromLatin1( "load_image" ); KConfig * config = KGlobal::config(); - config->setGroup( TQString::tqfromLatin1( "Recent Dirs" ) ); + config->setGroup( TQString::fromLatin1( "Recent Dirs" ) ); TQStringList result = config->readPathListEntry( key ); // make sure the dir is first in history result.remove( directory ); @@ -208,7 +208,7 @@ TQSize KView::sizeForCentralWidgetSize( TQSize size ) if( ! mb->isHidden() ) { size.rheight() += mb->heightForWidth( width() ); - if( tqstyle().tqstyleHint( TQStyle::SH_MainWindow_SpaceBelowMenuBar, this ) ) + if( tqstyle().styleHint( TQStyle::SH_MainWindow_SpaceBelowMenuBar, this ) ) size.rheight() += dockWindowsMovable() ? 1 : 2; } kdDebug( 4600 ) << "added Menubar: " << size << endl; @@ -498,7 +498,7 @@ void KView::setupActions( TQObject * partobject ) TQObject * extension = partobject->child( 0, "KParts::BrowserExtension", false ); if( extension ) { - TQStrList slotNames = extension->tqmetaObject()->slotNames(); + TQStrList slotNames = extension->metaObject()->slotNames(); if( slotNames.contains( "print()" ) ) KStdAction::print( extension, TQT_SLOT( print() ), actionCollection(), "print" ); if( slotNames.contains( "del()" ) ) @@ -653,7 +653,7 @@ TQSize KView::barSize( int mainwinwidth, BarSizeFrom from ) width += toolBar()->width(); break; case KToolBar::Flat: - height += kapp->tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent ); + height += kapp->tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent ); break; case KToolBar::Floating: break; diff --git a/kview/kviewcanvas/config/generalconfigwidget.ui b/kview/kviewcanvas/config/generalconfigwidget.ui index 746fa02c..15476bcd 100644 --- a/kview/kviewcanvas/config/generalconfigwidget.ui +++ b/kview/kviewcanvas/config/generalconfigwidget.ui @@ -110,7 +110,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>0</height> @@ -127,7 +127,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>0</height> @@ -239,7 +239,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> @@ -259,7 +259,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp index a2e6c5b7..67d8fd9a 100644 --- a/kview/kviewcanvas/kimagecanvas.cpp +++ b/kview/kviewcanvas/kimagecanvas.cpp @@ -543,7 +543,7 @@ void KImageCanvas::slotUpdateImage() if( m_bSizeChanged || m_bNewImage ) { - TQSize sh = m_client->tqsizeHint(); + TQSize sh = m_client->sizeHint(); if( ! sh.isValid() ) sh = TQSize( 0, 0 ); m_client->resize( sh ); diff --git a/kview/kviewcanvas/kimageholder.cpp b/kview/kviewcanvas/kimageholder.cpp index f2e54462..eb287d37 100644 --- a/kview/kviewcanvas/kimageholder.cpp +++ b/kview/kviewcanvas/kimageholder.cpp @@ -269,7 +269,7 @@ TQRect KImageHolder::selection() const return TQRect(); } -TQSize KImageHolder::tqsizeHint() const +TQSize KImageHolder::sizeHint() const { if( m_pPixmap ) return m_pPixmap->size(); diff --git a/kview/kviewcanvas/kimageholder.h b/kview/kviewcanvas/kimageholder.h index 165ec0bc..a5555e2b 100644 --- a/kview/kviewcanvas/kimageholder.h +++ b/kview/kviewcanvas/kimageholder.h @@ -57,7 +57,7 @@ class KImageHolder : public TQWidget */ TQRect selection() const; - TQSize tqsizeHint() const; + TQSize sizeHint() const; void setDrawRect( const TQRect & rect ) { m_drawRect = rect; } const TQRect & drawRect() const { return m_drawRect; } diff --git a/kview/kviewviewer/printimagesettings.ui b/kview/kviewviewer/printimagesettings.ui index 2eed3c78..b2cf260f 100644 --- a/kview/kviewviewer/printimagesettings.ui +++ b/kview/kviewviewer/printimagesettings.ui @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>0</height> @@ -168,7 +168,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>0</height> diff --git a/kview/modules/presenter/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui index d56343dc..05d3b90f 100644 --- a/kview/modules/presenter/imagelistdialog.ui +++ b/kview/modules/presenter/imagelistdialog.ui @@ -60,7 +60,7 @@ <property name="name"> <cstring>m_pListView</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>400</width> <height>0</height> @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -188,7 +188,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> diff --git a/kview/modules/scale/kview_scale.cpp b/kview/modules/scale/kview_scale.cpp index 95802df4..4979e4dc 100644 --- a/kview/modules/scale/kview_scale.cpp +++ b/kview/modules/scale/kview_scale.cpp @@ -75,21 +75,21 @@ void KViewScale::slotScaleDlg() // show original width label = new TQLabel( i18n( "Original width:" ), pixelgroup ); - label->tqsetAlignment( TQLabel::AlignRight ); + label->setAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 0, 0 ); pixelgroupgrid->addWidget( new TQLabel( TQString::number( imagesize.width() ), pixelgroup ), 0, 1 ); label = new TQLabel( i18n( "Height:" ), pixelgroup ); - label->tqsetAlignment( TQLabel::AlignRight ); + label->setAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 1, 0 ); pixelgroupgrid->addWidget( new TQLabel( TQString::number( imagesize.height() ), pixelgroup ), 1, 1 ); pixelgroupgrid->addRowSpacing( 2, KDialog::spacingHint() ); label = new TQLabel( i18n( "New width:" ), pixelgroup ); - label->tqsetAlignment( TQLabel::AlignRight ); + label->setAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 3, 0 ); label = new TQLabel( i18n( "Height:" ), pixelgroup ); - label->tqsetAlignment( TQLabel::AlignRight ); + label->setAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 4, 0 ); TQSpinBox * newwidth = new TQSpinBox( 1, 100000, 1, pixelgroup ); pixelgroupgrid->addWidget( newwidth, 3, 1 ); @@ -103,10 +103,10 @@ void KViewScale::slotScaleDlg() pixelgroupgrid->addRowSpacing( 5, KDialog::spacingHint() ); label = new TQLabel( i18n( "Ratio X:" ), pixelgroup ); - label->tqsetAlignment( TQLabel::AlignRight ); + label->setAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 6, 0 ); label = new TQLabel( i18n( "Y:" ), pixelgroup ); - label->tqsetAlignment( TQLabel::AlignRight ); + label->setAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 7, 0 ); TQSpinBox * ratiox = new TQSpinBox( pixelgroup ); ratiox->setValidator( new TQDoubleValidator( 0.0001, 10000, 4, ratiox ) ); @@ -122,10 +122,10 @@ void KViewScale::slotScaleDlg() printgroupgrid->setMargin( KDialog::marginHint() ); label = new TQLabel( i18n( "New width:" ), printgroup ); - label->tqsetAlignment( TQLabel::AlignRight ); + label->setAlignment( TQLabel::AlignRight ); printgroupgrid->addWidget( label, 0, 0 ); label = new TQLabel( i18n( "Height:" ), printgroup ); - label->tqsetAlignment( TQLabel::AlignRight ); + label->setAlignment( TQLabel::AlignRight ); printgroupgrid->addWidget( label, 1, 0 ); TQSpinBox * newwidth2 = new TQSpinBox( printgroup ); printgroupgrid->addWidget( newwidth2, 0, 1 ); @@ -139,10 +139,10 @@ void KViewScale::slotScaleDlg() printgroupgrid->addRowSpacing( 2, KDialog::spacingHint() ); label = new TQLabel( i18n( "Resolution X:" ), printgroup ); - label->tqsetAlignment( TQLabel::AlignRight ); + label->setAlignment( TQLabel::AlignRight ); printgroupgrid->addWidget( label, 3, 0 ); label = new TQLabel( i18n( "Y:" ), printgroup ); - label->tqsetAlignment( TQLabel::AlignRight ); + label->setAlignment( TQLabel::AlignRight ); printgroupgrid->addWidget( label, 4, 0 ); TQSpinBox * resx = new TQSpinBox( printgroup ); printgroupgrid->addWidget( resx, 3, 1 ); diff --git a/kview/modules/scale/scaledlg.cpp b/kview/modules/scale/scaledlg.cpp index 335ab1c9..ad38815c 100644 --- a/kview/modules/scale/scaledlg.cpp +++ b/kview/modules/scale/scaledlg.cpp @@ -61,53 +61,53 @@ ScaleDlg::ScaleDlg( const TQSize & origsize, TQVBox * parent, const char * name pixelgroupgrid->addRowSpacing( 0, KDialog::spacingHint() ); label = new TQLabel( i18n( "Original width:" ), pixelgroup ); - label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( label, 1, 0 ); label = new TQLabel( i18n( "Height:" ), pixelgroup ); - label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( label, 2, 0 ); pixelgroupgrid->addRowSpacing( 3, KDialog::spacingHint() ); label = new TQLabel( i18n( "New width:" ), pixelgroup ); - label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( label, 4, 0 ); label = new TQLabel( i18n( "Height:" ), pixelgroup ); - label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( label, 5, 0 ); pixelgroupgrid->addRowSpacing( 6, KDialog::spacingHint() ); label = new TQLabel( i18n( "Ratio X:" ), pixelgroup ); - label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( label, 7, 0 ); label = new TQLabel( i18n( "Y:" ), pixelgroup ); - label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( label, 8, 0 ); printgroupgrid->addRowSpacing( 0, KDialog::spacingHint() ); label = new TQLabel( i18n( "New width:" ), printgroup ); - label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); printgroupgrid->addWidget( label, 1, 0 ); label = new TQLabel( i18n( "Height:" ), printgroup ); - label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); printgroupgrid->addWidget( label, 2, 0 ); printgroupgrid->addRowSpacing( 3, KDialog::spacingHint() ); label = new TQLabel( i18n( "Resolution X:" ), printgroup ); - label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); printgroupgrid->addWidget( label, 4, 0 ); label = new TQLabel( i18n( "Y:" ), printgroup ); - label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); printgroupgrid->addWidget( label, 5, 0 ); m_pOldWidth = new TQLabel( TQString::number( origsize.width() ), pixelgroup ); - m_pOldWidth->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + m_pOldWidth->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( m_pOldWidth, 1, 1 ); m_pOldHeight = new TQLabel( TQString::number( origsize.height() ), pixelgroup ); - m_pOldHeight->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + m_pOldHeight->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( m_pOldHeight, 2, 1 ); m_pNewWidth = new KFloatSpinBox( 1.0, 100000.0, 10.0, 0, pixelgroup ); diff --git a/kviewshell/documentWidget.cpp b/kviewshell/documentWidget.cpp index f370daba..cd3de424 100644 --- a/kviewshell/documentWidget.cpp +++ b/kviewshell/documentWidget.cpp @@ -203,7 +203,7 @@ void DocumentWidget::paintEvent(TQPaintEvent *e) p.drawRect(outlineRect); // Paint page shadow - TQColor backgroundColor = tqcolorGroup().mid(); + TQColor backgroundColor = colorGroup().mid(); // (Re-)generate the Pixmaps for the shadow corners, if necessary if (backgroundColor != backgroundColorForCorners) diff --git a/kviewshell/kmultipage.cpp b/kviewshell/kmultipage.cpp index 7fc41986..ca6d569b 100644 --- a/kviewshell/kmultipage.cpp +++ b/kviewshell/kmultipage.cpp @@ -54,7 +54,7 @@ KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject splitterWidget = new TQSplitter(verticalBox, widgetName); splitterWidget->setOpaqueResize(false); - splitterWidget->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + splitterWidget->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); // Create SideBar sideBar = new TQToolBox(splitterWidget, "sidebar"); @@ -216,7 +216,7 @@ bool KMultiPage::closeURL() // Clear Table of Contents tableOfContents->clear(); - // Clear tqStatus Bar + // Clear Status Bar emit setStatusBarText(TQString()); return true; diff --git a/kviewshell/kprintDialogPage_pageoptions.cpp b/kviewshell/kprintDialogPage_pageoptions.cpp index 603c2552..62ce70be 100644 --- a/kviewshell/kprintDialogPage_pageoptions.cpp +++ b/kviewshell/kprintDialogPage_pageoptions.cpp @@ -91,7 +91,7 @@ KPrintDialogPage_PageOptions::KPrintDialogPage_PageOptions( TQWidget *parent, co } - resize( TQSize(319, 166).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(319, 166).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp index 186a2823..b205f37b 100644 --- a/kviewshell/kviewpart.cpp +++ b/kviewshell/kviewpart.cpp @@ -96,7 +96,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p // If a default MimeType is specified try to load a MultiPage supporting it. TQString defaultMimeType = args.first(); offers = KTrader::self()->query( - TQString::tqfromLatin1("KViewShell/MultiPage" ), + TQString::fromLatin1("KViewShell/MultiPage" ), TQString("([X-KDE-MultiPageVersion] == %1) and " "([X-KDE-MimeTypes] == '%2')").tqarg(MULTIPAGE_VERSION).tqarg(defaultMimeType)); } @@ -105,7 +105,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p if (offers.isEmpty()) { offers = KTrader::self()->query( - TQString::tqfromLatin1("KViewShell/MultiPage" ), + TQString::fromLatin1("KViewShell/MultiPage" ), TQString("([X-KDE-MultiPageVersion] == %1) and " "([X-KDE-EmptyMultiPage] == 1)").tqarg(MULTIPAGE_VERSION)); } @@ -471,7 +471,7 @@ TQStringList KViewPart::supportedMimeTypes() // Search for service KTrader::OfferList offers = KTrader::self()->query( - TQString::tqfromLatin1("KViewShell/MultiPage"), + TQString::fromLatin1("KViewShell/MultiPage"), TQString("([X-KDE-MultiPageVersion] == %1)").tqarg(MULTIPAGE_VERSION) ); @@ -516,7 +516,7 @@ TQStringList KViewPart::fileFormats() const // Search for service KTrader::OfferList offers = KTrader::self()->query( - TQString::tqfromLatin1("KViewShell/MultiPage"), + TQString::fromLatin1("KViewShell/MultiPage"), TQString("([X-KDE-MultiPageVersion] == %1)").tqarg(MULTIPAGE_VERSION) ); @@ -768,7 +768,7 @@ bool KViewPart::openFile() // Search for service KTrader::OfferList offers = KTrader::self()->query( - TQString::tqfromLatin1("KViewShell/MultiPage" ), + TQString::fromLatin1("KViewShell/MultiPage" ), TQString("([X-KDE-MultiPageVersion] == %1) and " "([X-KDE-MimeTypes] == '%2')").tqarg(MULTIPAGE_VERSION).tqarg(mimetype->name())); diff --git a/kviewshell/marklist.cpp b/kviewshell/marklist.cpp index 19d17b06..57266853 100644 --- a/kviewshell/marklist.cpp +++ b/kviewshell/marklist.cpp @@ -284,7 +284,7 @@ MarkList::MarkList(TQWidget* parent, const char* name) setVScrollBarMode(TQScrollView::AlwaysOn); setHScrollBarMode(TQScrollView::AlwaysOff); - tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); viewport()->setBackgroundMode(TQt::PaletteBase); enableClipper(true); diff --git a/kviewshell/marklist.h b/kviewshell/marklist.h index 25c44aac..80d796a7 100644 --- a/kviewshell/marklist.h +++ b/kviewshell/marklist.h @@ -140,7 +140,7 @@ public: PageNumber numberOfPages() { return widgetList.count(); } - virtual TQSize tqsizeHint() const { return TQSize(); } + virtual TQSize sizeHint() const { return TQSize(); } public slots: void setNumberOfPages(int numberOfPages, bool showThumbnails = true); diff --git a/kviewshell/optionDialogAccessibilityWidget.ui b/kviewshell/optionDialogAccessibilityWidget.ui index 09ff3af3..ea0cc6d2 100644 --- a/kviewshell/optionDialogAccessibilityWidget.ui +++ b/kviewshell/optionDialogAccessibilityWidget.ui @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -180,7 +180,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -218,7 +218,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>48</width> <height>21</height> @@ -246,7 +246,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -274,7 +274,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>48</width> <height>21</height> @@ -302,7 +302,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -359,7 +359,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -376,7 +376,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> diff --git a/kviewshell/pageSizeDialog.cpp b/kviewshell/pageSizeDialog.cpp index fba7f752..75c4409d 100644 --- a/kviewshell/pageSizeDialog.cpp +++ b/kviewshell/pageSizeDialog.cpp @@ -31,7 +31,7 @@ pageSizeDialog::pageSizeDialog( TQWidget *parent, pageSize *userPrefdPageSize, c { userPreferredPageSize = userPrefdPageSize; pageSizeW = new pageSizeWidget(this, "PageSizeWidget"); - pageSizeW->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 0, 0, + pageSizeW->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 0, 0, pageSizeW->sizePolicy().hasHeightForWidth() ) ); setMainWidget(pageSizeW); } diff --git a/kviewshell/pageSizeWidget_base.ui b/kviewshell/pageSizeWidget_base.ui index e7ddbde3..3940deda 100644 --- a/kviewshell/pageSizeWidget_base.ui +++ b/kviewshell/pageSizeWidget_base.ui @@ -209,7 +209,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>50</height> diff --git a/kviewshell/pageView.cpp b/kviewshell/pageView.cpp index 6dad756b..81c0c8b2 100644 --- a/kviewshell/pageView.cpp +++ b/kviewshell/pageView.cpp @@ -524,7 +524,7 @@ void PageView::viewportPaintEvent(TQPaintEvent* e) TQMemArray<TQRect> backgroundRects = backgroundArea.tqrects(); for (unsigned int i = 0; i < backgroundRects.count(); i++) - p.fillRect(backgroundRects[i], tqcolorGroup().mid()); + p.fillRect(backgroundRects[i], colorGroup().mid()); } diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui index bfaf546c..8a533ab6 100644 --- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui +++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp index 4b5e633a..4287fe54 100644 --- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp +++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp @@ -70,7 +70,7 @@ KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions( TQWidget *pa kprintDialogPage_pageoptions_baseLayout->addStretch(); - resize( TQSize(319, 166).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(319, 166).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp index c765fdd0..e7c74b84 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp @@ -102,7 +102,7 @@ DjVuErrorList::notify_error(const DjVuPort * source, const GUTF8String & msg) bool DjVuErrorList::notify_status(const DjVuPort * source, const GUTF8String &msg) { - tqStatus.append(msg); + Status.append(msg); return 1; } @@ -120,16 +120,16 @@ DjVuErrorList::GetError(void) } GUTF8String -DjVuErrorList::GettqStatus(void) +DjVuErrorList::GetStatus(void) { - GUTF8String PrevtqStatus; + GUTF8String PrevStatus; GPosition pos; - if((pos=tqStatus)) + if((pos=Status)) { - PrevtqStatus=tqStatus[pos]; - tqStatus.del(pos); + PrevStatus=Status[pos]; + Status.del(pos); } - return PrevtqStatus; + return PrevStatus; } GP<DataPool> diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h index c42e96e2..885e76aa 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h @@ -126,13 +126,13 @@ public: inline GList<GUTF8String> GetStatusList(void); /// Just clear the list. - inline void CleartqStatus(void); + inline void ClearStatus(void); /// Get one status message and clear that message from the list. - GUTF8String GettqStatus(void); + GUTF8String GetStatus(void); /// Check if there are any more status messages. - inline bool HastqStatus(void) const; + inline bool HasStatus(void) const; /** This gets the data. We can't use the simple port's request data since we want to allow the user to specify the ByteStream. */ @@ -143,7 +143,7 @@ private: GURL pool_url; GP<DataPool> pool; GList<GUTF8String> Errors; - GList<GUTF8String> tqStatus; + GList<GUTF8String> Status; private: //dummy stuff static GURL set_stream(ByteStream *); }; @@ -167,22 +167,22 @@ DjVuErrorList::ClearError(void) inline GList<GUTF8String> DjVuErrorList::GetStatusList(void) { - GList<GUTF8String> retval=(const GList<GUTF8String>)tqStatus; - tqStatus.empty(); + GList<GUTF8String> retval=(const GList<GUTF8String>)Status; + Status.empty(); return retval; } inline void -DjVuErrorList::CleartqStatus(void) -{ tqStatus.empty(); } +DjVuErrorList::ClearStatus(void) +{ Status.empty(); } inline bool DjVuErrorList::HasError(void) const { return !Errors.isempty(); } inline bool -DjVuErrorList::HastqStatus(void) const -{ return !tqStatus.isempty(); } +DjVuErrorList::HasStatus(void) const +{ return !Status.isempty(); } #ifdef HAVE_NAMESPACES diff --git a/kviewshell/renderedDocumentPagePixmap.cpp b/kviewshell/renderedDocumentPagePixmap.cpp index fc8edade..1632cbd9 100644 --- a/kviewshell/renderedDocumentPagePixmap.cpp +++ b/kviewshell/renderedDocumentPagePixmap.cpp @@ -71,7 +71,7 @@ TQPixmap RenderedDocumentPagePixmap::accessiblePixmap() { case KVSPrefs::EnumRenderMode::Inverted: // Invert image pixels using TQImage internal function - backImage.tqinvertPixels(false); + backImage.invertPixels(false); break; case KVSPrefs::EnumRenderMode::Recolor: // Recolor image using KImageEffect::flatten with dither:0 diff --git a/kviewshell/searchWidget.cpp b/kviewshell/searchWidget.cpp index d467249d..b7001240 100644 --- a/kviewshell/searchWidget.cpp +++ b/kviewshell/searchWidget.cpp @@ -41,7 +41,7 @@ SearchWidget::SearchWidget(TQWidget* parent, const char* name, WFlags fl) { setName("SearchWidget"); - tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed); + setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed); tqlayout = new TQHBoxLayout(this, 4, 6, "SearchWidgetLayout"); diff --git a/kviewshell/sizePreview.cpp b/kviewshell/sizePreview.cpp index 0acd8843..07211819 100644 --- a/kviewshell/sizePreview.cpp +++ b/kviewshell/sizePreview.cpp @@ -74,7 +74,7 @@ void SizePreview::paintEvent( TQPaintEvent * ) pixmap.resize(width(), height()); TQPainter p(&pixmap); - p.fillRect(rect(), tqcolorGroup().background()); + p.fillRect(rect(), colorGroup().background()); p.setPen(TQt::black); p.setBrush(TQt::white); p.drawRect(hOffset, vOffset, displayedWidth, displayedHeight); diff --git a/libkscan/devselector.cpp b/libkscan/devselector.cpp index 97b06e54..fbf33ad3 100644 --- a/libkscan/devselector.cpp +++ b/libkscan/devselector.cpp @@ -70,7 +70,7 @@ DeviceSelector::DeviceSelector( TQWidget *parent, TQStrList& devList, page, "CBOX_SKIP_ON_START" ); KConfig *gcfg = KGlobal::config(); - gcfg->setGroup(TQString::tqfromLatin1(GROUP_STARTUP)); + gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP)); bool skipDialog = gcfg->readBoolEntry( STARTUP_SKIP_ASK, false ); cbSkipDialog->setChecked( skipDialog ); @@ -81,7 +81,7 @@ DeviceSelector::DeviceSelector( TQWidget *parent, TQStrList& devList, TQCString DeviceSelector::getDeviceFromConfig( void ) const { KConfig *gcfg = KGlobal::config(); - gcfg->setGroup(TQString::tqfromLatin1(GROUP_STARTUP)); + gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP)); bool skipDialog = gcfg->readBoolEntry( STARTUP_SKIP_ASK, false ); TQCString result; @@ -126,7 +126,7 @@ TQCString DeviceSelector::getSelectedDevice( void ) const /* Store scanner selection settings */ KConfig *c = KGlobal::config(); - c->setGroup(TQString::tqfromLatin1(GROUP_STARTUP)); + c->setGroup(TQString::fromLatin1(GROUP_STARTUP)); /* Write both the scan device and the skip-start-dialog flag global. */ c->writeEntry( STARTUP_SCANDEV, dev, true, true ); c->writeEntry( STARTUP_SKIP_ASK, getShouldSkip(), true, true ); @@ -141,7 +141,7 @@ void DeviceSelector::setScanSources( const TQStrList& sources, { bool default_ok = false; KConfig *gcfg = KGlobal::config(); - gcfg->setGroup(TQString::tqfromLatin1(GROUP_STARTUP)); + gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP)); TQCString defstr = gcfg->readEntry( STARTUP_SCANDEV, "" ).local8Bit(); /* Selector-Stuff*/ @@ -152,7 +152,7 @@ void DeviceSelector::setScanSources( const TQStrList& sources, TQStringList::ConstIterator it2 = hrSources.begin(); for ( ; it.current(); ++it, ++it2 ) { - TQString text = TQString::tqfromLatin1("&%1. %2\n%3").tqarg(1+nr).tqarg( TQString::fromLocal8Bit(*it) ).tqarg( *it2 ); + TQString text = TQString::fromLatin1("&%1. %2\n%3").tqarg(1+nr).tqarg( TQString::fromLocal8Bit(*it) ).tqarg( *it2 ); TQRadioButton *rb = new TQRadioButton( text, selectBox ); selectBox->insert( rb ); diff --git a/libkscan/dispgamma.cpp b/libkscan/dispgamma.cpp index bb10e8b5..d5d65d38 100644 --- a/libkscan/dispgamma.cpp +++ b/libkscan/dispgamma.cpp @@ -49,11 +49,11 @@ void DispGamma::paintEvent( TQPaintEvent *ev ) p.setClipRect( ev->rect()); - p.setPen( tqcolorGroup().highlight() ); - p.setBrush( tqcolorGroup().base() ); + p.setPen( colorGroup().highlight() ); + p.setBrush( colorGroup().base() ); // Backgrond p.drawRect( 0,0, w, 256 ); - p.setPen( TQPen(tqcolorGroup().midlight(), 1, DotLine)); + p.setPen( TQPen(colorGroup().midlight(), 1, DotLine)); // horizontal Grid for( int l = 1; l < 5; l++ ) p.drawLine( 1, l*51, 255, l*51 ); @@ -63,7 +63,7 @@ void DispGamma::paintEvent( TQPaintEvent *ev ) p.drawLine( l*51, 2, l*51, 255 ); // draw gamma-Line - p.setPen( tqcolorGroup().highlight() ); + p.setPen( colorGroup().highlight() ); p.moveTo( 1, vals->at(1) ); for( int i = 2; i < w-1; i++ ) { @@ -73,7 +73,7 @@ void DispGamma::paintEvent( TQPaintEvent *ev ) } -TQSize DispGamma::tqsizeHint( void ) +TQSize DispGamma::sizeHint( void ) { return TQSize( 256 + 2*margin,256 + 2 * margin ); } diff --git a/libkscan/dispgamma.h b/libkscan/dispgamma.h index 4b8fff45..5d6bd790 100644 --- a/libkscan/dispgamma.h +++ b/libkscan/dispgamma.h @@ -40,7 +40,7 @@ public: DispGamma( TQWidget *parent ); ~DispGamma(); - TQSize tqsizeHint( void ); + TQSize sizeHint( void ); TQSizePolicy sizePolicy( void ); void setValueRef( TQMemArray<SANE_Word> *newVals ) diff --git a/libkscan/img_canvas.cpp b/libkscan/img_canvas.cpp index b510f55d..e58182dd 100644 --- a/libkscan/img_canvas.cpp +++ b/libkscan/img_canvas.cpp @@ -231,7 +231,7 @@ void ImageCanvas::newImage( TQImage *new_image ) kdDebug(29000) << "tqrepaint ok" << endl; } -TQSize ImageCanvas::tqsizeHint() const +TQSize ImageCanvas::sizeHint() const { return( TQSize( 2, 2 )); } @@ -379,7 +379,7 @@ void ImageCanvas::drawContents( TQPainter * p, int clipx, int clipy, int clipw, // p->scale( used_xscaler, used_yscaler ); // p->scale( used_xscaler, used_yscaler ); if ( x2 >= x1 && y2 >= y1 ) { - p->tqdrawPixmap( x1, y1, *pmScaled, x1, y1 ); //, clipw, cliph); + p->drawPixmap( x1, y1, *pmScaled, x1, y1 ); //, clipw, cliph); // p->setBrush( red ); // p->drawRect( x1, y1, clipw, cliph ); } @@ -675,7 +675,7 @@ void ImageCanvas::update_scaled_pixmap( void ) if( scaleKind() == DYNAMIC ) kdDebug(28000) << "Scaling DYNAMIC" << endl; TQSize noSBSize( visibleWidth(), visibleHeight()); - const int sbWidth = kapp->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ); + const int sbWidth = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ); // if( verticalScrollBar()->visible() ) noSBSize.width()+=sbWidth; // if( horizontalScrollBar()->visible() ) noSBSize.height()+=sbWidth; diff --git a/libkscan/img_canvas.h b/libkscan/img_canvas.h index eac68e75..4179750b 100644 --- a/libkscan/img_canvas.h +++ b/libkscan/img_canvas.h @@ -123,7 +123,7 @@ public slots: maintain_aspect = aspect_in_mind; tqrepaint(); } - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; void newImage( TQImage* ); void newImageHoldZoom( TQImage* ); void deleteView( TQImage *); diff --git a/libkscan/kscandevice.cpp b/libkscan/kscandevice.cpp index a00abd4b..c42d9bf7 100644 --- a/libkscan/kscandevice.cpp +++ b/libkscan/kscandevice.cpp @@ -175,7 +175,7 @@ KScanDevice::KScanDevice( TQObject *parent ) gui_elements.setAutoDelete( true ); scanner_initialised = false; /* stays false until openDevice. */ - scantqStatus = SSTAT_SILENT; + scanStatus = SSTAT_SILENT; data = 0; /* temporary image data buffer while scanning */ sn = 0; /* socket notifier for async scanning */ @@ -282,7 +282,7 @@ void KScanDevice::slCloseDevice( ) scanner_name = UNDEF_SCANNERNAME; if( scanner_handle ) { - if( scantqStatus != SSTAT_SILENT ) + if( scanStatus != SSTAT_SILENT ) { kdDebug(29000) << "Scanner is still active, calling cancel !" << endl; sane_cancel( scanner_handle ); @@ -659,11 +659,11 @@ void KScanDevice::slReloadAll( ) void KScanDevice::slStopScanning( void ) { kdDebug(29000) << "Attempt to stop scanning" << endl; - if( scantqStatus == SSTAT_IN_PROGRESS ) + if( scanStatus == SSTAT_IN_PROGRESS ) { emit( sigScanFinished( KSCAN_CANCELLED )); } - scantqStatus = SSTAT_STOP_NOW; + scanStatus = SSTAT_STOP_NOW; } @@ -673,7 +673,7 @@ const TQString KScanDevice::previewFile() if( !dir.endsWith("/") ) dir += "/"; - TQString fname = dir + TQString::tqfromLatin1(".previews/"); + TQString fname = dir + TQString::fromLatin1(".previews/"); TQString sname( getScannerName(shortScannerName()) ); sname.replace( '/', "_"); @@ -1090,7 +1090,7 @@ KScanStat KScanDevice::acquire_data( bool isPreview ) if( stat == KSCAN_OK ) { overall_bytes = 0; - scantqStatus = SSTAT_IN_PROGRESS; + scanStatus = SSTAT_IN_PROGRESS; pixel_x = 0; pixel_y = 0; overall_bytes = 0; @@ -1115,7 +1115,7 @@ KScanStat KScanDevice::acquire_data( bool isPreview ) do { doProcessABlock(); - if( scantqStatus != SSTAT_SILENT ) + if( scanStatus != SSTAT_SILENT ) { sane_stat = sane_get_parameters( scanner_handle, &sane_scan_param ); kdDebug(29000) << "--ProcessABlock-Loop" << endl; @@ -1126,7 +1126,7 @@ KScanStat KScanDevice::acquire_data( bool isPreview ) kdDebug(29000) << "pixels_per_line : " << sane_scan_param.pixels_per_line << endl; kdDebug(29000) << "bytes_per_line : " << sane_scan_param.bytes_per_line << endl; } - } while ( scantqStatus != SSTAT_SILENT ); + } while ( scanStatus != SSTAT_SILENT ); } } @@ -1410,9 +1410,9 @@ void KScanDevice::doProcessABlock( void ) } } - if( goOn && scantqStatus == SSTAT_STOP_NOW ) + if( goOn && scanStatus == SSTAT_STOP_NOW ) { - /* scantqStatus is set to SSTAT_STOP_NOW due to hitting slStopScanning */ + /* scanStatus is set to SSTAT_STOP_NOW due to hitting slStopScanning */ /* Mostly that one is fired by the STOP-Button in the progress dialog. */ /* This is also hit after the normal finish of the scan. Most probably, @@ -1421,7 +1421,7 @@ void KScanDevice::doProcessABlock( void ) */ kdDebug(29000) << "Stopping the scan progress !" << endl; goOn = false; - scantqStatus = SSTAT_SILENT; + scanStatus = SSTAT_SILENT; emit( sigScanFinished( KSCAN_OK )); } @@ -1435,13 +1435,13 @@ void KScanDevice::doProcessABlock( void ) { /** Everythings okay, the picture is ready **/ kdDebug(29000) << "last frame reached - scan successful" << endl; - scantqStatus = SSTAT_SILENT; + scanStatus = SSTAT_SILENT; emit( sigScanFinished( KSCAN_OK )); } else { /** EOF und nicht letzter Frame -> Parameter neu belegen und neu starten **/ - scantqStatus = SSTAT_NEXT_FRAME; + scanStatus = SSTAT_NEXT_FRAME; kdDebug(29000) << "EOF, but another frame to scan" << endl; } @@ -1449,7 +1449,7 @@ void KScanDevice::doProcessABlock( void ) if( sane_stat == SANE_STATUS_CANCELLED ) { - scantqStatus = SSTAT_STOP_NOW; + scanStatus = SSTAT_STOP_NOW; kdDebug(29000) << "Scan was cancelled" << endl; // stat = KSCAN_CANCELLED; diff --git a/libkscan/kscandevice.h b/libkscan/kscandevice.h index 894fa388..e5dd5100 100644 --- a/libkscan/kscandevice.h +++ b/libkscan/kscandevice.h @@ -438,7 +438,7 @@ private: TQSocketNotifier *sn; - SCANSTATUS scantqStatus; + SCANSTATUS scanStatus; /* Data for the scan process */ /* This could/should go to a small help object */ diff --git a/libkscan/scandialog.cpp b/libkscan/scandialog.cpp index 8d762272..c60e7963 100644 --- a/libkscan/scandialog.cpp +++ b/libkscan/scandialog.cpp @@ -55,7 +55,7 @@ ScanDialogFactory::ScanDialogFactory( TQObject *parent, const char *name ) : KScanDialogFactory( parent, name ) { setName( "ScanDialogFactory" ); - KGlobal::locale()->insertCatalogue( TQString::tqfromLatin1("libkscan") ); + KGlobal::locale()->insertCatalogue( TQString::fromLatin1("libkscan") ); } KScanDialog * ScanDialogFactory::createDialog( TQWidget *parent, @@ -113,7 +113,7 @@ void ScanDialog::createOptionsTab( void ) TQGroupBox *gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Startup Options"), page, "GB_STARTUP" ); TQLabel *label = new TQLabel( i18n( "Note: changing these options will affect the scan plugin on next start." ), gb ); - label->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); + label->setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); /* Checkbox for asking for scanner on startup */ cb_askOnStart = new TQCheckBox( i18n( "&Ask for the scan device on plugin startup"), gb ); @@ -130,7 +130,7 @@ void ScanDialog::createOptionsTab( void ) /* Read settings for startup behavior */ KConfig *gcfg = KGlobal::config(); - gcfg->setGroup(TQString::tqfromLatin1(GROUP_STARTUP)); + gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP)); bool skipDialog = gcfg->readBoolEntry( STARTUP_SKIP_ASK, false ); bool onlyLocal = gcfg->readBoolEntry( STARTUP_ONLY_LOCAL, false ); @@ -144,7 +144,7 @@ void ScanDialog::createOptionsTab( void ) TQWidget *spaceEater = new TQWidget( page ); Q_CHECK_PTR( spaceEater ); - spaceEater->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding) ); + spaceEater->setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding) ); } @@ -154,7 +154,7 @@ void ScanDialog::slotNetworkToggle( bool state) kdDebug(29000) << "slotNetworkToggle: Writing state " << writestate << endl; KConfig *c = KGlobal::config(); - c->setGroup(TQString::tqfromLatin1(GROUP_STARTUP)); + c->setGroup(TQString::fromLatin1(GROUP_STARTUP)); c->writeEntry( STARTUP_ONLY_LOCAL, writestate, true, true ); } @@ -164,7 +164,7 @@ void ScanDialog::slotAskOnStartToggle(bool state) kdDebug(29000) << "slotAskOnStartToggle: Writing state " << writestate << endl; KConfig *c = KGlobal::config(); - c->setGroup(TQString::tqfromLatin1(GROUP_STARTUP)); + c->setGroup(TQString::fromLatin1(GROUP_STARTUP)); c->writeEntry( STARTUP_SKIP_ASK, writestate, true, true ); } @@ -314,7 +314,7 @@ bool ScanDialog::setup() kfg->setGroup( GROUP_STARTUP ); /* Since this is a vertical splitter, only the width is important */ - TQString key = TQString::tqfromLatin1( SCANDIA_SPLITTER_SIZES ).tqarg( r.width()); + TQString key = TQString::fromLatin1( SCANDIA_SPLITTER_SIZES ).tqarg( r.width()); kdDebug(29000) << "Read Splitter-Sizes " << key << endl; splitter->setSizes( kfg->readIntListEntry( key )); } @@ -336,7 +336,7 @@ void ScanDialog::slotClose() kfg->setGroup( GROUP_STARTUP ); /* Since this is a vertical splitter, only the width is important */ - TQString key = TQString::tqfromLatin1( SCANDIA_SPLITTER_SIZES ).tqarg( r.width()); + TQString key = TQString::fromLatin1( SCANDIA_SPLITTER_SIZES ).tqarg( r.width()); kfg->writeEntry( key, splitter->sizes(), true, true); } } diff --git a/libkscan/scanparams.cpp b/libkscan/scanparams.cpp index ec9e77fe..422eed4a 100644 --- a/libkscan/scanparams.cpp +++ b/libkscan/scanparams.cpp @@ -120,7 +120,7 @@ bool ScanParams::connectDevice( KScanDevice *newScanDevice ) (void ) new TQLabel( cap, hb ); m_led = new KLed( hb ); m_led->setState( KLed::Off ); - m_led->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); + m_led->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); (void) new KSeparator( KSeparator::HLine, this); @@ -501,9 +501,9 @@ TQScrollView *ScanParams::scannerParams( ) } TQWidget *spacer = new TQWidget( pbox ); - spacer->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding); + spacer->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding); - pbox->setMinimumWidth( pbox->tqsizeHint().width() ); + pbox->setMinimumWidth( pbox->sizeHint().width() ); sv->setMinimumWidth( pbox->minimumWidth() ); sv->addChild( pbox ); @@ -591,7 +591,7 @@ void ScanParams::slFileSelect( void ) fi_item = filterList.next() ) { - filter.append( TQString::tqfromLatin1( prefix + fi_item.lower()) ); + filter.append( TQString::fromLatin1( prefix + fi_item.lower()) ); } } else @@ -638,7 +638,7 @@ void ScanParams::slVirtScanModeSelect( int id ) kdDebug(29000) << "Found File in Filename-Option: " << vf << endl; TQFileInfo fi( vf ); - if( fi.extension() != TQString::tqfromLatin1("pnm") ) + if( fi.extension() != TQString::fromLatin1("pnm") ) virt_filename->set(TQCString("")); } } else { @@ -695,7 +695,7 @@ void ScanParams::virtualScannerParams( void ) TQHBoxLayout *hb = new TQHBoxLayout(); top->addLayout( hb ); w = virt_filename->widget(); - w->setMinimumHeight( (w->tqsizeHint()).height()); + w->setMinimumHeight( (w->sizeHint()).height()); connect( w, TQT_SIGNAL(returnPressed()), this, TQT_SLOT( slCheckGlob())); diff --git a/libkscan/scanparams.h b/libkscan/scanparams.h index a9f29d0e..de69b0c9 100644 --- a/libkscan/scanparams.h +++ b/libkscan/scanparams.h @@ -52,7 +52,7 @@ public: ScanParams( TQWidget *parent, const char *name = 0); ~ScanParams(); #if 0 - TQSize tqsizeHint( ); + TQSize sizeHint( ); #endif bool connectDevice( KScanDevice* ); diff --git a/libkscan/sizeindicator.cpp b/libkscan/sizeindicator.cpp index 582f2330..d11b1cff 100644 --- a/libkscan/sizeindicator.cpp +++ b/libkscan/sizeindicator.cpp @@ -34,7 +34,7 @@ SizeIndicator::SizeIndicator( TQWidget *parent, long thres, long crit ) { sizeInByte = -1; setFrameStyle( TQFrame::Box | TQFrame::Sunken ); - setMinimumWidth( fontMetrics().width( TQString::tqfromLatin1("MMM.MM MB") )); + setMinimumWidth( fontMetrics().width( TQString::fromLatin1("MMM.MM MB") )); setCritical( crit ); threshold = thres; @@ -100,7 +100,7 @@ void SizeIndicator::drawContents( TQPainter *p ) warnColor.setHsv( 0, c, c ); p->drawImage( 0,0, - KImageEffect::unbalancedGradient( s, tqcolorGroup().background(), + KImageEffect::unbalancedGradient( s, colorGroup().background(), warnColor, KImageEffect::CrossDiagonalGradient, 200,200 )); } /* Displaying the text */ |