diff options
Diffstat (limited to 'lib')
137 files changed, 435 insertions, 435 deletions
diff --git a/lib/kformula/kformulacontainer.cc b/lib/kformula/kformulacontainer.cc index 774c7e79..f533db86 100644 --- a/lib/kformula/kformulacontainer.cc +++ b/lib/kformula/kformulacontainer.cc @@ -342,7 +342,7 @@ void Container::paste() TQClipboard* clipboard = TQApplication::tqclipboard(); const TQMimeSource* source = clipboard->data(); if (source->provides( MimeSource::selectionMimeType() )) { - TQByteArray data = source->tqencodedData( MimeSource::selectionMimeType() ); + TQByteArray data = source->encodedData( MimeSource::selectionMimeType() ); TQDomDocument formula; formula.setContent(data); paste( formula, i18n("Paste") ); diff --git a/lib/kformula/kformulamimesource.cc b/lib/kformula/kformulamimesource.cc index 58a6ad35..4c7df0c7 100644 --- a/lib/kformula/kformulamimesource.cc +++ b/lib/kformula/kformulamimesource.cc @@ -99,7 +99,7 @@ bool MimeSource::provides( const char * format) const return false; } -TQByteArray MimeSource::tqencodedData ( const char *format ) const +TQByteArray MimeSource::encodedData ( const char *format ) const { TQString fmt=format; //case sensitive? diff --git a/lib/kformula/kformulamimesource.h b/lib/kformula/kformulamimesource.h index a58255eb..3a94eaef 100644 --- a/lib/kformula/kformulamimesource.h +++ b/lib/kformula/kformulamimesource.h @@ -39,7 +39,7 @@ public: virtual const char* format ( int n = 0 ) const; virtual bool provides ( const char * ) const; - virtual TQByteArray tqencodedData ( const char * ) const; + virtual TQByteArray encodedData ( const char * ) const; virtual const SymbolTable& getSymbolTable() const; diff --git a/lib/kformula/kformulawidget.cc b/lib/kformula/kformulawidget.cc index ef5e09a3..0a3399eb 100644 --- a/lib/kformula/kformulawidget.cc +++ b/lib/kformula/kformulawidget.cc @@ -73,7 +73,7 @@ void KFormulaWidget::paintEvent(TQPaintEvent* event) // than it seems to be as each cursor movement requires a tqrepaint. TQPainter p( &buffer ); //p.translate( -fr.x(), -fr.y() ); - formulaView.draw( p, event->rect(), tqcolorGroup() ); + formulaView.draw( p, event->rect(), colorGroup() ); TQPainter painter; painter.begin(this); diff --git a/lib/kformula/symbolaction.cc b/lib/kformula/symbolaction.cc index d5aa3176..aca4dc03 100644 --- a/lib/kformula/symbolaction.cc +++ b/lib/kformula/symbolaction.cc @@ -128,7 +128,7 @@ int SymbolAction::plug( TQWidget* w, int index ) TQT_SLOT( slotActivated( const TQString & ) ) ); cb->setEnabled( isEnabled() ); bar->insertWidget( id_, comboWidth(), cb, index ); - cb->setMinimumWidth( cb->tqsizeHint().width() ); + cb->setMinimumWidth( cb->sizeHint().width() ); addContainer( bar, id_ ); @@ -166,7 +166,7 @@ void SymbolAction::updateItems( int id ) for( uint i = 0; i < items().count(); ++i ) { new SymbolComboItem( *items().at( i ), m_font, m_chars.at( i ), cb ); } - cb->setMinimumWidth( cb->tqsizeHint().width() ); + cb->setMinimumWidth( cb->sizeHint().width() ); } } } diff --git a/lib/kofficecore/KoChild.cpp b/lib/kofficecore/KoChild.cpp index 41dfee8f..e7752347 100644 --- a/lib/kofficecore/KoChild.cpp +++ b/lib/kofficecore/KoChild.cpp @@ -123,9 +123,9 @@ void KoChild::setClipRegion( TQPainter &painter, bool combine ) { painter.setClipping( true ); if ( combine && !painter.clipRegion().isEmpty() ) - painter.setClipRegion( region( painter.tqworldMatrix() ).intersect( painter.clipRegion() ) ); + painter.setClipRegion( region( painter.worldMatrix() ).intersect( painter.clipRegion() ) ); else - painter.setClipRegion( region( painter.tqworldMatrix() ) ); + painter.setClipRegion( region( painter.worldMatrix() ) ); } void KoChild::setScaling( double x, double y ) @@ -218,7 +218,7 @@ void KoChild::transform( TQPainter &painter ) { setClipRegion( painter, true ); - TQWMatrix m = painter.tqworldMatrix(); + TQWMatrix m = painter.worldMatrix(); m = d->m_matrix * m; m.scale( d->m_scaleX, d->m_scaleY ); painter.setWorldMatrix( m ); diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index ba3c9d54..ddfce183 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -401,7 +401,7 @@ bool KoDocument::saveFile() backup = url(); else backup = d->m_backupPath +"/"+url().fileName(); - backup.setPath( backup.path() + TQString::tqfromLatin1("~") ); + backup.setPath( backup.path() + TQString::fromLatin1("~") ); KFileItem item( entry, url() ); Q_ASSERT( item.name() == url().fileName() ); KIO::NetAccess::file_copy( url(), backup, item.permissions(), true /*overwrite*/, false /*resume*/, shells().current() ); @@ -418,7 +418,7 @@ bool KoDocument::saveFile() if ( !d->filterManager ) d->filterManager = new KoFilterManager( this ); - KoFilter::ConversiontqStatus status = d->filterManager->exp0rt( m_file, outputMimeType ); + KoFilter::ConversionStatus status = d->filterManager->exp0rt( m_file, outputMimeType ); ret = status == KoFilter::OK; suppressErrorDialog = (status == KoFilter::UserCancelled || status == KoFilter::BadConversionGraph ); } else { @@ -1274,7 +1274,7 @@ TQString KoDocument::autoSaveFile( const TQString & path ) const // Never saved? Use a temp file in $HOME then // Yes, two open unnamed docs will overwrite each other's autosave file, // but hmm, we can only do something if that's in the same process anyway... - TQString ret = TQDir::homeDirPath() + "/." + TQString::tqfromLatin1(instance()->instanceName()) + ".autosave" + extension; + TQString ret = TQDir::homeDirPath() + "/." + TQString::fromLatin1(instance()->instanceName()) + ".autosave" + extension; return ret; } else @@ -1456,7 +1456,7 @@ bool KoDocument::openFile() if ( !isNativeFormat( typeName.latin1() ) ) { if ( !d->filterManager ) d->filterManager = new KoFilterManager( this ); - KoFilter::ConversiontqStatus status; + KoFilter::ConversionStatus status; importedFile = d->filterManager->import( m_file, status ); if ( status != KoFilter::OK ) { @@ -2082,7 +2082,7 @@ void KoDocument::setTitleModified() // Get caption from document info (title(), in about page) if ( documentInfo() ) { - KoDocumentInfoPage * page = documentInfo()->page( TQString::tqfromLatin1("about") ); + KoDocumentInfoPage * page = documentInfo()->page( TQString::fromLatin1("about") ); if (page) caption = static_cast<KoDocumentInfoAbout *>(page)->title(); } @@ -2233,7 +2233,7 @@ KService::Ptr KoDocument::readNativeService( KInstance *instance ) // Try by path first, so that we find the global one (which has the native mimetype) // even if the user created a kword.desktop in ~/.kde/share/applnk or any subdir of it. // If he created it under ~/.kde/share/applnk/Office/ then no problem anyway. - service = KService::serviceByDesktopPath( TQString::tqfromLatin1("Office/%1.desktop").tqarg(instname) ); + service = KService::serviceByDesktopPath( TQString::fromLatin1("Office/%1.desktop").tqarg(instname) ); } if ( !service ) service = KService::serviceByDesktopName( instname ); diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp index cd4ecbaf..0b54ebbb 100644 --- a/lib/kofficecore/KoDocumentInfo.cpp +++ b/lib/kofficecore/KoDocumentInfo.cpp @@ -629,7 +629,7 @@ KoDocumentInfoAbout::KoDocumentInfoAbout( KoDocumentInfo* info ) m_docInfo = info; m_editingCycles = 0; m_initialCreator = m_docInfo->creator(); - m_creationDate = TQDateTime::tqcurrentDateTime(); + m_creationDate = TQDateTime::currentDateTime(); } void KoDocumentInfoAbout::saveParameters() @@ -637,7 +637,7 @@ void KoDocumentInfoAbout::saveParameters() KoDocument* doc = dynamic_cast< KoDocument* >( m_docInfo->parent() ); if ( m_firstSave && doc && !doc->isAutosaving() ) m_editingCycles++; - m_modificationDate = TQDateTime::tqcurrentDateTime(); + m_modificationDate = TQDateTime::currentDateTime(); m_firstSave = false; } @@ -878,7 +878,7 @@ void KoDocumentInfoAbout::resetMetaData() { m_editingCycles = 0; m_initialCreator = m_docInfo->creator(); - m_creationDate = TQDateTime::tqcurrentDateTime(); + m_creationDate = TQDateTime::currentDateTime(); m_modificationDate = TQDateTime(); } diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp index 5973dbb4..8fd35ea9 100644 --- a/lib/kofficecore/KoDocumentInfoDlg.cpp +++ b/lib/kofficecore/KoDocumentInfoDlg.cpp @@ -191,7 +191,7 @@ void KoDocumentInfoDlg::deleteInfo() void KoDocumentInfoDlg::resetMetaData() { - TQString s = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ); + TQString s = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ); d->m_aboutWidget->labelCreated->setText( s + ", " + d->m_info->creator() ); d->m_aboutWidget->labelModified->setText( "" ); d->m_aboutWidget->labelRevision->setText( "0" ); diff --git a/lib/kofficecore/KoFilter.cpp b/lib/kofficecore/KoFilter.cpp index 628d5f17..e4284e57 100644 --- a/lib/kofficecore/KoFilter.cpp +++ b/lib/kofficecore/KoFilter.cpp @@ -65,7 +65,7 @@ KoEmbeddingFilter::KoEmbeddingFilter() : KoFilter() } int KoEmbeddingFilter::embedPart( const TQCString& from, TQCString& to, - KoFilter::ConversiontqStatus& status, const TQString& key ) + KoFilter::ConversionStatus& status, const TQString& key ) { ++( m_partStack.top()->m_lruPartIndex ); diff --git a/lib/kofficecore/KoFilter.h b/lib/kofficecore/KoFilter.h index 77439648..dc8c2947 100644 --- a/lib/kofficecore/KoFilter.h +++ b/lib/kofficecore/KoFilter.h @@ -61,7 +61,7 @@ public: * Feel free to add some more error conditions @em before the last item * if it's needed. */ - enum ConversiontqStatus { OK, StupidError, UsageError, CreationError, FileNotFound, + enum ConversionStatus { OK, StupidError, UsageError, CreationError, FileNotFound, StorageCreationError, BadMimeType, BadConversionGraph, EmbeddedDocError, WrongFormat, NotImplemented, ParsingError, InternalError, UnexpectedEOF, @@ -79,10 +79,10 @@ public: * * @param from The mimetype of the source file/document * @param to The mimetype of the destination file/document - * @return The error status, see the @ref #ConversiontqStatus enum. + * @return The error status, see the @ref #ConversionStatus enum. * KoFilter::OK means that everything is alright. */ - virtual ConversiontqStatus convert( const TQCString& from, const TQCString& to ) = 0; + virtual ConversionStatus convert( const TQCString& from, const TQCString& to ) = 0; signals: /** @@ -201,7 +201,7 @@ protected: * within the embedding filter). */ int embedPart( const TQCString& from, TQCString& to, - KoFilter::ConversiontqStatus& status, + KoFilter::ConversionStatus& status, const TQString& key = TQString() ); /** diff --git a/lib/kofficecore/KoFilterChain.cpp b/lib/kofficecore/KoFilterChain.cpp index 471d6098..37ff5d95 100644 --- a/lib/kofficecore/KoFilterChain.cpp +++ b/lib/kofficecore/KoFilterChain.cpp @@ -46,7 +46,7 @@ KoFilterChain::ChainLink::ChainLink( KoFilterChain* chain, KoFilterEntry::Ptr fi { } -KoFilter::ConversiontqStatus KoFilterChain::ChainLink::invokeFilter( const ChainLink* const parentChainLink ) +KoFilter::ConversionStatus KoFilterChain::ChainLink::invokeFilter( const ChainLink* const parentChainLink ) { if ( !m_filterEntry ) { kdError( 30500 ) << "This filter entry is null. Strange stuff going on." << endl; @@ -63,7 +63,7 @@ KoFilter::ConversiontqStatus KoFilterChain::ChainLink::invokeFilter( const Chain if ( parentChainLink ) setupCommunication( parentChainLink->m_filter ); - KoFilter::ConversiontqStatus status = m_filter->convert( m_from, m_to ); + KoFilter::ConversionStatus status = m_filter->convert( m_from, m_to ); delete m_filter; m_filter=0; return status; @@ -90,8 +90,8 @@ void KoFilterChain::ChainLink::setupCommunication( const KoFilter* const parentF if ( !parentFilter ) return; - const TQMetaObject* const parent = parentFilter->tqmetaObject(); - const TQMetaObject* const child = m_filter->tqmetaObject(); + const TQMetaObject* const parent = parentFilter->metaObject(); + const TQMetaObject* const child = m_filter->metaObject(); if ( !parent || !child ) return; @@ -131,9 +131,9 @@ KoFilterChain::~KoFilterChain() manageIO(); // Called for the 2nd time in a row -> clean up } -KoFilter::ConversiontqStatus KoFilterChain::invokeChain() +KoFilter::ConversionStatus KoFilterChain::invokeChain() { - KoFilter::ConversiontqStatus status = KoFilter::OK; + KoFilter::ConversionStatus status = KoFilter::OK; m_state = Beginning; int count = m_chainLinks.count(); diff --git a/lib/kofficecore/KoFilterChain.h b/lib/kofficecore/KoFilterChain.h index d926c613..a044eebe 100644 --- a/lib/kofficecore/KoFilterChain.h +++ b/lib/kofficecore/KoFilterChain.h @@ -69,7 +69,7 @@ public: * @return The return status of the conversion. KoFilter::OK * if everything is alright. */ - KoFilter::ConversiontqStatus invokeChain(); + KoFilter::ConversionStatus invokeChain(); /** * Tells the @ref KoFilterManager the output file of the @@ -182,7 +182,7 @@ private: ChainLink( KoFilterChain* chain, KoFilterEntry::Ptr filterEntry, const TQCString& from, const TQCString& to ); - KoFilter::ConversiontqStatus invokeFilter( const ChainLink* const parentChainLink ); + KoFilter::ConversionStatus invokeFilter( const ChainLink* const parentChainLink ); TQCString from() const { return m_from; } TQCString to() const { return m_to; } diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp index 31a1e43e..e7ee131c 100644 --- a/lib/kofficecore/KoFilterManager.cpp +++ b/lib/kofficecore/KoFilterManager.cpp @@ -138,7 +138,7 @@ KoFilterManager::~KoFilterManager() delete d; } -TQString KoFilterManager::import( const TQString& url, KoFilter::ConversiontqStatus& status ) +TQString KoFilterManager::import( const TQString& url, KoFilter::ConversionStatus& status ) { // Find the mime type for the file to be imported. KURL u; @@ -231,7 +231,7 @@ TQString KoFilterManager::import( const TQString& url, KoFilter::ConversiontqSta return TQString(); } -KoFilter::ConversiontqStatus KoFilterManager::exp0rt( const TQString& url, TQCString& mimeType ) +KoFilter::ConversionStatus KoFilterManager::exp0rt( const TQString& url, TQCString& mimeType ) { bool userCancelled = false; @@ -482,7 +482,7 @@ TQStringList KoFilterManager::mimeFilter( const TQCString& mimetype, Direction d // TODO maybe use the fake vertex trick from the method below, to make the search faster? TQStringList nativeMimeTypes; - nativeMimeTypes.append( TQString::tqfromLatin1( mimetype ) ); + nativeMimeTypes.append( TQString::fromLatin1( mimetype ) ); nativeMimeTypes += extraNativeMimeTypes; // Add the native mimetypes first so that they are on top. diff --git a/lib/kofficecore/KoFilterManager.h b/lib/kofficecore/KoFilterManager.h index 5f0641f4..11158012 100644 --- a/lib/kofficecore/KoFilterManager.h +++ b/lib/kofficecore/KoFilterManager.h @@ -81,7 +81,7 @@ public: * If the TQString which is returned isEmpty() and the status is OK, * then we imported the file directly into the document. */ - TQString import( const TQString& url, KoFilter::ConversiontqStatus& status ); + TQString import( const TQString& url, KoFilter::ConversionStatus& status ); /** * @brief Exports the given file/document to the specified URL/mimetype. * @@ -89,7 +89,7 @@ public: * and when the method returns @p mimeType contains this mimetype. * Oh, well, export is a C++ keyword ;) */ - KoFilter::ConversiontqStatus exp0rt( const TQString& url, TQCString& mimeType ); + KoFilter::ConversionStatus exp0rt( const TQString& url, TQCString& mimeType ); diff --git a/lib/kofficecore/KoGenStyles.cpp b/lib/kofficecore/KoGenStyles.cpp index 5c8f680f..e140ac50 100644 --- a/lib/kofficecore/KoGenStyles.cpp +++ b/lib/kofficecore/KoGenStyles.cpp @@ -225,7 +225,7 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha } if ( !m_familyName.isEmpty() ) const_cast<KoGenStyle *>( this )-> - addAttribute( "style:family", TQString::tqfromLatin1( m_familyName ) ); + addAttribute( "style:family", TQString::fromLatin1( m_familyName ) ); else { if ( qstrcmp( elementName, "style:style" ) == 0 ) kdWarning(30003) << "User style " << name << " is without family - invalid. m_type=" << m_type << endl; diff --git a/lib/kofficecore/KoGlobal.cpp b/lib/kofficecore/KoGlobal.cpp index 8ba1c077..3c979f93 100644 --- a/lib/kofficecore/KoGlobal.cpp +++ b/lib/kofficecore/KoGlobal.cpp @@ -136,7 +136,7 @@ void KoGlobal::createListOfLanguages() // currently have en_GB or en_US etc. const TQStringList translationList = KGlobal::dirs()->findAllResources("locale", - TQString::tqfromLatin1("*/entry.desktop")); + TQString::fromLatin1("*/entry.desktop")); for ( TQStringList::ConstIterator it = translationList.begin(); it != translationList.end(); ++it ) { diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index 1219bf09..4428d524 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -499,7 +499,7 @@ void KoMainWindow::updateCaption() // Get caption from document info (title(), in about page) if ( rootDocument()->documentInfo() ) { - KoDocumentInfoPage * page = rootDocument()->documentInfo()->page( TQString::tqfromLatin1("about") ); + KoDocumentInfoPage * page = rootDocument()->documentInfo()->page( TQString::fromLatin1("about") ); if (page) caption = static_cast<KoDocumentInfoAbout *>(page)->title(); } @@ -1212,7 +1212,7 @@ void KoMainWindow::print(bool quick) { if ( title.isEmpty() ) { // #139905 - breaks message freeze though //const TQString programName = instance()->aboutData() ? instance()->aboutData()->programName() : instance()->instanceName(); - //title = i18n("%1 unsaved document (%2)").tqarg(programName).tqarg(KGlobal::locale()->formatDate(TQDate::tqcurrentDate(), true/*short*/)); + //title = i18n("%1 unsaved document (%2)").tqarg(programName).tqarg(KGlobal::locale()->formatDate(TQDate::currentDate(), true/*short*/)); } printer.setDocName( title ); printer.setDocFileName( fileName ); diff --git a/lib/kofficecore/KoPageLayout.cpp b/lib/kofficecore/KoPageLayout.cpp index 05eff10b..d01ca6db 100644 --- a/lib/kofficecore/KoPageLayout.cpp +++ b/lib/kofficecore/KoPageLayout.cpp @@ -198,15 +198,15 @@ KoFormat KoPageFormat::guessFormat( double width, double height ) TQString KoPageFormat::formatString( KoFormat format ) { if ( format <= PG_LAST_FORMAT ) - return TQString::tqfromLatin1( pageFormatInfo[ format ].shortName ); - return TQString::tqfromLatin1( "A4" ); + return TQString::fromLatin1( pageFormatInfo[ format ].shortName ); + return TQString::fromLatin1( "A4" ); } KoFormat KoPageFormat::formatFromString( const TQString & string ) { for ( int i = 0 ; i <= PG_LAST_FORMAT ; ++i ) { - if (string == TQString::tqfromLatin1( pageFormatInfo[ i ].shortName )) + if (string == TQString::fromLatin1( pageFormatInfo[ i ].shortName )) return pageFormatInfo[ i ].format; } // We do not know the format name, so we have a custom format diff --git a/lib/kofficecore/KoPictureEps.cpp b/lib/kofficecore/KoPictureEps.cpp index 9edbc981..236b08d7 100644 --- a/lib/kofficecore/KoPictureEps.cpp +++ b/lib/kofficecore/KoPictureEps.cpp @@ -399,7 +399,7 @@ bool KoPictureEps::loadData(const TQByteArray& array, const TQString& /* extensi kdError(30003) << "Not standard bounding box: " << line << endl; return false; } - kdDebug(30003) << "Reg. Exp. Found: " << exp.tqcapturedTexts() << endl; + kdDebug(30003) << "Reg. Exp. Found: " << exp.capturedTexts() << endl; rect.setLeft((int)exp.cap(1).toDouble()); rect.setTop((int)exp.cap(2).toDouble()); rect.setRight((int)exp.cap(3).toDouble()); diff --git a/lib/kofficecore/KoPictureKey.cpp b/lib/kofficecore/KoPictureKey.cpp index 0badb429..32d73336 100644 --- a/lib/kofficecore/KoPictureKey.cpp +++ b/lib/kofficecore/KoPictureKey.cpp @@ -139,7 +139,7 @@ void KoPictureKey::loadAttributes( const TQDomElement &elem ) TQString KoPictureKey::toString() const { // We do not use the default TQDateTime::toString has it does not show microseconds - return TQString::tqfromLatin1( "%1 %2" ) + return TQString::fromLatin1( "%1 %2" ) .tqarg( m_filename, m_lastModified.toString("yyyy-MM-dd hh:mm:ss.zzz") ); } diff --git a/lib/kofficecore/KoQueryTrader.cpp b/lib/kofficecore/KoQueryTrader.cpp index 0003d00d..cc9ab920 100644 --- a/lib/kofficecore/KoQueryTrader.cpp +++ b/lib/kofficecore/KoQueryTrader.cpp @@ -76,14 +76,14 @@ KoDocument* KoDocumentEntry::createDoc( KoDocument* parent, const char* name ) c KoDocumentEntry KoDocumentEntry::queryByMimeType( const TQString & mimetype ) { - TQString constr = TQString::tqfromLatin1( "[X-KDE-NativeMimeType] == '%1' or '%2' in [X-KDE-ExtraNativeMimeTypes]" ).tqarg( mimetype ).tqarg( mimetype ); + TQString constr = TQString::fromLatin1( "[X-KDE-NativeMimeType] == '%1' or '%2' in [X-KDE-ExtraNativeMimeTypes]" ).tqarg( mimetype ).tqarg( mimetype ); TQValueList<KoDocumentEntry> vec = query( false,constr ); if ( vec.isEmpty() ) { kdWarning(30003) << "Got no results with " << constr << endl; // Fallback to the old way (which was probably wrong, but better be safe) - TQString constr = TQString::tqfromLatin1( "'%1' in ServiceTypes" ).tqarg( mimetype ); + TQString constr = TQString::fromLatin1( "'%1' in ServiceTypes" ).tqarg( mimetype ); vec = query( constr ); if ( vec.isEmpty() ) { diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp index 75c8fec8..4728c7a8 100644 --- a/lib/kofficecore/KoSpeaker.cpp +++ b/lib/kofficecore/KoSpeaker.cpp @@ -136,7 +136,7 @@ void KoSpeaker::probe() TQPoint pos; bool spoke = false; if ( d->m_speakFlags & SpeakFocusWidget ) { - w = kapp->tqfocusWidget(); + w = kapp->focusWidget(); if (w) { spoke = maybeSayWidget(w); if (!spoke) diff --git a/lib/kofficecore/KoUnit.cpp b/lib/kofficecore/KoUnit.cpp index cc882345..3ba89f24 100644 --- a/lib/kofficecore/KoUnit.cpp +++ b/lib/kofficecore/KoUnit.cpp @@ -183,15 +183,15 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok ) { if ( ok ) *ok = true; - if ( _unitName == TQString::tqfromLatin1( "mm" ) ) return U_MM; - if ( _unitName == TQString::tqfromLatin1( "cm" ) ) return U_CM; - if ( _unitName == TQString::tqfromLatin1( "dm" ) ) return U_DM; - if ( _unitName == TQString::tqfromLatin1( "in" ) - || _unitName == TQString::tqfromLatin1("inch") /*compat*/ ) return U_INCH; - if ( _unitName == TQString::tqfromLatin1( "pi" ) ) return U_PI; - if ( _unitName == TQString::tqfromLatin1( "dd" ) ) return U_DD; - if ( _unitName == TQString::tqfromLatin1( "cc" ) ) return U_CC; - if ( _unitName == TQString::tqfromLatin1( "pt" ) ) return U_PT; + if ( _unitName == TQString::fromLatin1( "mm" ) ) return U_MM; + if ( _unitName == TQString::fromLatin1( "cm" ) ) return U_CM; + if ( _unitName == TQString::fromLatin1( "dm" ) ) return U_DM; + if ( _unitName == TQString::fromLatin1( "in" ) + || _unitName == TQString::fromLatin1("inch") /*compat*/ ) return U_INCH; + if ( _unitName == TQString::fromLatin1( "pi" ) ) return U_PI; + if ( _unitName == TQString::fromLatin1( "dd" ) ) return U_DD; + if ( _unitName == TQString::fromLatin1( "cc" ) ) return U_CC; + if ( _unitName == TQString::fromLatin1( "pt" ) ) return U_PT; if ( ok ) *ok = false; return U_PT; @@ -199,14 +199,14 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok ) TQString KoUnit::unitName( Unit _unit ) { - if ( _unit == U_MM ) return TQString::tqfromLatin1( "mm" ); - if ( _unit == U_CM ) return TQString::tqfromLatin1( "cm" ); - if ( _unit == U_DM ) return TQString::tqfromLatin1( "dm" ); - if ( _unit == U_INCH ) return TQString::tqfromLatin1( "in" ); - if ( _unit == U_PI ) return TQString::tqfromLatin1( "pi" ); - if ( _unit == U_DD ) return TQString::tqfromLatin1( "dd" ); - if ( _unit == U_CC ) return TQString::tqfromLatin1( "cc" ); - return TQString::tqfromLatin1( "pt" ); + if ( _unit == U_MM ) return TQString::fromLatin1( "mm" ); + if ( _unit == U_CM ) return TQString::fromLatin1( "cm" ); + if ( _unit == U_DM ) return TQString::fromLatin1( "dm" ); + if ( _unit == U_INCH ) return TQString::fromLatin1( "in" ); + if ( _unit == U_PI ) return TQString::fromLatin1( "pi" ); + if ( _unit == U_DD ) return TQString::fromLatin1( "dd" ); + if ( _unit == U_CC ) return TQString::fromLatin1( "cc" ); + return TQString::fromLatin1( "pt" ); } void KoUnit::saveOasis(KoXmlWriter* settingsWriter, Unit _unit) diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index debb9f7c..7dc1f0b0 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -671,12 +671,12 @@ void KoView::endOperation() KoMainWindow * KoView::shell() const { - return dynamic_cast<KoMainWindow *>( tqtopLevelWidget() ); + return dynamic_cast<KoMainWindow *>( topLevelWidget() ); } KMainWindow * KoView::mainWindow() const { - return dynamic_cast<KMainWindow *>( tqtopLevelWidget() ); + return dynamic_cast<KMainWindow *>( topLevelWidget() ); } KStatusBar * KoView::statusBar() const diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp index 9535c14a..763bd792 100644 --- a/lib/kofficecore/kkbdaccessextensions.cpp +++ b/lib/kofficecore/kkbdaccessextensions.cpp @@ -274,7 +274,7 @@ bool KKbdAccessExtensions::eventFilter( TQObject *o, TQEvent *e ) TQWidgetList* KKbdAccessExtensions::getAllPanels() { - TQWidgetList* allWidgets = kapp->tqallWidgets(); + TQWidgetList* allWidgets = kapp->allWidgets(); TQWidgetList* allPanels = new TQWidgetList; TQWidget* widget = allWidgets->first(); while (widget) { @@ -390,7 +390,7 @@ void KKbdAccessExtensions::showIcon() { if (!d->panel) return; TQPoint p; - // kdDebug() << "KKbdAccessExtensions::showIcon: tqtopLevelWidget = " << d->panel->tqtopLevelWidget()->name() << endl; + // kdDebug() << "KKbdAccessExtensions::showIcon: topLevelWidget = " << d->panel->topLevelWidget()->name() << endl; if (::tqqt_cast<TQSplitter*>( d->panel )) { TQSplitter* splitter = dynamic_cast<TQSplitter *>(d->panel); int handleNdx = d->handleNdx - 1; @@ -413,8 +413,8 @@ void KKbdAccessExtensions::showIcon() p = dockWindow->pos(); if (dockWindow->area()) { // kdDebug() << "KKbdAccessExtensions::showIcon: pos = " << p << " of window = " << dockWindow->parentWidget()->name() << endl; - p = dockWindow->parentWidget()->mapTo(dockWindow->tqtopLevelWidget(), p); - // kdDebug() << "KKbdAccessExtensions::showIcon: mapTo = " << p << " of window = " << dockWindow->tqtopLevelWidget()->name() << endl; + p = dockWindow->parentWidget()->mapTo(dockWindow->topLevelWidget(), p); + // kdDebug() << "KKbdAccessExtensions::showIcon: mapTo = " << p << " of window = " << dockWindow->topLevelWidget()->name() << endl; // TODO: How to get the handle width? if (d->handleNdx == 1) { d->icon->setShape(TQt::SizeHorCursor); @@ -440,7 +440,7 @@ void KKbdAccessExtensions::showIcon() // else Handle is above the dock window. } } - p = dockWindow->tqtopLevelWidget()->mapToGlobal(p); + p = dockWindow->topLevelWidget()->mapToGlobal(p); } else { d->icon->setShape(TQt::SizeAllCursor); p = TQPoint(dockWindow->width() / 2, dockWindow->height() / 2); @@ -571,7 +571,7 @@ void KKbdAccessExtensions::displayAccessKeys() } // Find all visible, focusable widgets and create a TQLabel for each. Don't exceed // available list of access keys. - TQWidgetList* allWidgets = kapp->tqallWidgets(); + TQWidgetList* allWidgets = kapp->allWidgets(); TQWidget* widget = allWidgets->first(); int accessCount = 0; int maxAccessCount = availableAccessKeys.length(); diff --git a/lib/kofficecore/koDetailsPaneBase.ui b/lib/kofficecore/koDetailsPaneBase.ui index c29e4a46..2dc1c6f4 100644 --- a/lib/kofficecore/koDetailsPaneBase.ui +++ b/lib/kofficecore/koDetailsPaneBase.ui @@ -96,7 +96,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -158,7 +158,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -191,7 +191,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -208,7 +208,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> diff --git a/lib/kofficecore/koDocumentInfoAboutWidget.ui b/lib/kofficecore/koDocumentInfoAboutWidget.ui index cf65eb81..bfd4d49e 100644 --- a/lib/kofficecore/koDocumentInfoAboutWidget.ui +++ b/lib/kofficecore/koDocumentInfoAboutWidget.ui @@ -31,7 +31,7 @@ <property name="name"> <cstring>pixmapLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>56</width> <height>56</height> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -189,7 +189,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>70</height> @@ -206,7 +206,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -277,13 +277,13 @@ <property name="name"> <cstring>pbReset</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>24</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>24</height> @@ -321,7 +321,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>16</height> diff --git a/lib/kofficecore/koDocumentInfoAuthorWidget.ui b/lib/kofficecore/koDocumentInfoAuthorWidget.ui index 60353b91..e007e1a2 100644 --- a/lib/kofficecore/koDocumentInfoAuthorWidget.ui +++ b/lib/kofficecore/koDocumentInfoAuthorWidget.ui @@ -31,7 +31,7 @@ <property name="name"> <cstring>labelAuthor</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>56</width> <height>56</height> @@ -264,7 +264,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui index 2a8a531e..d97a33f2 100644 --- a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui +++ b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui @@ -36,7 +36,7 @@ <property name="name"> <cstring>kPushButton2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>130</width> <height>0</height> @@ -64,7 +64,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>101</height> diff --git a/lib/kofficeui/KoCharSelectDia.cpp b/lib/kofficeui/KoCharSelectDia.cpp index c8b104a9..4095ae09 100644 --- a/lib/kofficeui/KoCharSelectDia.cpp +++ b/lib/kofficeui/KoCharSelectDia.cpp @@ -58,7 +58,7 @@ void KoCharSelectDia::initDialog(const TQChar &_chr, const TQString &_font, bool charSelect = new KCharSelect( page, "", _font, _chr ); connect(charSelect, TQT_SIGNAL(doubleClicked()),this, TQT_SLOT(slotDoubleClicked())); - charSelect->resize( charSelect->tqsizeHint() ); + charSelect->resize( charSelect->sizeHint() ); charSelect->enableFontCombo( true ); grid->addWidget( charSelect, 0, 0 ); diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp index 27c51e79..9f071db9 100644 --- a/lib/kofficeui/KoCommandHistory.cpp +++ b/lib/kofficeui/KoCommandHistory.cpp @@ -53,7 +53,7 @@ void KoListBox::contentsMouseMoveEvent ( TQMouseEvent * e) } } -TQSize KoListBox::tqsizeHint() const +TQSize KoListBox::sizeHint() const { return TQSize(TQMIN(maxItemWidth() + verticalScrollBar()->width() + 4, 400), TQMIN(count() * itemHeight() + horizontalScrollBar()->height() + 4,300)); diff --git a/lib/kofficeui/KoCommandHistory.h b/lib/kofficeui/KoCommandHistory.h index 8522da3b..89b83744 100644 --- a/lib/kofficeui/KoCommandHistory.h +++ b/lib/kofficeui/KoCommandHistory.h @@ -39,7 +39,7 @@ public: KoListBox( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); protected: virtual void contentsMouseMoveEvent ( TQMouseEvent * ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; signals: void changeNumberOfSelectedItem( int ); }; diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp index 82f786e8..2b1a2cbe 100644 --- a/lib/kofficeui/KoContextCelp.cpp +++ b/lib/kofficeui/KoContextCelp.cpp @@ -61,7 +61,7 @@ void KoVerticalLabel::paintEvent( TQPaintEvent* ) KPixmap pm; pm.resize( height(), width() ); TQPainter p( &pm ); - p.fillRect( 0, 0, height(), width(), tqcolorGroup().background() ); + p.fillRect( 0, 0, height(), width(), colorGroup().background() ); p.setFont( font() ); p.drawText( 0, 0, height(), width(), AlignCenter, m_text ); p.end(); @@ -90,9 +90,9 @@ void KoHelpNavButton::paintEvent( TQPaintEvent* ) if ( isEnabled() ) { if ( m_pressed ) - p.setPen( tqcolorGroup().highlight() ); + p.setPen( colorGroup().highlight() ); else - p.setPen( tqcolorGroup().text() ); + p.setPen( colorGroup().text() ); p.drawPixmap( 1, 1, m_bitmap ); } } // KoHelpNavButton::paintEvent @@ -142,9 +142,9 @@ void KoTinyButton::paintEvent( TQPaintEvent* ) if ( isEnabled() ) { if ( m_pressed ) - p.setPen( tqcolorGroup().highlight() ); + p.setPen( colorGroup().highlight() ); else - p.setPen( tqcolorGroup().text() ); + p.setPen( colorGroup().text() ); p.drawPixmap( width() / 2 - 2, 1, m_bitmap ); } } // KoTinyButton::paintEvent @@ -265,7 +265,7 @@ bool KoHelpView::eventFilter( TQObject*, TQEvent* e ) void KoHelpView::paintEvent( TQPaintEvent* ) { TQPainter p( this ); - currentText->draw( &p, 0, 0, TQRect(), tqcolorGroup() ); + currentText->draw( &p, 0, 0, TQRect(), colorGroup() ); } // KoHelpView::paintEvent KoHelpWidget::KoHelpWidget( TQString help, TQWidget* parent ) @@ -450,7 +450,7 @@ void KoContextHelpPopup::resizeEvent( TQResizeEvent* ) void KoContextHelpPopup::paintEvent( TQPaintEvent* ) { TQPainter p( this ); - p.fillRect( 0, 0, width(), height(), tqcolorGroup().light() ); + p.fillRect( 0, 0, width(), height(), colorGroup().light() ); p.setPen( black ); p.drawRect( 0, 0, width(), height() ); p.fillRect( width() - 3, 0, width() - 1, height() - 1, black ); diff --git a/lib/kofficeui/KoEditPath.cpp b/lib/kofficeui/KoEditPath.cpp index 19fd8c92..51afb24b 100644 --- a/lib/kofficeui/KoEditPath.cpp +++ b/lib/kofficeui/KoEditPath.cpp @@ -75,7 +75,7 @@ KoChangePathDia::KoChangePathDia( const TQString & _path, TQWidget *parent, cons TQVBox *page =makeVBoxMainWidget(); new TQLabel( i18n("Location:"), page); m_urlReq = new KURLRequester(page); - m_urlReq->setMinimumWidth( m_urlReq->tqsizeHint().width() * 3 ); + m_urlReq->setMinimumWidth( m_urlReq->sizeHint().width() * 3 ); m_urlReq->lineEdit()->setText( _path ); m_urlReq->fileDialog()->setMode(KFile::Directory | KFile::LocalOnly); diff --git a/lib/kofficeui/KoGeneralPropertyUi.ui b/lib/kofficeui/KoGeneralPropertyUi.ui index 688688c2..5d3d6e4f 100644 --- a/lib/kofficeui/KoGeneralPropertyUi.ui +++ b/lib/kofficeui/KoGeneralPropertyUi.ui @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp index 01f6e745..c11e6745 100644 --- a/lib/kofficeui/KoGuides.cpp +++ b/lib/kofficeui/KoGuides.cpp @@ -69,10 +69,10 @@ private: int m_pos; }; -const KoGuides::SnaptqStatus KoGuides::SNAP_NONE = 0; -const KoGuides::SnaptqStatus KoGuides::SNAP_HORIZ = 1; -const KoGuides::SnaptqStatus KoGuides::SNAP_VERT = 2; -const KoGuides::SnaptqStatus KoGuides::SNAP_BOTH = 3; +const KoGuides::SnapStatus KoGuides::SNAP_NONE = 0; +const KoGuides::SnapStatus KoGuides::SNAP_HORIZ = 1; +const KoGuides::SnapStatus KoGuides::SNAP_VERT = 2; +const KoGuides::SnapStatus KoGuides::SNAP_BOTH = 3; KoGuides::KoGuides( KoView *view, KoZoomHandler *zoomHandler ) : m_view( view ) @@ -365,11 +365,11 @@ void KoGuides::getGuideLines( TQValueList<double> &horizontalPos, TQValueList<do } -void KoGuides::snapToGuideLines( KoRect &rect, int snap, SnaptqStatus &snaptqStatus, KoPoint &diff ) +void KoGuides::snapToGuideLines( KoRect &rect, int snap, SnapStatus &snapStatus, KoPoint &diff ) { - if( !(snaptqStatus & SNAP_VERT)) + if( !(snapStatus & SNAP_VERT)) diff.setX(10000); - if( !(snaptqStatus & SNAP_HORIZ)) + if( !(snapStatus & SNAP_HORIZ)) diff.setY(10000); for ( int i = 0; i < GL_END; ++i ) @@ -380,60 +380,60 @@ void KoGuides::snapToGuideLines( KoRect &rect, int snap, SnaptqStatus &snaptqSta if ( ( *it )->orientation == Qt::Horizontal ) { double tmp = (*it)->position - rect.top(); - if ( snaptqStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) + if ( snapStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) { if(TQABS( tmp ) < TQABS(diff.y())) { diff.setY( tmp ); - snaptqStatus |= SNAP_HORIZ; + snapStatus |= SNAP_HORIZ; } } tmp = (*it)->position - rect.bottom(); - if ( snaptqStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) + if ( snapStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) { if(TQABS( tmp ) < TQABS(diff.y())) { diff.setY( tmp ); - snaptqStatus |= SNAP_HORIZ; + snapStatus |= SNAP_HORIZ; } } } else { double tmp = (*it)->position - rect.left(); - if ( snaptqStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) ) + if ( snapStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) ) { if(TQABS( tmp ) < TQABS(diff.x())) { diff.setX( tmp ); - snaptqStatus |= SNAP_VERT; + snapStatus |= SNAP_VERT; } } tmp = (*it)->position - rect.right(); - if ( snaptqStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) ) + if ( snapStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) ) { if(TQABS( tmp ) < TQABS(diff.x())) { diff.setX( tmp ); - snaptqStatus |= SNAP_VERT; + snapStatus |= SNAP_VERT; } } } } } - if(!(snaptqStatus & SNAP_VERT)) + if(!(snapStatus & SNAP_VERT)) diff.setX( 0 ); - if(!(snaptqStatus & SNAP_HORIZ)) + if(!(snapStatus & SNAP_HORIZ)) diff.setY( 0 ); } -void KoGuides::snapToGuideLines( KoPoint &pos, int snap, SnaptqStatus &snaptqStatus, KoPoint &diff ) +void KoGuides::snapToGuideLines( KoPoint &pos, int snap, SnapStatus &snapStatus, KoPoint &diff ) { - if( !(snaptqStatus & SNAP_VERT)) + if( !(snapStatus & SNAP_VERT)) diff.setX(10000); - if( !(snaptqStatus & SNAP_HORIZ)) + if( !(snapStatus & SNAP_HORIZ)) diff.setY(10000); for ( int i = 0; i < GL_END; ++i ) @@ -444,34 +444,34 @@ void KoGuides::snapToGuideLines( KoPoint &pos, int snap, SnaptqStatus &snaptqSta if ( ( *it )->orientation == Qt::Horizontal ) { double tmp = (*it)->position - pos.y(); - if ( snaptqStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) + if ( snapStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) { if(TQABS( tmp ) < TQABS(diff.y())) { diff.setY( tmp ); - snaptqStatus |= SNAP_HORIZ; + snapStatus |= SNAP_HORIZ; } } } else { double tmp = (*it)->position - pos.x(); - if ( snaptqStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) ) + if ( snapStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) ) { if(TQABS( tmp ) < TQABS(diff.x())) { diff.setX( tmp ); - snaptqStatus |= SNAP_VERT; + snapStatus |= SNAP_VERT; } } } } } - if(!(snaptqStatus & SNAP_VERT)) + if(!(snapStatus & SNAP_VERT)) diff.setX( 0 ); - if(!(snaptqStatus & SNAP_HORIZ)) + if(!(snapStatus & SNAP_HORIZ)) diff.setY( 0 ); } @@ -530,7 +530,7 @@ void KoGuides::repaintSnapping( const KoRect &snappedRect ) } -void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptqStatus ) +void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnapStatus snapStatus ) { bool needRepaint = false; for ( int i = 0; i < GL_END; ++i ) @@ -538,7 +538,7 @@ void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptq TQValueList<KoGuideLine *>::const_iterator it = m_guideLines[i].begin(); for ( ; it != m_guideLines[i].end(); ++it ) { - if ( ( *it )->orientation == Qt::Horizontal && ( snaptqStatus & SNAP_HORIZ ) ) + if ( ( *it )->orientation == Qt::Horizontal && ( snapStatus & SNAP_HORIZ ) ) { if( virtuallyEqual( snappedPoint.y(), (*it)->position ) ) { @@ -556,7 +556,7 @@ void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptq } else { - if ( snaptqStatus & SNAP_VERT ) + if ( snapStatus & SNAP_VERT ) { if( virtuallyEqual( snappedPoint.x(), (*it)->position ) ) { diff --git a/lib/kofficeui/KoGuides.h b/lib/kofficeui/KoGuides.h index b98b0472..7a28962f 100644 --- a/lib/kofficeui/KoGuides.h +++ b/lib/kofficeui/KoGuides.h @@ -58,8 +58,8 @@ public: */ void paintGuides( TQPainter &painter ); - typedef int SnaptqStatus; - static const SnaptqStatus SNAP_NONE, SNAP_HORIZ, SNAP_VERT, SNAP_BOTH; + typedef int SnapStatus; + static const SnapStatus SNAP_NONE, SNAP_HORIZ, SNAP_VERT, SNAP_BOTH; /** * @brief Handle mousePressEvent @@ -148,17 +148,17 @@ public: * @brief Snap rect to guidelines * * This looks for a guide which is in reach for the guide as defined in snap. - * This method has the abillity to combine more calls. The snaptqStatus and diff args are both input and - * output. On first call you should set snaptqStatus to 0. The return value would then show in which + * This method has the abillity to combine more calls. The snapStatus and diff args are both input and + * output. On first call you should set snapStatus to 0. The return value would then show in which * directions it has snapped. If you combine several KoGuides you can let these output arguments * be input for the next koGuide. That way you'll always catch the nearest guide. * * @param rect the rect which should be snapped * @param snap the distance within the guide should snap - but always snap if already snapped - * @param snaptqStatus if horiz,vert or both directions are snapped (both in and out param). + * @param snapStatus if horiz,vert or both directions are snapped (both in and out param). * @param diff distance away from guide. Only valid if status is snapping (both in and out param) */ - void snapToGuideLines( KoRect &rect, int snap, SnaptqStatus &snaptqStatus, KoPoint &diff ); + void snapToGuideLines( KoRect &rect, int snap, SnapStatus &snapStatus, KoPoint &diff ); /** * @brief Snap rect to guidelines @@ -167,10 +167,10 @@ public: * * @param pos the position which should be snapped * @param snap the distance wherein the guide should snap - but always snap if already snapped - * @param snaptqStatus if horiz,vert or both directions are snapped (both in and out param) + * @param snapStatus if horiz,vert or both directions are snapped (both in and out param) * @param diff distance away from guide. Only valid if status is snapping (both in and out param) */ - void snapToGuideLines( KoPoint &pos, int snap, SnaptqStatus &snaptqStatus, KoPoint &diff ); + void snapToGuideLines( KoPoint &pos, int snap, SnapStatus &snapStatus, KoPoint &diff ); /** * @brief tqrepaint guides if any changed snapping status @@ -188,7 +188,7 @@ public: * * @param snappedPoint the point after it has been snapped */ - void repaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptqStatus ); + void repaintSnapping( const KoPoint &snappedPoint, SnapStatus snapStatus ); /** * @brief tqrepaint guides so none is snapped diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp index 342889c4..098a4880 100644 --- a/lib/kofficeui/KoInsertLink.cpp +++ b/lib/kofficeui/KoInsertLink.cpp @@ -484,7 +484,7 @@ fileLinkPage::fileLinkPage( TQWidget *parent , char *name ) else recentFile->insertStringList( lst); - recentFile->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + recentFile->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); connect( recentFile , TQT_SIGNAL(highlighted ( const TQString &)), this, TQT_SLOT( slotSelectRecentFile( const TQString & ))); diff --git a/lib/kofficeui/KoKoolBar.cpp b/lib/kofficeui/KoKoolBar.cpp index 5f42caae..1db0ee9b 100644 --- a/lib/kofficeui/KoKoolBar.cpp +++ b/lib/kofficeui/KoKoolBar.cpp @@ -218,7 +218,7 @@ KoKoolBarBox::KoKoolBarBox( KoKoolBar *_bar ) : setFrameShape( StyledPanel ); setFrameShadow( Sunken ); // setBackgroundMode( PaletteBase ); - setBackgroundColor( tqcolorGroup().background() ); + setBackgroundColor( colorGroup().background() ); } void KoKoolBarBox::setActiveGroup( KoKoolBarGroup *_grp ) diff --git a/lib/kofficeui/KoPageLayoutColumnsBase.ui b/lib/kofficeui/KoPageLayoutColumnsBase.ui index 325fe45e..07cced25 100644 --- a/lib/kofficeui/KoPageLayoutColumnsBase.ui +++ b/lib/kofficeui/KoPageLayoutColumnsBase.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/lib/kofficeui/KoPageLayoutHeaderBase.ui b/lib/kofficeui/KoPageLayoutHeaderBase.ui index b3bd7978..41246d84 100644 --- a/lib/kofficeui/KoPageLayoutHeaderBase.ui +++ b/lib/kofficeui/KoPageLayoutHeaderBase.ui @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/lib/kofficeui/KoPageLayoutSize.cpp b/lib/kofficeui/KoPageLayoutSize.cpp index 6ddf9409..111ba21b 100644 --- a/lib/kofficeui/KoPageLayoutSize.cpp +++ b/lib/kofficeui/KoPageLayoutSize.cpp @@ -160,9 +160,9 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou // ------------- spacers ----------- TQWidget* spacer1 = new TQWidget( this ); TQWidget* spacer2 = new TQWidget( this ); - spacer1->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, + spacer1->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); - spacer2->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, + spacer2->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); grid1->addWidget( spacer1, 4, 0 ); grid1->addWidget( spacer2, 4, 1 ); diff --git a/lib/kofficeui/KoPartSelectAction.cpp b/lib/kofficeui/KoPartSelectAction.cpp index ca24b89a..17bda1e3 100644 --- a/lib/kofficeui/KoPartSelectAction.cpp +++ b/lib/kofficeui/KoPartSelectAction.cpp @@ -64,7 +64,7 @@ void KoPartSelectAction::init() // Called when selecting a part void KoPartSelectAction::slotActionActivated() { - TQString servName = TQString::tqfromLatin1( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() ); + TQString servName = TQString::fromLatin1( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() ); KService::Ptr serv = KService::serviceByName( servName ); m_documentEntry = KoDocumentEntry( serv ); emit activated(); diff --git a/lib/kofficeui/KoPartSelectDia.cpp b/lib/kofficeui/KoPartSelectDia.cpp index b5271b97..144b8a08 100644 --- a/lib/kofficeui/KoPartSelectDia.cpp +++ b/lib/kofficeui/KoPartSelectDia.cpp @@ -56,7 +56,7 @@ KoPartSelectDia::KoPartSelectDia( TQWidget* parent, const char* name ) : selectionChanged( 0 ); setFocus(); - resize( listview->tqsizeHint().width() + 20, 300 ); + resize( listview->sizeHint().width() + 20, 300 ); } void KoPartSelectDia::selectionChanged( TQListViewItem *item ) diff --git a/lib/kofficeui/KoRuler.cpp b/lib/kofficeui/KoRuler.cpp index 212becd7..cc8f5189 100644 --- a/lib/kofficeui/KoRuler.cpp +++ b/lib/kofficeui/KoRuler.cpp @@ -209,12 +209,12 @@ void KoRuler::drawHorizontal( TQPainter *_painter ) // Use a double-buffer pixmap TQPainter p( &buffer ); - p.fillRect( 0, 0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) ); + p.fillRect( 0, 0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) ); int totalw = tqRound( zoomIt(d->tqlayout.ptWidth) ); TQString str; - p.setBrush( tqcolorGroup().brush( TQColorGroup::Base ) ); + p.setBrush( colorGroup().brush( TQColorGroup::Base ) ); // Draw white rect TQRect r; @@ -279,13 +279,13 @@ void KoRuler::drawHorizontal( TQPainter *_painter ) // Draw ending bar (at page width) //int constant=zoomIt(1); //p.drawLine( totalw - diffx + constant, 1, totalw - diffx + constant, height() - 1 ); - //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) ); + //p.setPen( colorGroup().color( TQColorGroup::Base ) ); //p.drawLine( totalw - diffx, 1, totalw - diffx, height() - 1 ); // Draw starting bar (at 0) - //p.setPen( tqcolorGroup().color( TQColorGroup::Text ) ); + //p.setPen( colorGroup().color( TQColorGroup::Text ) ); //p.drawLine( -diffx, 1, -diffx, height() - 1 ); - //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) ); + //p.setPen( colorGroup().color( TQColorGroup::Base ) ); //p.drawLine( -diffx - constant, 1, -diffx - constant, height() - 1 ); // Draw the indents triangles @@ -307,7 +307,7 @@ void KoRuler::drawHorizontal( TQPainter *_painter ) // Show the mouse position if ( d->action == A_NONE && showMPos ) { - p.setPen( tqcolorGroup().color( TQColorGroup::Text ) ); + p.setPen( colorGroup().color( TQColorGroup::Text ) ); p.drawLine( mposX, 1, mposX, height() - 1 ); } hasToDelete = false; @@ -325,7 +325,7 @@ void KoRuler::drawTabs( TQPainter &_painter ) { int ptPos = 0; - _painter.setPen( TQPen( tqcolorGroup().color( TQColorGroup::Text ), 2, SolidLine ) ); + _painter.setPen( TQPen( colorGroup().color( TQColorGroup::Text ), 2, SolidLine ) ); // Check if we're in a mousemove event, removing a tab. // In that case, we'll have to skip drawing that one. bool willRemove = d->mousePressed && willRemoveTab( d->oldMy ) && d->currTab.type != T_INVALID; @@ -356,7 +356,7 @@ void KoRuler::drawTabs( TQPainter &_painter ) _painter.drawLine( ptPos + 4, height() - 4, ptPos + 20 - 4, height() - 4 ); _painter.drawLine( ptPos + 20 / 2, 4, ptPos + 20 / 2, height() - 4 ); _painter.fillRect( ptPos + 20 / 2 + 2, height() - 9, 3, 3, - tqcolorGroup().color( TQColorGroup::Text ) ); + colorGroup().color( TQColorGroup::Text ) ); } break; default: break; } @@ -371,7 +371,7 @@ void KoRuler::drawVertical( TQPainter *_painter ) resize( TQMAX( fm.height() + 4, 20 ), height() ); TQPainter p( &buffer ); - p.fillRect( 0, 0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) ); + p.fillRect( 0, 0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) ); int totalh = tqRound( zoomIt(d->tqlayout.ptHeight) ); // Clip rect - this gives basically always a rect like (2,2,width-2,height-2) @@ -382,7 +382,7 @@ void KoRuler::drawVertical( TQPainter *_painter ) if ( paintRect.intersects( rulerRect ) ) { TQString str; - p.setBrush( tqcolorGroup().brush( TQColorGroup::Base ) ); + p.setBrush( colorGroup().brush( TQColorGroup::Base ) ); // Draw white rect TQRect r; @@ -454,19 +454,19 @@ void KoRuler::drawVertical( TQPainter *_painter ) // Draw ending bar (at page height) //p.drawLine( 1, totalh - diffy + 1, width() - 1, totalh - diffy + 1 ); - //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) ); + //p.setPen( colorGroup().color( TQColorGroup::Base ) ); //p.drawLine( 1, totalh - diffy, width() - 1, totalh - diffy ); // Draw starting bar (at 0) - //p.setPen( tqcolorGroup().color( TQColorGroup::Text ) ); + //p.setPen( colorGroup().color( TQColorGroup::Text ) ); //p.drawLine( 1, -diffy, width() - 1, -diffy ); - //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) ); + //p.setPen( colorGroup().color( TQColorGroup::Base ) ); //p.drawLine( 1, -diffy - 1, width() - 1, -diffy - 1 ); } // Show the mouse position if ( d->action == A_NONE && showMPos ) { - p.setPen( tqcolorGroup().color( TQColorGroup::Text ) ); + p.setPen( colorGroup().color( TQColorGroup::Text ) ); p.drawLine( 1, mposY, width() - 1, mposY ); } hasToDelete = false; @@ -1176,7 +1176,7 @@ void KoRuler::slotMenuActivated( int i ) } } -TQSize KoRuler::tqminimumSizeHint() const +TQSize KoRuler::minimumSizeHint() const { TQSize size; TQFont font = KGlobalSettings::toolBarFont(); @@ -1188,9 +1188,9 @@ TQSize KoRuler::tqminimumSizeHint() const return size; } -TQSize KoRuler::tqsizeHint() const +TQSize KoRuler::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } void KoRuler::setPageLayout( const KoPageLayout& _layout ) diff --git a/lib/kofficeui/KoRuler.h b/lib/kofficeui/KoRuler.h index 5cea5678..52dcecd0 100644 --- a/lib/kofficeui/KoRuler.h +++ b/lib/kofficeui/KoRuler.h @@ -246,12 +246,12 @@ public: /** * Reimplemented from TQWidget */ - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; /** * Reimplemented from TQWidget */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; signals: void newPageLayout( const KoPageLayout & ); diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp index e33ce12c..a7ffe145 100644 --- a/lib/kofficeui/KoTabBar.cpp +++ b/lib/kofficeui/KoTabBar.cpp @@ -273,20 +273,20 @@ void KoTabBarPrivate::drawTab( TQPainter& painter, TQRect& rect, const TQString& painter.save(); // fill it first - TQBrush bg = tabbar->tqcolorGroup().background(); - if( active ) bg = TQBrush(tabbar->tqcolorGroup().base()); + TQBrush bg = tabbar->colorGroup().background(); + if( active ) bg = TQBrush(tabbar->colorGroup().base()); painter.setBrush( bg ); painter.setPen( TQPen( TQt::NoPen ) ); painter.drawPolygon( polygon ); // draw the lines - painter.setPen( tabbar->tqcolorGroup().dark() ); + painter.setPen( tabbar->colorGroup().dark() ); if( !active ) painter.drawLine( rect.x()-25, rect.y(), rect.right()+25, rect.top() ); // TQt4: painter.setRenderHint( TQPainter::Antialiasing ); painter.drawPolyline( polygon ); - painter.setPen( tabbar->tqcolorGroup().buttonText() ); + painter.setPen( tabbar->colorGroup().buttonText() ); TQFont f = painter.font(); if( active ) f.setBold( true ); painter.setFont( f ); @@ -660,10 +660,10 @@ void KoTabBar::paintEvent( TQPaintEvent* ) TQPainter painter; TQPixmap pm( size() ); - pm.fill( tqcolorGroup().background() ); + pm.fill( colorGroup().background() ); painter.tqbegin( TQT_TQPAINTDEVICE(&pm), this ); - painter.setPen( tqcolorGroup().dark() ); + painter.setPen( colorGroup().dark() ); painter.drawLine( 0, 0, width(), 0 ); if( !d->reverseLayout ) @@ -722,9 +722,9 @@ void KoTabBar::resizeEvent( TQResizeEvent* ) update(); } -TQSize KoTabBar::tqsizeHint() const +TQSize KoTabBar::sizeHint() const { - return TQSize( 40, tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, this ) ); + return TQSize( 40, tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, this ) ); } void KoTabBar::renameTab( const TQString& old_name, const TQString& new_name ) diff --git a/lib/kofficeui/KoTabBar.h b/lib/kofficeui/KoTabBar.h index 39cf03b8..0c4233b4 100644 --- a/lib/kofficeui/KoTabBar.h +++ b/lib/kofficeui/KoTabBar.h @@ -219,7 +219,7 @@ public slots: */ void clear(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; signals: diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index 1e526133..880c447b 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -433,7 +433,7 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou KoTCDIconCanvas *canvas = new KoTCDIconCanvas( frame ); tqlayout->addWidget(canvas,0,0); - canvas->setBackgroundColor( tqcolorGroup().base() ); + canvas->setBackgroundColor( colorGroup().base() ); canvas->setResizeMode(TQIconView::Adjust); canvas->setWordWrapIconText( true ); canvas->show(); @@ -642,7 +642,7 @@ void KoTemplateChooseDia::slotOk() static const char* const s_returnTypes[] = { 0 /*Cancel ;)*/, "Template", "File", "Empty" }; if ( d->m_returnType <= Empty ) { - grp.writeEntry( "LastReturnType", TQString::tqfromLatin1(s_returnTypes[d->m_returnType]) ); + grp.writeEntry( "LastReturnType", TQString::fromLatin1(s_returnTypes[d->m_returnType]) ); if (d->m_returnType == Template) { grp.writeEntry( "TemplateTab", d->m_jwidget->activePageIndex() ); @@ -793,12 +793,12 @@ void KoTCDRecentFilesIconView::showToolTip( TQIconViewItem* item ) // and another one for deciding what's the text of the tooltip... const KFileItem *fi = ( (KFileIconViewItem*)item )->fileInfo(); TQString toolTipText = fi->url().prettyURL( 0, KURL::StripFileProtocol ); - toolTip = new TQLabel( TQString::tqfromLatin1(" %1 ").tqarg(toolTipText), 0, + toolTip = new TQLabel( TQString::fromLatin1(" %1 ").tqarg(toolTipText), 0, "myToolTip", WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM ); toolTip->setFrameStyle( TQFrame::Plain | TQFrame::Box ); toolTip->setLineWidth( 1 ); - toolTip->tqsetAlignment( AlignLeft | AlignTop ); + toolTip->setAlignment( AlignLeft | AlignTop ); toolTip->move( TQCursor::pos() + TQPoint( 14, 14 ) ); toolTip->adjustSize(); TQRect screen = TQApplication::desktop()->screenGeometry( @@ -810,7 +810,7 @@ void KoTCDRecentFilesIconView::showToolTip( TQIconViewItem* item ) toolTip->move(toolTip->x(), screen.bottom()-toolTip->y()-toolTip->height()+toolTip->y()); } toolTip->setFont( TQToolTip::font() ); - toolTip->tqsetPalette( TQToolTip::palette(), TRUE ); + toolTip->setPalette( TQToolTip::palette(), TRUE ); toolTip->show(); } diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index 7260bbea..3ac7cb45 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -53,12 +53,12 @@ KoColorPanel::~KoColorPanel() { } -TQSize KoColorPanel::tqsizeHint() const +TQSize KoColorPanel::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } -TQSize KoColorPanel::tqminimumSizeHint() const +TQSize KoColorPanel::minimumSizeHint() const { return TQSize( COLS << 4, lines() << 4 ); } @@ -109,7 +109,7 @@ void KoColorPanel::clear() if ( m_colorMap.isEmpty() ) return; - TQSize area( tqminimumSizeHint() ); + TQSize area( minimumSizeHint() ); m_colorMap.clear(); init(); updateGeometry(); @@ -369,7 +369,7 @@ void KoColorPanel::paintEvent( TQPaintEvent* e ) if ( hasFocus() && m_focusPosition.x != -1 && m_focusPosition.y != -1 && mapFromPosition( m_focusPosition ).intersects( e->rect() ) ) tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ), - tqcolorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled ); + colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled ); --lns; // Attention: We just avoid some lns - 1 statements @@ -580,7 +580,7 @@ void KoColorPanel::updateFocusPosition( const Position& newPosition ) if ( it != m_colorMap.end() ) { // draw at the new focus position tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ), - tqcolorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled ); + colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled ); p.fillRect( ( m_focusPosition.x << 4 ) + 2, ( m_focusPosition.y << 4 ) + 2, 12, 12, it.data() ); } @@ -663,21 +663,21 @@ KoToolButton::~KoToolButton() { } -TQSize KoToolButton::tqsizeHint() const +TQSize KoToolButton::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } -TQSize KoToolButton::tqminimumSizeHint() const +TQSize KoToolButton::minimumSizeHint() const { - TQSize size = KToolBarButton::tqminimumSizeHint(); + TQSize size = KToolBarButton::minimumSizeHint(); size.setWidth( size.width() + ARROW_WIDTH ); return size; } -TQSize KoToolButton::tqminimumSize() const +TQSize KoToolButton::minimumSize() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } void KoToolButton::colorSelected( const TQColor& color ) @@ -691,7 +691,7 @@ void KoToolButton::drawButton(TQPainter *_painter) TQStyle::SCFlags active = TQStyle::SC_None; TQStyle::SCFlags arrowActive = TQStyle::SC_None; TQStyleOption opt; - TQColorGroup cg( tqcolorGroup() ); + TQColorGroup cg( colorGroup() ); if ( isEnabled() ) { flags |= TQStyle::Style_Enabled; @@ -712,10 +712,10 @@ void KoToolButton::drawButton(TQPainter *_painter) // Draw styled toolbuttons _painter->setClipRect( 0, 0, width() - ARROW_WIDTH, height() ); - tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( 0, 0, width() - ARROW_WIDTH, height() ), cg, + tqstyle().drawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( 0, 0, width() - ARROW_WIDTH, height() ), cg, flags, TQStyle::SC_ToolButton, active, opt ); _painter->setClipRect( width() - ARROW_WIDTH, 0, ARROW_WIDTH, height() ); - tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( width(), 0, ARROW_WIDTH, height() ), cg, + tqstyle().drawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( width(), 0, ARROW_WIDTH, height() ), cg, arrowFlags, TQStyle::SC_ToolButton, arrowActive, opt ); _painter->setClipping( false ); @@ -724,7 +724,7 @@ void KoToolButton::drawButton(TQPainter *_painter) cg, flags, opt ); if ( KToolBarButton::isRaised() || m_arrowPressed ) - qDrawShadeLine( _painter, width() - ARROW_WIDTH - 1, 0, width() - ARROW_WIDTH - 1, height() - 1, tqcolorGroup(), true ); + qDrawShadeLine( _painter, width() - ARROW_WIDTH - 1, 0, width() - ARROW_WIDTH - 1, height() - 1, colorGroup(), true ); int dx, dy; TQFont tmp_font( KGlobalSettings::toolBarFont() ); @@ -802,7 +802,7 @@ void KoToolButton::drawButton(TQPainter *_painter) else if( KToolBarButton::isRaised() ) _painter->setPen( KGlobalSettings::toolBarHighlightColor() ); else - _painter->setPen( tqcolorGroup().buttonText() ); + _painter->setPen( colorGroup().buttonText() ); _painter->drawText( textRect, textFlags, textLabel() ); } } @@ -838,15 +838,15 @@ void KoToolButton::init() // We are interested in the mouse clicks on the arrow button m_popup->installEventFilter( this ); - ARROW_WIDTH = tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator) + 4; + ARROW_WIDTH = tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator) + 4; kdDebug() << "##################### Arrow: " << ARROW_WIDTH << endl; } void KoToolButton::buttonShift( int& dx, int& dy ) { if ( isDown() && !m_arrowPressed ) { - dx += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ); - dy += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical ); + dx += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal ); + dy += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical ); } } diff --git a/lib/kofficeui/KoTooluButton.h b/lib/kofficeui/KoTooluButton.h index 1374f6d2..804b270b 100644 --- a/lib/kofficeui/KoTooluButton.h +++ b/lib/kofficeui/KoTooluButton.h @@ -34,8 +34,8 @@ public: KoColorPanel( TQWidget* parent = 0, const char* name = 0 ); virtual ~KoColorPanel(); - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; enum MenuStyle { Plain, CustomColors }; static TQPopupMenu* createColorPopup( MenuStyle style, const TQColor& defaultColor, @@ -163,9 +163,9 @@ public: virtual ~KoToolButton(); - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; - virtual TQSize tqminimumSize() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; + virtual TQSize minimumSize() const; public slots: void colorSelected( const TQColor& color ); diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp index 476e35b3..89d9dbc8 100644 --- a/lib/kofficeui/KoUnitWidgets.cpp +++ b/lib/kofficeui/KoUnitWidgets.cpp @@ -223,7 +223,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, const char *name ) : KLineEdit( parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 ) { - tqsetAlignment( TQt::AlignRight ); + setAlignment( TQt::AlignRight ); m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) ); setValidator( m_validator ); setUnit( KoUnit::U_PT ); @@ -235,7 +235,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, double lower, doub : KLineEdit( parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ), m_lowerInPoints( lower ), m_upperInPoints( upper ) { - tqsetAlignment( TQt::AlignRight ); + setAlignment( TQt::AlignRight ); m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) ); setValidator( m_validator ); setUnit( unit ); @@ -287,7 +287,7 @@ double KoUnitDoubleLineEdit::value( void ) const KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, const char *name ) : KComboBox( true, parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 ) { - lineEdit()->tqsetAlignment( TQt::AlignRight ); + lineEdit()->setAlignment( TQt::AlignRight ); m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) ); lineEdit()->setValidator( m_validator ); setUnit( KoUnit::U_PT ); @@ -300,7 +300,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, doub : KComboBox( true, parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ), m_lowerInPoints( lower ), m_upperInPoints( upper ) { - lineEdit()->tqsetAlignment( TQt::AlignRight ); + lineEdit()->setAlignment( TQt::AlignRight ); m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) ); lineEdit()->setValidator( m_validator ); setUnit( unit ); diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp index c0da86e9..2618a8e0 100644 --- a/lib/kofficeui/kcoloractions.cpp +++ b/lib/kofficeui/kcoloractions.cpp @@ -266,7 +266,7 @@ int KSelectColorAction::plug( TQWidget* w, int index ) menu->setItemEnabled( id, false ); if ( !whatsThis().isEmpty() ) - menu->tqsetWhatsThis( id, whatsThisWithIcon() ); + menu->setWhatsThis( id, whatsThisWithIcon() ); addContainer( menu, id ); connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); @@ -341,7 +341,7 @@ TQString KSelectColorAction::whatsThisWithIcon() const { TQString text = whatsThis(); if (!icon().isEmpty()) - return TQString::tqfromLatin1("<img source=\"small|%1\"> %2").tqarg(icon()).tqarg(text); + return TQString::fromLatin1("<img source=\"small|%1\"> %2").tqarg(icon()).tqarg(text); return text; } diff --git a/lib/kofficeui/tests/coloraction_test.cpp b/lib/kofficeui/tests/coloraction_test.cpp index 729285bb..9dfd066c 100644 --- a/lib/kofficeui/tests/coloraction_test.cpp +++ b/lib/kofficeui/tests/coloraction_test.cpp @@ -36,19 +36,19 @@ TopLevel::TopLevel( TQWidget* parent, const char* name) : TQMainWindow( parent, name ) { - setCaption( TQString::tqfromLatin1( "KColorAction test application" ) ); + setCaption( TQString::fromLatin1( "KColorAction test application" ) ); TQWidget *w = new TQWidget( this ); setCentralWidget( w ); TQBoxLayout* l = new TQHBoxLayout( w, KDialog::marginHint(), KDialog::spacingHint() ); - TQGroupBox* b1 = new TQVGroupBox( TQString::tqfromLatin1( "KoColorPanel 1" ), w ); + TQGroupBox* b1 = new TQVGroupBox( TQString::fromLatin1( "KoColorPanel 1" ), w ); panel = new KoColorPanel( b1, "panel1" ); connect( panel, TQT_SIGNAL( colorSelected( const TQColor& ) ), TQT_SLOT( slotColorSelected( const TQColor& ) ) ); //panel->insertDefaultColors(); l->addWidget( b1 ); - b1 = new TQVGroupBox( TQString::tqfromLatin1( "KoColorPanel 2" ), w ); + b1 = new TQVGroupBox( TQString::fromLatin1( "KoColorPanel 2" ), w ); ( void ) new KoColorPanel( b1, "panel2" ); l->addWidget( b1 ); diff --git a/lib/kofficeui/tkaction.cpp b/lib/kofficeui/tkaction.cpp index 6a7d198a..da88a7c1 100644 --- a/lib/kofficeui/tkaction.cpp +++ b/lib/kofficeui/tkaction.cpp @@ -166,9 +166,9 @@ void TKAction::updateLayout(TQWidget* base) } else pixLabel->hide(); - base->setFixedWidth( w->tqsizeHint().width() + - (textLabel->isVisible() ? textLabel->tqsizeHint().width():0) + - (pixLabel->isVisible() ? pixLabel->tqsizeHint().width():0) ); + base->setFixedWidth( w->sizeHint().width() + + (textLabel->isVisible() ? textLabel->sizeHint().width():0) + + (pixLabel->isVisible() ? pixLabel->sizeHint().width():0) ); } /******************************************************************************/ TKBaseSelectAction::TKBaseSelectAction( TQObject* parent, const char* name ) @@ -191,7 +191,7 @@ int TKBaseSelectAction::plug(TQWidget* widget, int index) TKComboBox* cb = new TKComboBox(m_editable,bar); initComboBox(cb); - cb->setMinimumWidth( cb->tqsizeHint().width() ); + cb->setMinimumWidth( cb->sizeHint().width() ); TQWidget* base = createLayout(bar,cb); bar->insertWidget( id_, 100, base, index ); diff --git a/lib/kofficeui/tkcombobox.cpp b/lib/kofficeui/tkcombobox.cpp index d1cb7ac2..cd20f790 100644 --- a/lib/kofficeui/tkcombobox.cpp +++ b/lib/kofficeui/tkcombobox.cpp @@ -59,7 +59,7 @@ void TKComboBox::paintEvent(TQPaintEvent*) int bh = height()-4; TQPainter p( this ); - const TQColorGroup& g = tqcolorGroup(); + const TQColorGroup& g = colorGroup(); TQRect fr(2,2,width()-4,height()-4); @@ -87,8 +87,8 @@ void TKComboBox::paintEvent(TQPaintEvent*) TQPixmap pixmap(arrow_down); - tqstyle().tqdrawControl( TQStyle::CE_PushButton, &p, this, TQRect( bx, by, bw, bh ), tqcolorGroup() ); - tqstyle().drawItem( &p, TQRect( bx, by, bw, bh), AlignCenter, tqcolorGroup(), isEnabled(), &pixmap, TQString() ); + tqstyle().drawControl( TQStyle::CE_PushButton, &p, this, TQRect( bx, by, bw, bh ), colorGroup() ); + tqstyle().drawItem( &p, TQRect( bx, by, bw, bh), AlignCenter, colorGroup(), isEnabled(), &pixmap, TQString() ); if ( hasFocus()) { tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, fr, g ); diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp index b0520a2c..5436496f 100644 --- a/lib/kofficeui/tktoolbarbutton.cpp +++ b/lib/kofficeui/tktoolbarbutton.cpp @@ -353,14 +353,14 @@ void TKToolBarButton::drawButton( TQPainter* p ) #define DRAW_PIXMAP_AND_TEXT \ int x = 3;\ if (pixmap()) {\ - tqstyle().drawItem( p, TQRect( x, 0, pixmap()->width(), height() ), AlignCenter, tqcolorGroup(), isEnabled(), pixmap(), TQString() );\ + tqstyle().drawItem( p, TQRect( x, 0, pixmap()->width(), height() ), AlignCenter, colorGroup(), isEnabled(), pixmap(), TQString() );\ if (d->m_iconMode==TK::IconAndText && !d->m_text.isEmpty()) {\ x += pixmap()->width() + 3;\ }\ }\ if ((d->m_iconMode==TK::IconAndText||d->m_iconMode==TK::TextOnly) && !d->m_text.isEmpty()) {\ TQFontMetrics fm(KGlobalSettings::toolBarFont());\ - tqstyle().drawItem( p, TQRect( x, 0, fm.width(d->m_text), height() ), AlignCenter, tqcolorGroup(), isEnabled(), 0, d->m_text );\ + tqstyle().drawItem( p, TQRect( x, 0, fm.width(d->m_text), height() ), AlignCenter, colorGroup(), isEnabled(), 0, d->m_text );\ } const char* arrow[] = { @@ -384,20 +384,20 @@ void TKToolBarButton::drawButton( TQPainter* p ) if (d->m_isRaised) flags |= TQStyle::Style_Raised; if (hasFocus()) flags |= TQStyle::Style_HasFocus; - tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( 0, 0, width()-12, height() ), tqcolorGroup(), flags, TQStyle::SC_ToolButton ); - tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( width()-13, 0, 13, height() ), tqcolorGroup(), flags, TQStyle::SC_ToolButton ); - tqstyle().drawItem( p, TQRect( width()-13, 0, 13, height() ), AlignCenter, tqcolorGroup(), isEnabled(), &arrow_pix, TQString() ); + tqstyle().drawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( 0, 0, width()-12, height() ), colorGroup(), flags, TQStyle::SC_ToolButton ); + tqstyle().drawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( width()-13, 0, 13, height() ), colorGroup(), flags, TQStyle::SC_ToolButton ); + tqstyle().drawItem( p, TQRect( width()-13, 0, 13, height() ), AlignCenter, colorGroup(), isEnabled(), &arrow_pix, TQString() ); if ( d->m_isRaised ) - qDrawShadeLine( p, width()-12, 0, width()-12, height(), tqcolorGroup(), true ); + qDrawShadeLine( p, width()-12, 0, width()-12, height(), colorGroup(), true ); DRAW_PIXMAP_AND_TEXT } else { - tqstyle().tqdrawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? tqcolorGroup() : tqpalette().disabled(), f ); + tqstyle().drawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? colorGroup() : tqpalette().disabled(), f ); DRAW_PIXMAP_AND_TEXT int z = f ? 1:0; p->drawPixmap(width()-11+z,(height()-4)/2+z ,arrow_pix); } } else { - tqstyle().tqdrawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? tqcolorGroup() : tqpalette().disabled(), f ); + tqstyle().drawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? colorGroup() : tqpalette().disabled(), f ); DRAW_PIXMAP_AND_TEXT } } @@ -430,14 +430,14 @@ void TKToolBarButton::makeDisabledPixmap() disabledPixmap = effect.apply(activePixmap, KIcon::Toolbar, KIcon::DisabledState); } -TQSize TKToolBarButton::tqsizeHint() const +TQSize TKToolBarButton::sizeHint() const { - return tqminimumSize(); + return minimumSize(); } -TQSize TKToolBarButton::tqminimumSizeHint() const +TQSize TKToolBarButton::minimumSizeHint() const { - return tqminimumSize(); + return minimumSize(); } void TKToolBarButton::showMenu() diff --git a/lib/kofficeui/tktoolbarbutton.h b/lib/kofficeui/tktoolbarbutton.h index 3cec2f57..883d7811 100644 --- a/lib/kofficeui/tktoolbarbutton.h +++ b/lib/kofficeui/tktoolbarbutton.h @@ -180,8 +180,8 @@ public: TQPixmap getActivePixmap() const; - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; signals: void buttonClicked(); diff --git a/lib/kopainter/koFrameButton.cc b/lib/kopainter/koFrameButton.cc index c87fe230..d5f2dada 100644 --- a/lib/kopainter/koFrameButton.cc +++ b/lib/kopainter/koFrameButton.cc @@ -37,7 +37,7 @@ TQLabel(parent, name) setFrameStyle(Panel | Raised); setLineWidth(1); setText(text); - tqsetAlignment(AlignHCenter | AlignVCenter); + setAlignment(AlignHCenter | AlignVCenter); mActive = false; mToggle = false; } diff --git a/lib/kopainter/ko_cmyk_widget.cc b/lib/kopainter/ko_cmyk_widget.cc index 1eb9eece..e1230d80 100644 --- a/lib/kopainter/ko_cmyk_widget.cc +++ b/lib/kopainter/ko_cmyk_widget.cc @@ -41,7 +41,7 @@ KoCMYKWidget::KoCMYKWidget(TQWidget *parent, const char *name) : super(parent, name) { m_ColorButton = new KDualColorButton(this); - m_ColorButton -> setFixedSize(m_ColorButton->tqsizeHint()); + m_ColorButton -> setFixedSize(m_ColorButton->sizeHint()); TQGridLayout *mGrid = new TQGridLayout(this, 4, 5, 5, 2); /* setup color sliders */ diff --git a/lib/kopainter/ko_color_wheel.cc b/lib/kopainter/ko_color_wheel.cc index 0c268849..f309125c 100644 --- a/lib/kopainter/ko_color_wheel.cc +++ b/lib/kopainter/ko_color_wheel.cc @@ -49,7 +49,7 @@ void KoColorWheel::drawWheel( TQPixmap *pixmap ) TQPoint center(size/2, size/2); TQImage image( size, size, 32 ); - image.fill(tqcolorGroup ().background().pixel()); + image.fill(colorGroup ().background().pixel()); TQColor col; int a, b, h, s; diff --git a/lib/kopainter/ko_gray_widget.cc b/lib/kopainter/ko_gray_widget.cc index e40031b5..6e321152 100644 --- a/lib/kopainter/ko_gray_widget.cc +++ b/lib/kopainter/ko_gray_widget.cc @@ -36,7 +36,7 @@ KoGrayWidget::KoGrayWidget(TQWidget *parent, const char *name) : super(parent, n m_ColorButton = new KDualColorButton(this); Q_CHECK_PTR(m_ColorButton); - m_ColorButton -> setFixedSize(m_ColorButton->tqsizeHint()); + m_ColorButton -> setFixedSize(m_ColorButton->sizeHint()); TQGridLayout *mGrid = new TQGridLayout(this, 3, 5, 5, 2); /* setup color sliders */ diff --git a/lib/kopainter/ko_hsv_widget.cc b/lib/kopainter/ko_hsv_widget.cc index c870248a..8b2e556c 100644 --- a/lib/kopainter/ko_hsv_widget.cc +++ b/lib/kopainter/ko_hsv_widget.cc @@ -37,7 +37,7 @@ KoHSVWidget::KoHSVWidget(TQWidget *parent, const char *name) : super(parent, name) { m_ColorButton = new KDualColorButton(this); - m_ColorButton -> setFixedSize(m_ColorButton->tqsizeHint()); + m_ColorButton -> setFixedSize(m_ColorButton->sizeHint()); TQGridLayout *mGrid = new TQGridLayout(this, 5, 7, 5, 2); m_colorwheel = new KoColorWheel(this); @@ -96,7 +96,7 @@ KoHSVWidget::KoHSVWidget(TQWidget *parent, const char *name) : super(parent, nam connect(mSIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSChanged(int))); connect(mVIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotVChanged(int))); - //setFixedSize(mGrid -> tqminimumSize()); + //setFixedSize(mGrid -> minimumSize()); m_autovalue = true; // So on the initial selection of h or v, s gets set to 255. update(TQt::black, TQt::white); diff --git a/lib/kopainter/ko_rgb_widget.cc b/lib/kopainter/ko_rgb_widget.cc index 5eaef38e..7e8b69f9 100644 --- a/lib/kopainter/ko_rgb_widget.cc +++ b/lib/kopainter/ko_rgb_widget.cc @@ -38,7 +38,7 @@ KoRGBWidget::KoRGBWidget(TQWidget *parent, const char *name) : super(parent, name) { m_ColorButton = new KDualColorButton(this); - m_ColorButton -> setFixedSize(m_ColorButton->tqsizeHint()); + m_ColorButton -> setFixedSize(m_ColorButton->sizeHint()); TQGridLayout *mGrid = new TQGridLayout(this, 3, 5, 5, 2); /* setup color sliders */ diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc index 600dad1c..04774369 100644 --- a/lib/kopalette/kopalette.cc +++ b/lib/kopalette/kopalette.cc @@ -82,7 +82,7 @@ KoPalette::~KoPalette() void KoPalette::setMainWidget(TQWidget * widget) { setWidget(widget); - resize( TQSize(285, 233).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(285, 233).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); widget->setFont(m_font); m_page = widget; diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index 6ffdcf5c..7f8bb11a 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -366,7 +366,7 @@ Editor::changeSetInternal(Set *set, bool preservePrevSelection, const TQCString& if (item) { d->itemToSelectLater = item; TQTimer::singleShot(10, this, TQT_SLOT(selectItemLater())); - //d->doNotSetFocusOnSelection = !hasParent(this, tqfocusWidget()); + //d->doNotSetFocusOnSelection = !hasParent(this, focusWidget()); //setSelected(item, true); //d->doNotSetFocusOnSelection = false; // ensureItemVisible(item); @@ -590,7 +590,7 @@ Editor::slotClicked(TQListViewItem *it) if (d->currentWidget) { if (d->currentWidget->visibleFlag()) { d->currentWidget->show(); - if (hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(kapp->tqfocusWidget()) )) + if (hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(kapp->focusWidget()) )) d->currentWidget->setFocus(); } } @@ -720,7 +720,7 @@ Editor::updateGroupLabelsPosition() EditorGroupItem *group = dynamic_cast<EditorGroupItem*>(d->topItem->firstChild()); while(group) { - TQRect r = tqitemRect((TQListViewItem*) group); + TQRect r = itemRect((TQListViewItem*) group); if(group->label()) { group->label()->setGeometry(r); group->label()->tqrepaint(); @@ -747,7 +747,7 @@ Editor::showUndoButton( bool show ) if (!d->currentItem || !d->currentWidget || (d->currentWidget && d->currentWidget->isReadOnly())) return; - int y = viewportToContents(TQPoint(0, tqitemRect(d->currentItem).y())).y(); + int y = viewportToContents(TQPoint(0, itemRect(d->currentItem).y())).y(); TQRect tqgeometry(columnWidth(0), y, columnWidth(1) + 1, d->currentItem->height()); d->undoButton->resize(d->baseRowHeight, d->currentItem->height()); @@ -869,10 +869,10 @@ Editor::slotColumnSizeChanged(int section) } TQSize -Editor::tqsizeHint() const +Editor::sizeHint() const { return TQSize( TQFontMetrics(font()).width(columnText(0)+columnText(1)+" "), - KListView::tqsizeHint().height()); + KListView::sizeHint().height()); } void diff --git a/lib/koproperty/editor.h b/lib/koproperty/editor.h index c3ab0c2e..05725529 100644 --- a/lib/koproperty/editor.h +++ b/lib/koproperty/editor.h @@ -77,7 +77,7 @@ class KOPROPERTY_EXPORT Editor : public KListView virtual ~Editor(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual void setFocus(); virtual void setSorting( int column, bool ascending = true ); diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp index 653cbe0a..8c34a5e3 100644 --- a/lib/koproperty/editoritem.cpp +++ b/lib/koproperty/editoritem.cpp @@ -98,7 +98,7 @@ class GroupWidgetBase : public TQWidget , m_isOpen(true) , m_mouseDown(false) { - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 1)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 1)); } void setText( const TQString &text ) @@ -121,9 +121,9 @@ class GroupWidgetBase : public TQWidget m_isOpen = set; } - virtual TQSize tqsizeHint () const + virtual TQSize sizeHint () const { - TQSize s( TQWidget::tqsizeHint() ); + TQSize s( TQWidget::sizeHint() ); s.setHeight(fontMetrics().height()*2); return s; } @@ -208,7 +208,7 @@ GroupContainer::GroupContainer(const TQString& title, TQWidget* parent) : TQWidget(parent) , d(new Private()) { - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 1)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 1)); d->lyr = new TQVBoxLayout(this); d->groupWidget = new GroupWidgetBase(this); d->groupWidget->setText( title ); @@ -563,7 +563,7 @@ EditorGroupItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, in // return; /*p->setPen( KPROPEDITOR_ITEM_BORDER_COLOR ); //! \todo custom color? - p->setClipRect(listView()->tqitemRect(this)); + p->setClipRect(listView()->itemRect(this)); if(column == 1) p->translate(-listView()->columnWidth(0) + 20, 0); int totalWidth = listView()->columnWidth(0) + listView()->columnWidth(1) - 20; diff --git a/lib/koproperty/editors/booledit.cpp b/lib/koproperty/editors/booledit.cpp index 886f20d8..da3fd994 100644 --- a/lib/koproperty/editors/booledit.cpp +++ b/lib/koproperty/editors/booledit.cpp @@ -45,7 +45,7 @@ BoolEdit::BoolEdit(Property *property, TQWidget *parent, const char *name) m_toggle->setFocusPolicy(TQ_WheelFocus); m_toggle->setUsesTextLabel(true); m_toggle->setTextPosition(TQToolButton::Right); - m_toggle->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_toggle->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); //we're not using tqlayout to because of problems with button size m_toggle->move(0, 0); m_toggle->resize(width(), height()); diff --git a/lib/koproperty/editors/coloredit.cpp b/lib/koproperty/editors/coloredit.cpp index a9ab1f1a..3b2bfce0 100644 --- a/lib/koproperty/editors/coloredit.cpp +++ b/lib/koproperty/editors/coloredit.cpp @@ -36,7 +36,7 @@ ColorButton::ColorButton(Property *property, TQWidget *parent, const char *name) m_edit = new KColorCombo(this); m_edit->setFocusPolicy(TQ_NoFocus); connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotValueChanged(int))); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); setFocusWidget(m_edit); diff --git a/lib/koproperty/editors/combobox.cpp b/lib/koproperty/editors/combobox.cpp index 343a9ed9..b9606e0e 100644 --- a/lib/koproperty/editors/combobox.cpp +++ b/lib/koproperty/editors/combobox.cpp @@ -37,7 +37,7 @@ ComboBox::ComboBox(Property *property, TQWidget *parent, const char *name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KComboBox(this); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); diff --git a/lib/koproperty/editors/dateedit.cpp b/lib/koproperty/editors/dateedit.cpp index 0df8532a..11c36a54 100644 --- a/lib/koproperty/editors/dateedit.cpp +++ b/lib/koproperty/editors/dateedit.cpp @@ -37,7 +37,7 @@ DateEdit::DateEdit(Property *property, TQWidget *parent, const char *name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQDateEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); diff --git a/lib/koproperty/editors/datetimeedit.cpp b/lib/koproperty/editors/datetimeedit.cpp index 6e12641a..6ab541de 100644 --- a/lib/koproperty/editors/datetimeedit.cpp +++ b/lib/koproperty/editors/datetimeedit.cpp @@ -37,7 +37,7 @@ DateTimeEdit::DateTimeEdit(Property *property, TQWidget *parent, const char *nam { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQDateTimeEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp index 634641b8..f85279ce 100644 --- a/lib/koproperty/editors/fontedit.cpp +++ b/lib/koproperty/editors/fontedit.cpp @@ -61,7 +61,7 @@ class FontEditRequester : public KFontRequester button()->setText(i18n("...")); TQToolTip::add(button(), i18n("Change font")); button()->setFocusPolicy(TQ_NoFocus); - button()->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + button()->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); TQFontMetrics fm(button()->font()); button()->setFixedWidth(fm.width(button()->text()+' ')); } diff --git a/lib/koproperty/editors/linestyledit.cpp b/lib/koproperty/editors/linestyledit.cpp index e7f5b2f8..b8345390 100644 --- a/lib/koproperty/editors/linestyledit.cpp +++ b/lib/koproperty/editors/linestyledit.cpp @@ -140,7 +140,7 @@ LineStyleEdit::LineStyleEdit(Property *property, TQWidget *parent, const char *n { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQComboBox(this); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index 92ab746d..17f6d508 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -58,16 +58,16 @@ PixmapEdit::PixmapEdit(Property *property, TQWidget *parent, const char *name) m_edit = new TQLabel(this, "m_edit"); TQToolTip::add(m_edit, i18n("Click to show image preview")); - m_edit->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + m_edit->setAlignment(TQt::AlignLeft | TQt::AlignVCenter); m_edit->setMinimumHeight(5); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); m_edit->setBackgroundMode(TQt::PaletteBase); m_edit->setMouseTracking(true); setBackgroundMode(TQt::PaletteBase); m_button = new TQPushButton(i18n("..."), this, "m_button"); TQToolTip::add(m_button, i18n("Insert image from file")); - m_button->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_button->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); TQFontMetrics fm(m_button->font()); m_button->setFixedWidth(fm.width(m_button->text()+' ')); m_button->setFocusPolicy(TQ_NoFocus); diff --git a/lib/koproperty/editors/pointedit.cpp b/lib/koproperty/editors/pointedit.cpp index 6983dd68..fee52662 100644 --- a/lib/koproperty/editors/pointedit.cpp +++ b/lib/koproperty/editors/pointedit.cpp @@ -44,7 +44,7 @@ PointEdit::PointEdit(Property *property, TQWidget *parent, const char *name) m_edit->setPaletteBackgroundColor(tqpalette().active().base()); m_edit->setWordWrap( TQTextEdit::NoWrap ); // m_edit->setBackgroundMode(TQt::PaletteBase); -// m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); +// m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); setEditor(m_edit); // setFocusWidget(m_edit); diff --git a/lib/koproperty/editors/sizeedit.cpp b/lib/koproperty/editors/sizeedit.cpp index 05422119..2fa29bc4 100644 --- a/lib/koproperty/editors/sizeedit.cpp +++ b/lib/koproperty/editors/sizeedit.cpp @@ -43,7 +43,7 @@ SizeEdit::SizeEdit(Property *property, TQWidget *parent, const char *name) // m_edit->setIndent(KPROPEDITOR_ITEM_MARGIN); m_edit->setPaletteBackgroundColor(tqpalette().active().base()); // m_edit->setBackgroundMode(TQt::PaletteBase); -// m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); +// m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); setEditor(m_edit); // setFocusWidget(m_edit); diff --git a/lib/koproperty/editors/sizepolicyedit.cpp b/lib/koproperty/editors/sizepolicyedit.cpp index 125e0a26..7722d4a2 100644 --- a/lib/koproperty/editors/sizepolicyedit.cpp +++ b/lib/koproperty/editors/sizepolicyedit.cpp @@ -42,7 +42,7 @@ SizePolicyEdit::SizePolicyEdit(Property *property, TQWidget *parent, const char m_edit = new TQLabel(this); m_edit->setIndent(KPROPEDITOR_ITEM_MARGIN); m_edit->setBackgroundMode(TQt::PaletteBase); -// m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); +// m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); setEditor(m_edit); // l->addWidget(m_edit); diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp index 8e890419..8c9dbab9 100644 --- a/lib/koproperty/editors/spinbox.cpp +++ b/lib/koproperty/editors/spinbox.cpp @@ -36,7 +36,7 @@ using namespace KoProperty; IntSpinBox::IntSpinBox(int lower, int upper, int step, int value, int base, IntEdit *parent, const char *name) : KIntSpinBox(lower, upper, step, value, base, parent, name) { - editor()->tqsetAlignment(TQt::AlignLeft); + editor()->setAlignment(TQt::AlignLeft); installEventFilter(editor()); installEventFilter(this); TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true ); @@ -179,7 +179,7 @@ IntEdit::setReadOnlyInternal(bool readOnly) DoubleSpinBox::DoubleSpinBox (double lower, double upper, double step, double value, int precision, DoubleEdit *parent) : KDoubleSpinBox(lower, upper, step, value, precision, parent) { - editor()->tqsetAlignment(TQt::AlignLeft); + editor()->setAlignment(TQt::AlignLeft); installEventFilter(editor()); installEventFilter(this); TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true ); @@ -247,7 +247,7 @@ DoubleEdit::DoubleEdit(Property *property, TQWidget *parent, const char *name) 0, precision.toInt(), this); if (!minValueText.isNull()) m_edit->setSpecialValueText(minValueText.toString()); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); setEditor(m_edit); diff --git a/lib/koproperty/editors/stringedit.cpp b/lib/koproperty/editors/stringedit.cpp index 55d8b3ed..1b61a251 100644 --- a/lib/koproperty/editors/stringedit.cpp +++ b/lib/koproperty/editors/stringedit.cpp @@ -31,7 +31,7 @@ StringEdit::StringEdit(Property *property, TQWidget *parent, const char *name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQLineEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMargin(1); m_edit->setMinimumHeight(5); l->addWidget(m_edit); diff --git a/lib/koproperty/editors/stringlistedit.cpp b/lib/koproperty/editors/stringlistedit.cpp index 56bf1145..fe599e58 100644 --- a/lib/koproperty/editors/stringlistedit.cpp +++ b/lib/koproperty/editors/stringlistedit.cpp @@ -46,12 +46,12 @@ StringListEdit::StringListEdit(Property *property, TQWidget *parent, const char m_edit = new TQLineEdit(this); m_edit->setLineWidth(0); m_edit->setReadOnly(true); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); m_selectButton = new TQPushButton("...", this); - m_selectButton->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding); + m_selectButton->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding); l->addWidget(m_selectButton); setFocusWidget(m_selectButton); @@ -87,7 +87,7 @@ StringListEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r void StringListEdit::showEditor() { - KDialogBase dialog(this->tqtopLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"), + KDialogBase dialog(this->topLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, false); KEditListBox *edit = new KEditListBox(i18n("Contents of %1").tqarg(property()->caption()), &dialog, "editlist"); diff --git a/lib/koproperty/editors/symbolcombo.cpp b/lib/koproperty/editors/symbolcombo.cpp index 53394d54..1af1fcd1 100644 --- a/lib/koproperty/editors/symbolcombo.cpp +++ b/lib/koproperty/editors/symbolcombo.cpp @@ -41,12 +41,12 @@ SymbolCombo::SymbolCombo(Property *property, TQWidget *parent, const char *name) m_edit = new TQLineEdit(this); m_edit->setLineWidth(0); m_edit->setReadOnly(true); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); m_edit->setMaxLength(1); l->addWidget(m_edit); m_select = new TQPushButton("...", this); - m_select->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); + m_select->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); m_select->setMinimumHeight(5); l->addWidget(m_select); @@ -90,7 +90,7 @@ SymbolCombo::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, c void SymbolCombo::selectChar() { - KDialogBase dialog(this->tqtopLevelWidget(), "charselect_dialog", true, i18n("Select Char"), + KDialogBase dialog(this->topLevelWidget(), "charselect_dialog", true, i18n("Select Char"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, false); KCharSelect *select = new KCharSelect(&dialog, "select_char"); diff --git a/lib/koproperty/editors/timeedit.cpp b/lib/koproperty/editors/timeedit.cpp index 674d2c89..f89530ea 100644 --- a/lib/koproperty/editors/timeedit.cpp +++ b/lib/koproperty/editors/timeedit.cpp @@ -38,7 +38,7 @@ TimeEdit::TimeEdit(Property *property, TQWidget *parent, const char *name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQTimeEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); diff --git a/lib/koproperty/editors/urledit.cpp b/lib/koproperty/editors/urledit.cpp index 8c150de2..426fe0bd 100644 --- a/lib/koproperty/editors/urledit.cpp +++ b/lib/koproperty/editors/urledit.cpp @@ -36,14 +36,14 @@ URLEdit::URLEdit(Property *property, TQWidget *parent, const char *name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KURLRequester(this); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); setProperty(property); connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotValueChanged(const TQString&))); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); } URLEdit::~URLEdit() diff --git a/lib/koproperty/test/test.cpp b/lib/koproperty/test/test.cpp index df0ec956..c026aad0 100644 --- a/lib/koproperty/test/test.cpp +++ b/lib/koproperty/test/test.cpp @@ -65,10 +65,10 @@ Test::Test() m_set->addProperty(new Property("Bool", TQVariant(true, 4), "Bool"), group); m_set->addProperty(p = new Property("3 States", TQVariant(), "3 States", "", Boolean), group); p->setOption("3rdState", "None"); - m_set->addProperty(p = new Property("Date", TQDate::tqcurrentDate(),"Date"), group); + m_set->addProperty(p = new Property("Date", TQDate::currentDate(),"Date"), group); p->setIcon("date"); m_set->addProperty(new Property("Time", TQTime::currentTime(),"Time"), group); - m_set->addProperty(new Property("DateTime", TQDateTime::tqcurrentDateTime(),"Date/Time"), group); + m_set->addProperty(new Property("DateTime", TQDateTime::currentDateTime(),"Date/Time"), group); TQStringList list;//keys list << "myitem" << "otheritem" << "3rditem"; @@ -107,7 +107,7 @@ Test::Test() p->setIcon("fonts"); m_set->addProperty(new Property("Cursor", TQCursor(TQt::WaitCursor),"Cursor"), group); m_set->addProperty(new Property("LineStyle", 3, "Line Style", "", LineStyle), group); - m_set->addProperty(new Property("SizePolicy", tqsizePolicy(), "Size Policy"), group); + m_set->addProperty(new Property("SizePolicy", sizePolicy(), "Size Policy"), group); // kdDebug() << m_set->groupNames() << endl; diff --git a/lib/koproperty/widget.cpp b/lib/koproperty/widget.cpp index b0169a96..3d6153ae 100644 --- a/lib/koproperty/widget.cpp +++ b/lib/koproperty/widget.cpp @@ -192,7 +192,7 @@ Widget::setEditor(TQWidget* editor) d->editor = editor; if (!d->editor) return; - d->editor->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + d->editor->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); d->editor->move(0,0); } diff --git a/lib/kotext/DateFormatWidget.cpp b/lib/kotext/DateFormatWidget.cpp index c93807a3..49749f91 100644 --- a/lib/kotext/DateFormatWidget.cpp +++ b/lib/kotext/DateFormatWidget.cpp @@ -147,7 +147,7 @@ void DateFormatWidget::updateLabel() { KoVariableDateFormat format; format.setFormatProperties( resultString() ); - TQDateTime ct = TQDateTime::tqcurrentDateTime().addDays( correctValue() ); + TQDateTime ct = TQDateTime::currentDateTime().addDays( correctValue() ); label->setText( format.convert( ct ) ); } diff --git a/lib/kotext/IsoDuration.h b/lib/kotext/IsoDuration.h index 6ccb2891..c0f8fd6f 100644 --- a/lib/kotext/IsoDuration.h +++ b/lib/kotext/IsoDuration.h @@ -31,7 +31,7 @@ static TQString minutesToISODuration( int mn ) { bool neg = mn < 0; // PT == period of time - see ISO8601 - TQString str = TQString::tqfromLatin1( "PT00H%1M00S" ).tqarg( TQABS( mn ) ); + TQString str = TQString::fromLatin1( "PT00H%1M00S" ).tqarg( TQABS( mn ) ); if ( neg ) str.prepend( '-' ); return str; @@ -41,7 +41,7 @@ static TQString daysToISODuration( int days ) { bool neg = days < 0; // P == period, time is ommitted - see ISO8601 - TQString str = TQString::tqfromLatin1( "P%1D" ).tqarg( TQABS( days ) ); + TQString str = TQString::fromLatin1( "P%1D" ).tqarg( TQABS( days ) ); if ( neg ) str.prepend( '-' ); return str; diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp index beaeb9f9..edefb8e5 100644 --- a/lib/kotext/KFontDialog_local.cpp +++ b/lib/kotext/KFontDialog_local.cpp @@ -69,7 +69,7 @@ static int minimumListWidth( const TQListBox *list ) } if( w == 0 ) { w = 40; } w += list->frameWidth() * 2; - w += list->verticalScrollBar()->tqsizeHint().width(); + w += list->verticalScrollBar()->sizeHint().width(); return w; } @@ -297,7 +297,7 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, sampleEdit->setFont(tmpFont); sampleEdit->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog")); sampleEdit->setMinimumHeight( sampleEdit->fontMetrics().lineSpacing() ); - sampleEdit->tqsetAlignment(TQt::AlignCenter); + sampleEdit->setAlignment(TQt::AlignCenter); gridLayout->addMultiCellWidget(sampleEdit, 4, 4, 0, 2); TQString sampleEditWhatsThisText = i18n("This sample text illustrates the current settings. " @@ -333,8 +333,8 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, setSizeIsRelative( *sizeIsRelativeState ); KConfig *config = KGlobal::config(); - KConfigGroupSaver saver(config, TQString::tqfromLatin1("General")); - showXLFDArea(config->readBoolEntry(TQString::tqfromLatin1("fontSelectorShowXLFD"), false)); + KConfigGroupSaver saver(config, TQString::fromLatin1("General")); + showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false)); } KFontChooser_local::~KFontChooser_local() @@ -405,9 +405,9 @@ TQButton::ToggleState KFontChooser_local::sizeIsRelative() const : TQButton::NoChange; } -TQSize KFontChooser_local::tqsizeHint( void ) const +TQSize KFontChooser_local::sizeHint( void ) const { - return tqminimumSizeHint(); + return minimumSizeHint(); } @@ -539,7 +539,7 @@ void KFontChooser_local::style_chosen_slot(const TQString& style) fillSizeList(); } else { // is bitmap font. //sampleEdit->setPaletteBackgroundPixmap( BitmapPixmap ); // TODO - TQValueList<int> sizes = dbase.tqsmoothSizes(familyListBox->currentText(), currentStyles[currentStyle]); + TQValueList<int> sizes = dbase.smoothSizes(familyListBox->currentText(), currentStyles[currentStyle]); if(sizes.count() > 0) { TQValueList<int>::iterator it; diff=1000; @@ -694,13 +694,13 @@ void KFontChooser_local::addFont( TQStringList &list, const char *xfont ) if ( !ptr ) return; - TQString font = TQString::tqfromLatin1(ptr + 1); + TQString font = TQString::fromLatin1(ptr + 1); int pos; if ( ( pos = font.find( '-' ) ) > 0 ) { font.truncate( pos ); - if ( font.find( TQString::tqfromLatin1("open look"), 0, false ) >= 0 ) + if ( font.find( TQString::fromLatin1("open look"), 0, false ) >= 0 ) return; TQStringList::Iterator it = list.begin(); diff --git a/lib/kotext/KFontDialog_local.h b/lib/kotext/KFontDialog_local.h index b9d4853c..943ce724 100644 --- a/lib/kotext/KFontDialog_local.h +++ b/lib/kotext/KFontDialog_local.h @@ -263,7 +263,7 @@ public: /** * Reimplemented for internal reasons. */ - virtual TQSize tqsizeHint( void ) const; + virtual TQSize sizeHint( void ) const; signals: /** diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp index c859d26c..f2c88bcc 100644 --- a/lib/kotext/KoAutoFormat.cpp +++ b/lib/kotext/KoAutoFormat.cpp @@ -932,7 +932,7 @@ bool KoAutoFormat::doCompletion( KoTextCursor* textEditCursor, KoTextParag *para uint maxlength = 0; for ( TQStringList::ConstIterator it = wordlist.begin(); it != wordlist.end(); ++it ) // several completion words were found { - if ( (*it).tqstartsWith( lastWord, false ) && new_wordlist.find(*it) == new_wordlist.end() ) //the completion words that begin with lastWord + if ( (*it).startsWith( lastWord, false ) && new_wordlist.find(*it) == new_wordlist.end() ) //the completion words that begin with lastWord { if ( (*it).length() > maxlength ) maxlength = (*it).length(); @@ -1063,7 +1063,7 @@ void KoAutoFormat::showToolTipBox(KoTextParag *parag, int index, TQWidget *widg m_completionBox->setText(word); m_completionBox->setLastWord(lastWord); m_completionBox->adjustSize(); - int const height = m_completionBox->tqsizeHint().height(); + int const height = m_completionBox->sizeHint().height(); m_completionBox->move( show_pos.x(), show_pos.y() - height ); if (!m_completionBox->isShown() ) diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp index e6dce371..ddcfb1ae 100644 --- a/lib/kotext/KoAutoFormatDia.cpp +++ b/lib/kotext/KoAutoFormatDia.cpp @@ -331,11 +331,11 @@ void KoAutoFormatDia::setupTab1() hbox->addSpacing( 20 ); hbox->setSpacing(KDialog::spacingHint()); pbBulletStyle = new TQPushButton( tab1 ); - pbBulletStyle->setFixedSize( pbBulletStyle->tqsizeHint() ); + pbBulletStyle->setFixedSize( pbBulletStyle->sizeHint() ); hbox->addWidget( pbBulletStyle ); pbDefaultBulletStyle = new TQPushButton( tab1 ); pbDefaultBulletStyle->setText(i18n("Default")); - pbDefaultBulletStyle->setFixedSize( pbDefaultBulletStyle->tqsizeHint() ); + pbDefaultBulletStyle->setFixedSize( pbDefaultBulletStyle->sizeHint() ); hbox->addWidget( pbDefaultBulletStyle ); hbox->addStretch( 1 ); @@ -393,10 +393,10 @@ void KoAutoFormatDia::setupTab2() hbox->addSpacing( 20 ); pbDoubleQuote1 = new TQPushButton( tab2 ); - pbDoubleQuote1->setFixedSize( pbDoubleQuote1->tqsizeHint() ); + pbDoubleQuote1->setFixedSize( pbDoubleQuote1->sizeHint() ); pbDoubleQuote2 = new TQPushButton( tab2 ); - pbDoubleQuote2->setFixedSize( pbDoubleQuote2->tqsizeHint() ); + pbDoubleQuote2->setFixedSize( pbDoubleQuote2->sizeHint() ); if (TQApplication::reverseLayout()) { hbox->addWidget( pbDoubleQuote2 ); @@ -410,7 +410,7 @@ void KoAutoFormatDia::setupTab2() pbDoubleDefault = new TQPushButton( tab2 ); pbDoubleDefault->setText(i18n("Default")); - pbDoubleDefault->setFixedSize( pbDoubleDefault->tqsizeHint() ); + pbDoubleDefault->setFixedSize( pbDoubleDefault->sizeHint() ); hbox->addWidget( pbDoubleDefault ); hbox->addStretch( 1 ); @@ -434,10 +434,10 @@ void KoAutoFormatDia::setupTab2() hbox->addSpacing( 20 ); pbSimpleQuote1 = new TQPushButton( tab2 ); - pbSimpleQuote1->setFixedSize( pbSimpleQuote1->tqsizeHint() ); + pbSimpleQuote1->setFixedSize( pbSimpleQuote1->sizeHint() ); pbSimpleQuote2 = new TQPushButton( tab2 ); - pbSimpleQuote2->setFixedSize( pbSimpleQuote2->tqsizeHint() ); + pbSimpleQuote2->setFixedSize( pbSimpleQuote2->sizeHint() ); if (TQApplication::reverseLayout()) { hbox->addWidget( pbSimpleQuote2 ); @@ -451,7 +451,7 @@ void KoAutoFormatDia::setupTab2() pbSimpleDefault = new TQPushButton( tab2 ); pbSimpleDefault->setText(i18n("Default")); - pbSimpleDefault->setFixedSize( pbSimpleDefault->tqsizeHint() ); + pbSimpleDefault->setFixedSize( pbSimpleDefault->sizeHint() ); hbox->addWidget( pbSimpleDefault ); hbox->addStretch( 1 ); diff --git a/lib/kotext/KoCommentDia.cpp b/lib/kotext/KoCommentDia.cpp index a6c8b2bb..be5278e1 100644 --- a/lib/kotext/KoCommentDia.cpp +++ b/lib/kotext/KoCommentDia.cpp @@ -64,7 +64,7 @@ TQString KoCommentDia::commentText() void KoCommentDia::slotAddAuthorName() { - TQString date = KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ); + TQString date = KGlobal::locale()->formatDate( TQDate::currentDate() ); TQString time = KGlobal::locale()->formatTime( TQTime::currentTime() ); TQString result = TQString("--------%1 ,%2, %3------\n").tqarg(authorName).tqarg(date).tqarg(time); m_multiLine->insertLine( result, m_multiLine->numLines() ); diff --git a/lib/kotext/KoCompletionBase.ui b/lib/kotext/KoCompletionBase.ui index 12ae9d5d..3156e078 100644 --- a/lib/kotext/KoCompletionBase.ui +++ b/lib/kotext/KoCompletionBase.ui @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -289,7 +289,7 @@ This option is most important when Automatically add words to completion list is <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>20</height> @@ -329,7 +329,7 @@ This option is most important when Automatically add words to completion list is <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>20</height> diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp index 66d8d374..abe89b56 100644 --- a/lib/kotext/KoCompletionDia.cpp +++ b/lib/kotext/KoCompletionDia.cpp @@ -57,7 +57,7 @@ KoCompletion::KoCompletion(TQWidget *parent, KoAutoFormat *autoFormat) : KoCompl m_autoFormat( *autoFormat ), m_docAutoFormat( autoFormat ) { - connect(cbAllowCompletion, TQT_SIGNAL(toggled ( bool )), this, TQT_SLOT( changeButtontqStatus())); + connect(cbAllowCompletion, TQT_SIGNAL(toggled ( bool )), this, TQT_SLOT( changeButtonStatus())); TQStringList lst; lst << i18n( "Enter" ); lst << i18n( "Tab" ); @@ -74,10 +74,10 @@ KoCompletion::KoCompletion(TQWidget *parent, KoAutoFormat *autoFormat) : KoCompl connect( pbSaveCompletionEntry, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSaveCompletionEntry())); slotResetConf(); // aka load config - changeButtontqStatus(); + changeButtonStatus(); } -void KoCompletion::changeButtontqStatus() { +void KoCompletion::changeButtonStatus() { bool state = cbAllowCompletion->isChecked(); completionBox->setEnabled( state); @@ -122,7 +122,7 @@ void KoCompletion::slotResetConf() { default: m_completionKeyAction->setCurrentItem( 0 ); } - changeButtontqStatus(); + changeButtonStatus(); } void KoCompletion::slotAddCompletionEntry() { diff --git a/lib/kotext/KoCompletionDia.h b/lib/kotext/KoCompletionDia.h index 1aefb39a..98927e0b 100644 --- a/lib/kotext/KoCompletionDia.h +++ b/lib/kotext/KoCompletionDia.h @@ -35,7 +35,7 @@ public: void saveSettings(); protected slots: - void changeButtontqStatus(); + void changeButtonStatus(); void slotResetConf(); void slotAddCompletionEntry(); void slotRemoveCompletionEntry(); diff --git a/lib/kotext/KoComplexText.cpp b/lib/kotext/KoComplexText.cpp index 54599d07..981ec506 100644 --- a/lib/kotext/KoComplexText.cpp +++ b/lib/kotext/KoComplexText.cpp @@ -913,7 +913,7 @@ TQPtrList<KoTextRun> *KoComplexText::bidiReorderLine( KoBidiControl *control, co } } - KoBiditqStatus status = control->status; + KoBidiStatus status = control->status; TQChar::Direction dir = TQChar::DirON; int sor = start; diff --git a/lib/kotext/KoComplexText.h b/lib/kotext/KoComplexText.h index 72abfbed..7f75d730 100644 --- a/lib/kotext/KoComplexText.h +++ b/lib/kotext/KoComplexText.h @@ -62,8 +62,8 @@ #ifndef TQT_NO_COMPLEXTEXT // bidi helper classes. Internal to TQt -struct TQ_EXPORT KoBiditqStatus { - KoBiditqStatus() { +struct TQ_EXPORT KoBidiStatus { + KoBidiStatus() { eor = TQChar::DirON; lastStrong = TQChar::DirON; last = TQChar:: DirON; @@ -87,12 +87,12 @@ struct TQ_EXPORT KoBidiContext : public TQShared { struct TQ_EXPORT KoBidiControl { KoBidiControl() { context = 0; } - KoBidiControl( KoBidiContext *c, KoBiditqStatus s) + KoBidiControl( KoBidiContext *c, KoBidiStatus s) { context = c; if( context ) context->ref(); status = s; } ~KoBidiControl() { if ( context && context->deref() ) delete context; } void setContext( KoBidiContext *c ) { if ( context == c ) return; if ( context && context->deref() ) delete context; context = c; context->ref(); } KoBidiContext *context; - KoBiditqStatus status; + KoBidiStatus status; }; struct TQ_EXPORT KoTextRun { diff --git a/lib/kotext/KoCreateStyleDia.cpp b/lib/kotext/KoCreateStyleDia.cpp index e4b9f339..fb7d9b9d 100644 --- a/lib/kotext/KoCreateStyleDia.cpp +++ b/lib/kotext/KoCreateStyleDia.cpp @@ -33,7 +33,7 @@ KoCreateStyleDia::KoCreateStyleDia( const TQStringList & _list, TQWidget *parent TQVBox *page = makeVBoxMainWidget(); new TQLabel(i18n("Please specify a new style name:"), page); m_styleName = new TQLineEdit( page ); - m_styleName->setMinimumWidth( m_styleName->tqsizeHint().width() * 3 ); + m_styleName->setMinimumWidth( m_styleName->sizeHint().width() * 3 ); connect( m_styleName, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(nameChanged( const TQString &))); m_styleName->setFocus(); diff --git a/lib/kotext/KoCustomVariablesDia.cpp b/lib/kotext/KoCustomVariablesDia.cpp index aa74d133..f3b84121 100644 --- a/lib/kotext/KoCustomVariablesDia.cpp +++ b/lib/kotext/KoCustomVariablesDia.cpp @@ -67,7 +67,7 @@ void KoVariableNameDia::init() row1->setSpacing( KDialog::spacingHint() ); TQLabel *l = new TQLabel( i18n( "Name:" ), row1 ); - l->setFixedSize( l->tqsizeHint() ); + l->setFixedSize( l->sizeHint() ); names = new TQComboBox( TRUE, row1 ); names->setFocus(); @@ -108,9 +108,9 @@ void KoCustomVariablesListItem::setup() { TQListViewItem::setup(); setHeight( TQMAX( listView()->fontMetrics().height(), - editWidget->tqsizeHint().height() ) ); - //if ( listView()->columnWidth( 1 ) < editWidget->tqsizeHint().width() ) - // listView()->setColumnWidth( 1, editWidget->tqsizeHint().width() ); + editWidget->sizeHint().height() ) ); + //if ( listView()->columnWidth( 1 ) < editWidget->sizeHint().width() ) + // listView()->setColumnWidth( 1, editWidget->sizeHint().width() ); } void KoCustomVariablesListItem::update() @@ -297,13 +297,13 @@ void KoCustomVarDialog::init() TQHBox *row1 = new TQHBox( back ); row1->setSpacing( KDialog::spacingHint() ); TQLabel *ln = new TQLabel( i18n( "Name:" ), row1 ); - ln->setFixedSize( ln->tqsizeHint() ); + ln->setFixedSize( ln->sizeHint() ); m_name = new KLineEdit( row1 ); TQHBox *row2 = new TQHBox( back ); row2->setSpacing( KDialog::spacingHint() ); TQLabel *lv = new TQLabel( i18n( "Value:" ), row2 ); - lv->setFixedSize( lv->tqsizeHint() ); + lv->setFixedSize( lv->sizeHint() ); m_value = new KLineEdit( row2 ); } diff --git a/lib/kotext/KoParagCounter.cpp b/lib/kotext/KoParagCounter.cpp index 6126d6c5..0de6ee87 100644 --- a/lib/kotext/KoParagCounter.cpp +++ b/lib/kotext/KoParagCounter.cpp @@ -575,7 +575,7 @@ void KoParagCounter::setDisplayLevels( int l ) tqinvalidate(); } -void KoParagCounter::tqsetAlignment( int a ) +void KoParagCounter::setAlignment( int a ) { m_align = a; tqinvalidate(); @@ -839,7 +839,7 @@ const TQCString RNThousands[] = {"", "m", "mm", "mmm"}; TQString KoParagCounter::makeRomanNumber( int n ) { if ( n >= 0 ) - return TQString::tqfromLatin1( RNThousands[ ( n / 1000 ) ] + + return TQString::fromLatin1( RNThousands[ ( n / 1000 ) ] + RNHundreds[ ( n / 100 ) % 10 ] + RNTens[ ( n / 10 ) % 10 ] + RNUnits[ ( n ) % 10 ] ); diff --git a/lib/kotext/KoParagCounter.h b/lib/kotext/KoParagCounter.h index dbedb3e8..6758d952 100644 --- a/lib/kotext/KoParagCounter.h +++ b/lib/kotext/KoParagCounter.h @@ -175,7 +175,7 @@ public: /** Counter tqalignment */ int tqalignment() const; - void tqsetAlignment( int a ); + void setAlignment( int a ); /** * Return the format to use for the counter. diff --git a/lib/kotext/KoParagDecorationTab.ui b/lib/kotext/KoParagDecorationTab.ui index 4c93c261..131e1b0c 100644 --- a/lib/kotext/KoParagDecorationTab.ui +++ b/lib/kotext/KoParagDecorationTab.ui @@ -131,7 +131,7 @@ modified in the preview.</p></string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>200</height> @@ -361,7 +361,7 @@ regardless of the style of the preceeding and subsequent paragraphs.</p></ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>250</width> <height>21</height> diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp index 2bc0262d..13c48350 100644 --- a/lib/kotext/KoParagDia.cpp +++ b/lib/kotext/KoParagDia.cpp @@ -205,7 +205,7 @@ void KoCounterStyleWidget::alignmentChanged(const TQString& s) kdError()<<"Not Implemented"<<endl; return; } - m_counter.tqsetAlignment(a); + m_counter.setAlignment(a); emit sig_alignmentChanged(a); } @@ -890,12 +890,12 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW TQLabel * lLimit = new TQLabel(length , indentFrame ); if(frameWidth!=-1) { - lLimit->tqsetAlignment( AlignRight ); + lLimit->setAlignment( AlignRight ); indentGrid->addWidget( lLimit, 1,0 ); } TQLabel * lLeft = new TQLabel( i18n("&Left:"), indentFrame ); - lLeft->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + lLeft->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); indentGrid->addWidget( lLeft, 1, 0 ); eLeft = new KoUnitDoubleSpinBox( indentFrame, 0, 9999, 1, 0.0, m_unit ); @@ -904,7 +904,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW connect( eLeft, TQT_SIGNAL( valueChangedPt(double ) ), this, TQT_SLOT( leftChanged( double ) ) ); TQLabel * lRight = new TQLabel( i18n("&Right:"), indentFrame ); - lRight->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + lRight->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); indentGrid->addWidget( lRight, 2, 0 ); eRight = new KoUnitDoubleSpinBox( indentFrame, 0, 9999, 1, 0.0, m_unit ); @@ -913,7 +913,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW connect( eRight, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( rightChanged( double ) ) ); TQLabel * lFirstLine = new TQLabel( i18n("&First line:"), indentFrame ); - lFirstLine->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + lFirstLine->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); indentGrid->addWidget( lFirstLine, 3, 0 ); eFirstLine = new KoUnitDoubleSpinBox( indentFrame, -9999, 9999, 1, 0.0, m_unit ); @@ -974,7 +974,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW KDialog::marginHint(), KDialog::spacingHint() ); TQLabel * lBefore = new TQLabel( i18n("Before:"), pSpaceFrame ); - lBefore->tqsetAlignment( AlignRight ); + lBefore->setAlignment( AlignRight ); pSpaceGrid->addWidget( lBefore, 1, 0 ); eBefore = new KoUnitDoubleSpinBox( pSpaceFrame, 0, 9999, CM_TO_POINT(1), 0.0, m_unit ); @@ -983,7 +983,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW pSpaceGrid->addWidget( eBefore, 1, 1 ); TQLabel * lAfter = new TQLabel( i18n("After:"), pSpaceFrame ); - lAfter->tqsetAlignment( AlignRight ); + lAfter->setAlignment( AlignRight ); pSpaceGrid->addWidget( lAfter, 2, 0 ); eAfter = new KoUnitDoubleSpinBox( pSpaceFrame, 0, 9999, 1, 0.0, m_unit ); @@ -1608,7 +1608,7 @@ KoParagCounterWidget::KoParagCounterWidget( bool disableAll, TQWidget * parent, gNumbering->tqlayout()->setSpacing( 0 ); gNumbering->tqlayout()->setMargin( 0 ); TQHBoxLayout *numberingGroupLayout = new TQHBoxLayout( gNumbering->tqlayout() ); - numberingGroupLayout->tqsetAlignment( TQt::AlignTop ); + numberingGroupLayout->setAlignment( TQt::AlignTop ); numberingGroupLayout->setSpacing( KDialog::spacingHint() ); numberingGroupLayout->setMargin( KDialog::marginHint() ); @@ -1773,7 +1773,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram gPosition->tqlayout()->setSpacing( 0 ); gPosition->tqlayout()->setMargin( 0 ); TQVBoxLayout* GroupBox2Layout = new TQVBoxLayout( gPosition->tqlayout() ); - GroupBox2Layout->tqsetAlignment( TQt::AlignTop ); + GroupBox2Layout->setAlignment( TQt::AlignTop ); GroupBox2Layout->setSpacing( KDialog::spacingHint() ); GroupBox2Layout->setMargin( KDialog::marginHint() ); @@ -1801,7 +1801,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram bgAlign->tqlayout()->setSpacing( 0 ); bgAlign->tqlayout()->setMargin( 0 ); TQVBoxLayout* ButtonGroup1Layout = new TQVBoxLayout( bgAlign->tqlayout() ); - ButtonGroup1Layout->tqsetAlignment( TQt::AlignTop ); + ButtonGroup1Layout->setAlignment( TQt::AlignTop ); ButtonGroup1Layout->setSpacing( KDialog::spacingHint() ); ButtonGroup1Layout->setMargin( KDialog::marginHint() ); @@ -1837,7 +1837,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram gTabLeader = new TQGroupBox( this, "gTabLeader" ); gTabLeader->setTitle( i18n( "Tab Leader" ) ); TQVBoxLayout* GroupBox5Layout = new TQVBoxLayout( gTabLeader ); - GroupBox5Layout->tqsetAlignment( TQt::AlignTop ); + GroupBox5Layout->setAlignment( TQt::AlignTop ); GroupBox5Layout->setSpacing( KDialog::spacingHint() ); GroupBox5Layout->setMargin( KDialog::marginHint() ); GroupBox5Layout->addSpacing( fontMetrics().height() / 2 ); // groupbox title @@ -1850,7 +1850,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram TQLabel* TextLabel2 = new TQLabel( gTabLeader); TextLabel2->setText( i18n( "&Filling:" ) ); - TextLabel2->tqsetAlignment( AlignRight ); + TextLabel2->setAlignment( AlignRight ); fillingGrid->addWidget( TextLabel2, 0, 0 ); cFilling = new TQComboBox( FALSE, gTabLeader); @@ -1864,7 +1864,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram fillingGrid->addWidget( cFilling, 0, 1 ); TQLabel * TextLabel3 = new TQLabel( i18n("&Width:"), gTabLeader ); - TextLabel3->tqsetAlignment( AlignRight ); + TextLabel3->setAlignment( AlignRight ); fillingGrid->addWidget( TextLabel3, 1, 0 ); eWidth = new KoUnitDoubleSpinBox( gTabLeader ); diff --git a/lib/kotext/KoParagDia.h b/lib/kotext/KoParagDia.h index c4bbed92..26f68e0b 100644 --- a/lib/kotext/KoParagDia.h +++ b/lib/kotext/KoParagDia.h @@ -369,7 +369,7 @@ protected slots: void restartChanged(bool b) {m_counter.setRestartCounter(b); } void depthChanged(int i) {m_counter.setDepth(i); updatePreview();} void displayLevelsChanged(int i) {m_counter.setDisplayLevels(i); updatePreview();} - void alignmentChanged(int i) {m_counter.tqsetAlignment(i); updatePreview();} + void alignmentChanged(int i) {m_counter.setAlignment(i); updatePreview();} void slotChangeCustomBullet( const TQString & f, TQChar c); void styleChanged (KoParagCounter::Style st ); diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp index 42e8d2b0..374184b3 100644 --- a/lib/kotext/KoRichText.cpp +++ b/lib/kotext/KoRichText.cpp @@ -310,7 +310,7 @@ KoTextCursor *KoTextAlignmentCommand::execute( KoTextCursor *c ) if ( !p ) return c; while ( p ) { - p->tqsetAlignment( newAlign ); + p->setAlignment( newAlign ); if ( p->paragId() == lastParag ) break; p = p->next(); @@ -326,7 +326,7 @@ KoTextCursor *KoTextAlignmentCommand::unexecute( KoTextCursor *c ) int i = 0; while ( p ) { if ( i < (int)oldAligns.size() ) - p->tqsetAlignment( oldAligns.at( i ) ); + p->setAlignment( oldAligns.at( i ) ); if ( p->paragId() == lastParag ) break; p = p->next(); diff --git a/lib/kotext/KoRichText.h b/lib/kotext/KoRichText.h index 44c360d5..a5fd6b1a 100644 --- a/lib/kotext/KoRichText.h +++ b/lib/kotext/KoRichText.h @@ -477,9 +477,9 @@ public: KoTextTableCell( KoTextTable* table, int row, int column ); virtual ~KoTextTableCell(); - TQSize tqsizeHint() const ; - TQSize tqminimumSize() const ; - TQSize tqmaximumSize() const ; + TQSize sizeHint() const ; + TQSize minimumSize() const ; + TQSize maximumSize() const ; TQSizePolicy::ExpandData expanding() const; bool isEmpty() const; void setGeometry( const TQRect& ) ; @@ -564,8 +564,8 @@ public: TQString richText() const; - int minimumWidth() const { return tqlayout ? tqlayout->tqminimumSize().width() : 0; } - int widthHint() const { return ( tqlayout ? tqlayout->tqsizeHint().width() : 0 ) + 2 * outerborder; } + int minimumWidth() const { return tqlayout ? tqlayout->minimumSize().width() : 0; } + int widthHint() const { return ( tqlayout ? tqlayout->sizeHint().width() : 0 ) + 2 * outerborder; } TQPtrList<KoTextTableCell> tableCells() const { return cells; } @@ -697,7 +697,7 @@ struct KoTextParagLineStart #endif { } #ifndef TQT_NO_COMPLEXTEXT - KoTextParagLineStart( KoBidiContext *c, KoBiditqStatus s ) : y(0), baseLine(0), h(0), + KoTextParagLineStart( KoBidiContext *c, KoBidiStatus s ) : y(0), baseLine(0), h(0), lineSpacing( 0 ), hyphenated( false ), status( s ), bidicontext( c ) { if ( bidicontext ) bidicontext->ref(); } #endif @@ -728,7 +728,7 @@ public: short lineSpacing; bool hyphenated; #ifndef TQT_NO_COMPLEXTEXT - KoBiditqStatus status; + KoBidiStatus status; #endif int w; diff --git a/lib/kotext/KoStyleCollection.h b/lib/kotext/KoStyleCollection.h index 66a244e5..811bbaea 100644 --- a/lib/kotext/KoStyleCollection.h +++ b/lib/kotext/KoStyleCollection.h @@ -68,7 +68,7 @@ public: * Overloaded for convenience. */ KoParagStyle* findStyle( const TQString & name ) const { - return static_cast<KoParagStyle*>( KoUserStyleCollection::findStyle( name, TQString::tqfromLatin1( "Standard" ) ) ); + return static_cast<KoParagStyle*>( KoUserStyleCollection::findStyle( name, TQString::fromLatin1( "Standard" ) ) ); } /** diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp index e5a7dbfa..19840621 100644 --- a/lib/kotext/KoStyleManager.cpp +++ b/lib/kotext/KoStyleManager.cpp @@ -185,15 +185,15 @@ void KoStyleManager::addGeneralTab( int flags ) { tabLayout->setMargin( KDialog::marginHint() ); m_nameString = new TQLineEdit( tab ); - m_nameString->resize(m_nameString->tqsizeHint() ); + m_nameString->resize(m_nameString->sizeHint() ); connect( m_nameString, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( renameStyle(const TQString &) ) ); tabLayout->addWidget( m_nameString, 0, 1 ); TQLabel *nameLabel = new TQLabel( tab ); nameLabel->setText( i18n( "Name:" ) ); - nameLabel->resize(nameLabel->tqsizeHint()); - nameLabel->tqsetAlignment( AlignRight | AlignVCenter ); + nameLabel->resize(nameLabel->sizeHint()); + nameLabel->setAlignment( AlignRight | AlignVCenter ); tabLayout->addWidget( nameLabel, 0, 0 ); @@ -203,7 +203,7 @@ void KoStyleManager::addGeneralTab( int flags ) { TQLabel *nextStyleLabel = new TQLabel( tab ); nextStyleLabel->setText( i18n( "Next style:" ) ); - nextStyleLabel->tqsetAlignment( AlignRight | AlignVCenter ); + nextStyleLabel->setAlignment( AlignRight | AlignVCenter ); tabLayout->addWidget( nextStyleLabel, 1, 0 ); @@ -212,7 +212,7 @@ void KoStyleManager::addGeneralTab( int flags ) { TQLabel *inheritStyleLabel = new TQLabel( tab ); inheritStyleLabel->setText( i18n( "Inherit style:" ) ); - inheritStyleLabel->tqsetAlignment( AlignRight | AlignVCenter ); + inheritStyleLabel->setAlignment( AlignRight | AlignVCenter ); tabLayout->addWidget( inheritStyleLabel, 2, 0 ); diff --git a/lib/kotext/KoTextDocument.cpp b/lib/kotext/KoTextDocument.cpp index b3f24708..126568ef 100644 --- a/lib/kotext/KoTextDocument.cpp +++ b/lib/kotext/KoTextDocument.cpp @@ -155,11 +155,11 @@ int KoTextDocument::widthUsed() const int w = 0; while ( p ) { int a = p->tqalignment(); - p->tqsetAlignment( TQt::AlignLeft ); + p->setAlignment( TQt::AlignLeft ); p->tqinvalidate( 0 ); p->format(); w = TQMAX( w, p->rect().width() ); - p->tqsetAlignment( a ); + p->setAlignment( a ); p->tqinvalidate( 0 ); p = p->next(); } @@ -1295,7 +1295,7 @@ void KoTextDocument::drawParagWYSIWYG( TQPainter *p, KoTextParag *parag, int cx, // The test on mat is almost like isIdentity(), but allows for translation. //// ##### The way to fix this: initialize the pixmap to be fully transparent instead // of being white. - TQWMatrix mat = p->tqworldMatrix(); + TQWMatrix mat = p->worldMatrix(); if ( ( mat.m11() != 1.0 || mat.m22() != 1.0 || mat.m12() != 0.0 || mat.m21() != 0.0 ) && brush.style() != TQt::SolidPattern ) useDoubleBuffer = FALSE; diff --git a/lib/kotext/KoTextDocument.h b/lib/kotext/KoTextDocument.h index 8cdc1b52..5f2a0665 100644 --- a/lib/kotext/KoTextDocument.h +++ b/lib/kotext/KoTextDocument.h @@ -190,7 +190,7 @@ public: //bool focusNextPrevChild( bool next ); int tqalignment() const; - void tqsetAlignment( int a ); + void setAlignment( int a ); int *tabArray() const; int tabStopWidth() const; @@ -540,7 +540,7 @@ inline int KoTextDocument::tqalignment() const return align; } -inline void KoTextDocument::tqsetAlignment( int a ) +inline void KoTextDocument::setAlignment( int a ) { align = a; } diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp index 30bf6dd3..8732d71d 100644 --- a/lib/kotext/KoTextObject.cpp +++ b/lib/kotext/KoTextObject.cpp @@ -748,7 +748,7 @@ void KoTextObject::pasteText( KoTextCursor * cursor, const TQString & text, KoTe kdDebug(32500) << "KoTextObject::pasteText cursor parag=" << cursor->parag()->paragId() << endl; TQString t = text; // Need to convert CRLF to NL - TQRegExp crlf( TQString::tqfromLatin1("\r\n") ); + TQRegExp crlf( TQString::fromLatin1("\r\n") ); t.replace( crlf, TQChar('\n') ); // Convert non-printable chars for ( int i=0; (uint) i<t.length(); i++ ) { diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp index 23754c28..a081dfda 100644 --- a/lib/kotext/KoTextParag.cpp +++ b/lib/kotext/KoTextParag.cpp @@ -961,7 +961,7 @@ void KoTextParag::setAlign( int align ) { Q_ASSERT( align <= TQt::AlignJustify ); align &= TQt::AlignHorizontal_Mask; - tqsetAlignment( align ); + setAlignment( align ); m_layout.tqalignment = align; } diff --git a/lib/kotext/KoTextParag.h b/lib/kotext/KoTextParag.h index e27a9afc..591242a2 100644 --- a/lib/kotext/KoTextParag.h +++ b/lib/kotext/KoTextParag.h @@ -130,8 +130,8 @@ public: void setFormat( int index, int len, const KoTextFormat *f, bool useCollection = TRUE, int flags = -1 ); - void tqsetAlignment( uint a ); - void tqsetAlignmentDirect( uint a ) { align = a; } + void setAlignment( uint a ); + void setAlignmentDirect( uint a ) { align = a; } uint tqalignment() const; virtual void paint( TQPainter &painter, const TQColorGroup &cg, KoTextCursor *cursor, bool drawSelections, @@ -235,7 +235,7 @@ public: void setLineSpacingType( KoParagLayout::SpacingType _type ); - /** Use this to change the paragraph tqalignment, not KoTextParag::tqsetAlignment ! */ + /** Use this to change the paragraph tqalignment, not KoTextParag::setAlignment ! */ void setAlign( int align ); /** Return the real tqalignment: Auto is resolved to either Left or Right */ int resolveAlignment() const; @@ -520,7 +520,7 @@ inline KoTextDocument *KoTextParag::document() const return doc; } -inline void KoTextParag::tqsetAlignment( uint a ) +inline void KoTextParag::setAlignment( uint a ) { if ( a == align ) return; diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index 32e82b73..e272422d 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -901,7 +901,7 @@ bool KoTextView::insertParagraph(const TQPoint &pos) { //FIXME me bidi. //change parag tqalignment => right tqalignment - last->tqsetAlignment( TQt::AlignRight ); + last->setAlignment( TQt::AlignRight ); } else { @@ -1500,7 +1500,7 @@ void KoTextView::updateStyleFromSelection( KoParagStyle* style ) void KoTextView::addBookmarks(const TQString &url) { - TQString filename = locateLocal( "data", TQString::tqfromLatin1("konqueror/bookmarks.xml") ); + TQString filename = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml") ); KBookmarkManager *bookManager = KBookmarkManager::managerForFile( filename,false ); KBookmarkGroup group = bookManager->root(); group.addBookmark( bookManager, url, KURL( url)); diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index fa1b03fe..4b744faf 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -1211,7 +1211,7 @@ void KoDateVariable::resize() void KoDateVariable::recalc() { if ( m_subtype == VST_DATE_CURRENT ) - m_varValue = TQDateTime(TQDateTime::tqcurrentDateTime().addDays(m_correctDate)); + m_varValue = TQDateTime(TQDateTime::currentDateTime().addDays(m_correctDate)); else if ( m_subtype == VST_DATE_LAST_PRINTING ) m_varValue = m_varColl->variableSetting()->lastPrintingDate(); else if ( m_subtype == VST_DATE_CREATE_FILE ) @@ -1222,7 +1222,7 @@ void KoDateVariable::recalc() { // Only if never set before (i.e. upon insertion) if ( m_varValue.isNull() ) - m_varValue = TQDateTime(TQDateTime::tqcurrentDateTime().addDays(m_correctDate)); + m_varValue = TQDateTime(TQDateTime::currentDateTime().addDays(m_correctDate)); } resize(); } @@ -2505,7 +2505,7 @@ void KoLinkVariable::drawCustomItem( TQPainter* p, int x, int y, int wpix, int h /******************************************************************/ KoNoteVariable::KoNoteVariable( KoTextDocument *textdoc, const TQString & _note,KoVariableFormat *varFormat,KoVariableCollection *_varColl ) : KoVariable( textdoc, varFormat,_varColl ) - , m_createdNoteDate( TQDate::tqcurrentDate() ) + , m_createdNoteDate( TQDate::currentDate() ) { m_varValue = TQVariant( _note ); } diff --git a/lib/kotext/kodecorationtabbase.ui b/lib/kotext/kodecorationtabbase.ui index cd8f17f2..7c8896b5 100644 --- a/lib/kotext/kodecorationtabbase.ui +++ b/lib/kotext/kodecorationtabbase.ui @@ -18,7 +18,7 @@ </property> <widget class="TQGroupBox"> <property name="name"> - <cstring>tqcolorGroupBox</cstring> + <cstring>colorGroupBox</cstring> </property> <property name="title"> <string>Colors</string> @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -143,7 +143,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/lib/kotext/kohighlightingtabbase.ui b/lib/kotext/kohighlightingtabbase.ui index 27be0702..b2b4ce26 100644 --- a/lib/kotext/kohighlightingtabbase.ui +++ b/lib/kotext/kohighlightingtabbase.ui @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> diff --git a/lib/kotext/kolanguagetabbase.ui b/lib/kotext/kolanguagetabbase.ui index a9073584..0fbd5442 100644 --- a/lib/kotext/kolanguagetabbase.ui +++ b/lib/kotext/kolanguagetabbase.ui @@ -60,7 +60,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>171</height> diff --git a/lib/kotext/kolayouttabbase.ui b/lib/kotext/kolayouttabbase.ui index 471607d4..e7e03d58 100644 --- a/lib/kotext/kolayouttabbase.ui +++ b/lib/kotext/kolayouttabbase.ui @@ -94,7 +94,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -225,7 +225,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/lib/kotext/tests/kobordertest.cpp b/lib/kotext/tests/kobordertest.cpp index 5d5fbe5e..356b0158 100644 --- a/lib/kotext/tests/kobordertest.cpp +++ b/lib/kotext/tests/kobordertest.cpp @@ -11,14 +11,14 @@ class MyWidget : public TQWidget public: MyWidget( KoZoomHandler* _zh, TQWidget* parent ) : TQWidget( parent ), m_zh(_zh) { - tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); } - TQSize tqsizeHint() const { + TQSize sizeHint() const { return TQSize( 150, 150 ); } - TQSize tqminimumSizeHint() const { - return tqsizeHint(); + TQSize minimumSizeHint() const { + return sizeHint(); } KoBorder m_leftBorder; diff --git a/lib/kotext/tests/kotextformattertest.cpp b/lib/kotext/tests/kotextformattertest.cpp index b6138315..a13adddb 100644 --- a/lib/kotext/tests/kotextformattertest.cpp +++ b/lib/kotext/tests/kotextformattertest.cpp @@ -205,8 +205,8 @@ int main (int argc, char ** argv) KApplication app(argc, argv, "KoTextFormatter test"); // Don't let locale settings lead to different hyphenation output - KGlobal::locale()->setLanguage( TQString::tqfromLatin1( "en_US" ) ); - KGlobal::locale()->setCountry( TQString::tqfromLatin1( "C" ) ); + KGlobal::locale()->setLanguage( TQString::fromLatin1( "en_US" ) ); + KGlobal::locale()->setCountry( TQString::fromLatin1( "C" ) ); KoTextFormatterTest test; //test.speedTest(); diff --git a/lib/kotext/timedateformatwidget.ui b/lib/kotext/timedateformatwidget.ui index 830b3bdb..77a261ea 100644 --- a/lib/kotext/timedateformatwidget.ui +++ b/lib/kotext/timedateformatwidget.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -175,7 +175,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>10</height> diff --git a/lib/kross/api/eventsignal.cpp b/lib/kross/api/eventsignal.cpp index e3a8e54f..86e868f5 100644 --- a/lib/kross/api/eventsignal.cpp +++ b/lib/kross/api/eventsignal.cpp @@ -54,7 +54,7 @@ Object::Ptr EventSignal::call(const TQString& /*name*/, KSharedPtr<List> argumen if(n.startsWith("2")) // Remove prefix of SIGNAL-macros n.remove(0,1); - int signalid = m_sender->tqmetaObject()->findSignal(n.latin1(), false); + int signalid = m_sender->metaObject()->findSignal(n.latin1(), false); if(signalid < 0) throw new Exception(TQString("No such signal '%1'.").tqarg(n)); diff --git a/lib/kross/api/eventslot.cpp b/lib/kross/api/eventslot.cpp index fd566d31..56616904 100644 --- a/lib/kross/api/eventslot.cpp +++ b/lib/kross/api/eventslot.cpp @@ -54,7 +54,7 @@ Object::Ptr EventSlot::call(const TQString& /*name*/, List::Ptr arguments) if(n.startsWith("1")) // Remove prefix of SLOT-macros n.remove(0,1); - int slotid = m_receiver->tqmetaObject()->findSlot(n.latin1(), false); + int slotid = m_receiver->metaObject()->findSlot(n.latin1(), false); if(slotid < 0) throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").tqarg(n)) ); @@ -80,7 +80,7 @@ TQCString EventSlot::getSlot(const TQCString& signal) //TQStringList paramlist = TQStringList::split(",", params); TQCString slot = TQString("callback(" + params + ")").latin1(); //normalizeSignalSlot(); - TQMetaObject* mo = tqmetaObject(); + TQMetaObject* mo = metaObject(); int slotid = mo->findSlot(slot, false); if(slotid < 0) { krossdebug( TQString("EventSlot::getSlot(%1) No such slot '%2' avaiable.").tqarg(signal).tqarg(slot) ); diff --git a/lib/kross/api/qtobject.cpp b/lib/kross/api/qtobject.cpp index 243f0503..04736e2a 100644 --- a/lib/kross/api/qtobject.cpp +++ b/lib/kross/api/qtobject.cpp @@ -42,13 +42,13 @@ QtObject::QtObject(TQObject* object, const TQString& name) // Walk through the signals and slots the TQObject has // and attach them as events to this QtObject. - TQStrList slotnames = m_object->tqmetaObject()->slotNames(false); + TQStrList slotnames = m_object->metaObject()->slotNames(false); for(char* c = slotnames.first(); c; c = slotnames.next()) { TQCString s = c; addChild(s, new EventSlot(s, object, s) ); } - TQStrList signalnames = m_object->tqmetaObject()->signalNames(false); + TQStrList signalnames = m_object->metaObject()->signalNames(false); for(char* c = signalnames.first(); c; c = signalnames.next()) { TQCString s = c; addChild(s, new EventSignal(s, object, s) ); @@ -129,13 +129,13 @@ TQUObject* QtObject::toTQUObject(const TQString& signature, List::Ptr arguments) Kross::Api::Object::Ptr QtObject::propertyNames(Kross::Api::List::Ptr) { return new Kross::Api::Variant( - TQStringList::fromStrList(m_object->tqmetaObject()->propertyNames(false))); + TQStringList::fromStrList(m_object->metaObject()->propertyNames(false))); } Kross::Api::Object::Ptr QtObject::hasProperty(Kross::Api::List::Ptr args) { return new Kross::Api::Variant( - m_object->tqmetaObject()->findProperty(Kross::Api::Variant::toString(args->item(0)).latin1(), false)); + m_object->metaObject()->findProperty(Kross::Api::Variant::toString(args->item(0)).latin1(), false)); } Kross::Api::Object::Ptr QtObject::getProperty(Kross::Api::List::Ptr args) @@ -158,13 +158,13 @@ Kross::Api::Object::Ptr QtObject::setProperty(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr QtObject::slotNames(Kross::Api::List::Ptr) { return new Kross::Api::Variant( - TQStringList::fromStrList(m_object->tqmetaObject()->slotNames(false))); + TQStringList::fromStrList(m_object->metaObject()->slotNames(false))); } Kross::Api::Object::Ptr QtObject::hasSlot(Kross::Api::List::Ptr args) { return new Kross::Api::Variant( - bool(m_object->tqmetaObject()->slotNames(false).find( + bool(m_object->metaObject()->slotNames(false).find( Kross::Api::Variant::toString(args->item(0)).latin1() ) != -1)); } @@ -173,7 +173,7 @@ Kross::Api::Object::Ptr QtObject::callSlot(Kross::Api::List::Ptr args) { //TODO just call the child event ?! TQString name = Kross::Api::Variant::toString(args->item(0)); - int slotid = m_object->tqmetaObject()->findSlot(name.latin1(), false); + int slotid = m_object->metaObject()->findSlot(name.latin1(), false); if(slotid < 0) throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").tqarg(name)) ); @@ -187,13 +187,13 @@ Kross::Api::Object::Ptr QtObject::callSlot(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr QtObject::signalNames(Kross::Api::List::Ptr) { return new Kross::Api::Variant( - TQStringList::fromStrList(m_object->tqmetaObject()->signalNames(false))); + TQStringList::fromStrList(m_object->metaObject()->signalNames(false))); } Kross::Api::Object::Ptr QtObject::hasSignal(Kross::Api::List::Ptr args) { return new Kross::Api::Variant( - bool(m_object->tqmetaObject()->signalNames(false).find( + bool(m_object->metaObject()->signalNames(false).find( Kross::Api::Variant::toString(args->item(0)).latin1() ) != -1)); } @@ -201,7 +201,7 @@ Kross::Api::Object::Ptr QtObject::hasSignal(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr QtObject::emitSignal(Kross::Api::List::Ptr args) { TQString name = Kross::Api::Variant::toString(args->item(0)); - int signalid = m_object->tqmetaObject()->findSignal(name.latin1(), false); + int signalid = m_object->metaObject()->findSignal(name.latin1(), false); if(signalid < 0) throw Exception::Ptr( new Exception(TQString("No such signal '%1'.").tqarg(name)) ); m_object->qt_invoke(signalid, 0); //TODO convert Kross::Api::List::Ptr => TQUObject* diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp index b3b29bda..bce26d5c 100644 --- a/lib/kross/main/scriptguiclient.cpp +++ b/lib/kross/main/scriptguiclient.cpp @@ -377,7 +377,7 @@ void ScriptGUIClient::showScriptManager() KDialogBase* dialog = new KDialogBase(d->parent, "", true, i18n("Scripts Manager"), KDialogBase::Close); WdgScriptsManager* wsm = new WdgScriptsManager(this, dialog); dialog->setMainWidget(wsm); - dialog->resize( TQSize(360, 320).expandedTo(dialog->tqminimumSizeHint()) ); + dialog->resize( TQSize(360, 320).expandedTo(dialog->minimumSizeHint()) ); dialog->show(); } diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp index 488b7409..cb696c5a 100644 --- a/lib/kross/main/wdgscriptsmanager.cpp +++ b/lib/kross/main/wdgscriptsmanager.cpp @@ -93,7 +93,7 @@ class ToolTip : public TQToolTip virtual void maybeTip(const TQPoint& p) { ListItem* item = dynamic_cast<ListItem*>( m_parent->itemAt(p) ); if(item) { - TQRect r( m_parent->tqitemRect(item) ); + TQRect r( m_parent->itemRect(item) ); if(r.isValid() && item->action()) { tip(r, TQString("<qt>%1</qt>").tqarg(item->action()->toolTip())); } diff --git a/lib/kross/main/wdgscriptsmanagerbase.ui b/lib/kross/main/wdgscriptsmanagerbase.ui index 379fb2db..d04223a4 100644 --- a/lib/kross/main/wdgscriptsmanagerbase.ui +++ b/lib/kross/main/wdgscriptsmanagerbase.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -66,7 +66,7 @@ <property name="name"> <cstring>btnExec</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -97,7 +97,7 @@ <property name="name"> <cstring>btnLoad</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -114,7 +114,7 @@ <property name="name"> <cstring>btnUnload</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -145,7 +145,7 @@ <property name="name"> <cstring>btnInstall</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -162,7 +162,7 @@ <property name="name"> <cstring>btnUninstall</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -193,7 +193,7 @@ <property name="name"> <cstring>btnNewStuff</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> diff --git a/lib/kwmf/kowmfpaint.cc b/lib/kwmf/kowmfpaint.cc index 97a6e033..43067273 100644 --- a/lib/kwmf/kowmfpaint.cc +++ b/lib/kwmf/kowmfpaint.cc @@ -249,7 +249,7 @@ void KoWmfPaint::drawPolyline( const TQPointArray &pa ) { void KoWmfPaint::drawPolygon( const TQPointArray &pa, bool winding ) { - mPainter.tqdrawPolygon( pa, winding ); + mPainter.drawPolygon( pa, winding ); } @@ -276,7 +276,7 @@ void KoWmfPaint::drawPolyPolygon( TQPtrList<TQPointArray>& listPa, bool winding if ( mPainter.pen().style() != TQt::NoPen ) { mPainter.setBrush( TQt::NoBrush ); for ( pa = listPa.first() ; pa ; pa = listPa.next() ) { - mPainter.tqdrawPolygon( *pa, winding ); + mPainter.drawPolygon( *pa, winding ); } } diff --git a/lib/kwmf/qwmf.cc b/lib/kwmf/qwmf.cc index a7451b46..e9cafee1 100644 --- a/lib/kwmf/qwmf.cc +++ b/lib/kwmf/qwmf.cc @@ -482,7 +482,7 @@ void QWinMetaFile::polygon( long, short* parm ) TQPointArray* pa; pa = pointArray( parm[ 0 ], &parm[ 1 ] ); - mPainter.tqdrawPolygon( *pa, mWinding ); + mPainter.drawPolygon( *pa, mWinding ); } diff --git a/lib/store/KoStoreDrag.h b/lib/store/KoStoreDrag.h index cbd8c40d..e35709e7 100644 --- a/lib/store/KoStoreDrag.h +++ b/lib/store/KoStoreDrag.h @@ -27,7 +27,7 @@ * This allows to drag-n-drop and copy-paste complex koffice objects. * As per usual with dragobjects, an instance of KoStoreDrag must be * created on the "sending" side (dragging or copying). The "receiving" - * side (dropping or pasting) only uses provides()/canDecode() and tqencodedData(). + * side (dropping or pasting) only uses provides()/canDecode() and encodedData(). * * To create the data in memory, create a TQBuffer, * then KoStore::createStore( theBuffer, .... ), save the diff --git a/lib/store/tests/storedroptest.cpp b/lib/store/tests/storedroptest.cpp index 9da8d2d8..a27bfc41 100644 --- a/lib/store/tests/storedroptest.cpp +++ b/lib/store/tests/storedroptest.cpp @@ -88,7 +88,7 @@ bool StoreDropTest::processMimeSource( TQMimeSource* ev ) formats += fmt; bool oasis = TQString( fmt ).startsWith( acceptMimeType ); if ( oasis || TQString( fmt ) == "application/x-kpresenter" ) { - TQByteArray data = ev->tqencodedData( fmt ); + TQByteArray data = ev->encodedData( fmt ); showZipContents( data, fmt, oasis ); return true; } diff --git a/lib/store/tests/xmlwritertest.cpp b/lib/store/tests/xmlwritertest.cpp index 28bd3b08..e4280cec 100644 --- a/lib/store/tests/xmlwritertest.cpp +++ b/lib/store/tests/xmlwritertest.cpp @@ -14,7 +14,7 @@ void speedTest() TQString paragText = TQString::fromUtf8( "This is the text of the paragraph. I'm including a euro sign to test encoding issues: €" ); TQCString styleName = "Heading 1"; - TQFile out( TQString::tqfromLatin1( "out5.xml" ) ); + TQFile out( TQString::fromLatin1( "out5.xml" ) ); if ( out.open(IO_WriteOnly) ) { KoXmlWriter writer( &out ); @@ -78,7 +78,7 @@ int main( int argc, char** argv ) { TEST_BEGIN( 0, 0 ); writer.startElement( "p", false /*no indent*/ ); - writer.addTextSpan( TQString::tqfromLatin1( " \t\n foo " ) ); + writer.addTextSpan( TQString::fromLatin1( " \t\n foo " ) ); writer.endElement(); TEST_END( "textspan test", "<r>\n" " <p><text:s text:c=\"3\"/><text:tab/><text:line-break/> foo<text:s text:c=\"2\"/></p>\n" @@ -97,14 +97,14 @@ int main( int argc, char** argv ) { TEST_BEGIN( 0, 0 ); writer.startElement( "p", false /*no indent*/ ); writer.addProcessingInstruction( "opendocument foobar" ); - writer.addTextSpan( TQString::tqfromLatin1( "foo" ) ); + writer.addTextSpan( TQString::fromLatin1( "foo" ) ); writer.endElement(); TEST_END( "processinginstruction test", "<r>\n" " <p><?opendocument foobar?>foo</p>\n" "</r>\n" ); TEST_BEGIN( 0, 0 ); - writer.addManifestEntry( TQString::tqfromLatin1( "foo/bar/blah" ), TQString::tqfromLatin1( "mime/type" ) ); + writer.addManifestEntry( TQString::fromLatin1( "foo/bar/blah" ), TQString::fromLatin1( "mime/type" ) ); TEST_END( "addManifestEntry", "<r>\n <manifest:file-entry manifest:media-type=\"mime/type\" manifest:full-path=\"foo/bar/blah\"/>\n</r>\n" ); int sz = 15000; // must be more than KoXmlWriter::s_escapeBufferLen @@ -119,7 +119,7 @@ int main( int argc, char** argv ) { TQString longPath; for ( uint i = 0 ; i < 1000 ; ++i ) - longPath += TQString::tqfromLatin1( "M10 10L20 20 " ); + longPath += TQString::fromLatin1( "M10 10L20 20 " ); expected = "<r a=\""; expected += longPath.utf8() + "\"/>\n"; TEST_BEGIN( 0, 0 ); @@ -131,9 +131,9 @@ int main( int argc, char** argv ) { bool val = true; int num = 1; double numdouble = 5.0; - writer.addConfigItem( TQString::tqfromLatin1( "TestConfigBool" ), val ); - writer.addConfigItem( TQString::tqfromLatin1( "TestConfigInt" ), num ); - writer.addConfigItem( TQString::tqfromLatin1( "TestConfigDouble" ), numdouble ); + writer.addConfigItem( TQString::fromLatin1( "TestConfigBool" ), val ); + writer.addConfigItem( TQString::fromLatin1( "TestConfigInt" ), num ); + writer.addConfigItem( TQString::fromLatin1( "TestConfigDouble" ), numdouble ); TEST_END( "test config", "<r>\n" " <config:config-item config:name=\"TestConfigBool\" config:type=\"boolean\">true</config:config-item>\n" " <config:config-item config:name=\"TestConfigInt\" config:type=\"int\">1</config:config-item>\n" diff --git a/lib/store/tests/xmlwritertest.h b/lib/store/tests/xmlwritertest.h index cdafe8a5..12011c03 100644 --- a/lib/store/tests/xmlwritertest.h +++ b/lib/store/tests/xmlwritertest.h @@ -34,8 +34,8 @@ TQCString s2 = expectedFull; \ if ( s1.length() != s2.length() ) \ qDebug( "got length %d, expected %d", s1.length(), s2.length() ); \ - s1.replace( TQRegExp( TQString::tqfromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \ - s2.replace( TQRegExp( TQString::tqfromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \ + s1.replace( TQRegExp( TQString::fromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \ + s2.replace( TQRegExp( TQString::fromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \ qDebug( "%s", s1.data() ); \ qDebug( "Expected:\n%s", s2.data() ); \ return 1; /*exit*/ \ |