diff options
Diffstat (limited to 'knode')
52 files changed, 250 insertions, 250 deletions
diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index 9e74cbb6d..37f07d475 100644 --- a/knode/articlewidget.cpp +++ b/knode/articlewidget.cpp @@ -16,15 +16,15 @@ #include <sys/stat.h> #include <tqbuffer.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqdir.h> #include <tqfile.h> #include <tqimage.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpaintdevicemetrics.h> #include <tqpopupmenu.h> #include <tqstringlist.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqtimer.h> #include <kaction.h> @@ -290,9 +290,9 @@ void ArticleWidget::readConfig() mAttachmentStyle = conf->readEntry( "attachmentStyle", "inline" ); mHeaderStyle = conf->readEntry( "headerStyle", "fancy" ); KRadioAction *ra = 0; - ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_attachments_%1").tqarg(mAttachmentStyle).latin1() ) ); + ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_attachments_%1").arg(mAttachmentStyle).latin1() ) ); ra->setChecked( true ); - ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_headers_%1").tqarg(mHeaderStyle).latin1() ) ); + ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_headers_%1").arg(mHeaderStyle).latin1() ) ); ra->setChecked( true ); delete mCSSHelper; @@ -402,7 +402,7 @@ void ArticleWidget::displayArticle() // check if codec is available if ( text && !canDecodeText( text->contentType()->charset() ) ) { html += TQString("<table width=\"100%\" border=\"0\"><tr><td bgcolor=\"#FF0000\">%1</td></tr></table>") - .tqarg( i18n("Unknown charset. Default charset is used instead.") ); + .arg( i18n("Unknown charset. Default charset is used instead.") ); kdDebug(5003) << k_funcinfo << "unknown charset = " << text->contentType()->charset() << endl; } @@ -560,8 +560,8 @@ void ArticleWidget::displayHeader() if ( header ) { headerHtml += "<tr>"; headerHtml+=TQString( "<td align=\"right\" valign=\"top\"><b>%1</b></td><td width=\"100%\">%2</td></tr>" ) - .tqarg( toHtmlString( header->type(), None ) + ": " ) - .tqarg( toHtmlString( header->asUnicodeString() , ParseURL ) ); + .arg( toHtmlString( header->type(), None ) + ": " ) + .arg( toHtmlString( header->asUnicodeString() , ParseURL ) ); delete header; } } @@ -597,8 +597,8 @@ void ArticleWidget::displayHeader() if ( hb->is("From") ) { headerHtml += TQString( "<a href=\"mailto:%1\">%2</a>") - .tqarg( KPIM::getEmailAddress( hb->asUnicodeString() ) ) - .tqarg( toHtmlString( hb->asUnicodeString(), None ) ); + .arg( KPIM::getEmailAddress( hb->asUnicodeString() ) ) + .arg( toHtmlString( hb->asUnicodeString(), None ) ); KMime::Headers::Base *orgHdr = mArticle->getHeaderByType( "Organization" ); if ( orgHdr && !orgHdr->isEmpty() ) { headerHtml += " ("; @@ -635,8 +635,8 @@ void ArticleWidget::displayHeader() TQString xface = ""; if ( !xfhead.isEmpty() ) { KPIM::KXFace xf; - xface = TQString::tqfromLatin1( "<div class=\"senderpic\"><img src=\"%1\" width=\"48\" height=\"48\"/></div>" ) - .tqarg( imgToDataUrl( xf.toImage( xfhead ), "PNG" ) ); + xface = TQString::fromLatin1( "<div class=\"senderpic\"><img src=\"%1\" width=\"48\" height=\"48\"/></div>" ) + .arg( imgToDataUrl( xf.toImage( xfhead ), "PNG" ) ); } // fancy header style @@ -660,10 +660,10 @@ void ArticleWidget::displayHeader() int refCnt = refs->count(), i = 1; TQCString id = refs->first(); id = id.mid( 1, id.length() - 2 ); // remove <> - html += TQString( "<b>%1</b>" ).tqarg( i18n("References:") ); + html += TQString( "<b>%1</b>" ).arg( i18n("References:") ); while ( i <= refCnt ) { - html += " <a href=\"news:" + TQString::tqfromLatin1( id ) + "\">" + TQString::number( i ) + "</a>"; + html += " <a href=\"news:" + TQString::fromLatin1( id ) + "\">" + TQString::number( i ) + "</a>"; id = refs->next(); id = id.mid( 1, id.length() - 2 ); // remove <> i++; @@ -748,7 +748,7 @@ TQString ArticleWidget::displaySigHeader( Kpgp::Block* block ) TQString message; if ( signer.isEmpty() ) { message = i18n( "Message was signed with unknown key 0x%1." ) - .tqarg( TQString(signerKey) ); + .arg( TQString(signerKey) ); message += "<br/>"; message += i18n( "The validity of the signature cannot be verified." ); signClass = "signWarn"; @@ -769,10 +769,10 @@ TQString ArticleWidget::displaySigHeader( Kpgp::Block* block ) if( !signerKey.isEmpty() ) message += i18n( "Message was signed by %1 (Key ID: 0x%2)." ) - .tqarg( signer ) - .tqarg( TQString(signerKey) ); + .arg( signer ) + .arg( TQString(signerKey) ); else - message += i18n( "Message was signed by %1." ).tqarg( signer ); + message += i18n( "Message was signed by %1." ).arg( signer ); message += "<br/>"; if( block->goodSignature() ) { @@ -915,8 +915,8 @@ TQString ArticleWidget::imgToDataUrl( const TQImage &image, const char* fmt ) TQBuffer buffer( ba ); buffer.open( IO_WriteOnly ); image.save( &buffer, fmt ); - return TQString::tqfromLatin1("data:image/%1;base64,%2") - .tqarg( fmt, TQString(KCodecs::base64Encode( ba )) ); + return TQString::fromLatin1("data:image/%1;base64,%2") + .arg( fmt, TQString(KCodecs::base64Encode( ba )) ); } @@ -1030,7 +1030,7 @@ void ArticleWidget::processJob( KNJobData * job ) if ( !job->canceled() ) { if ( !job->success() ) KMessageBox::error( this, i18n("An error occurred while downloading the article source:\n") - .tqarg( job->errorString() ) ); + .arg( job->errorString() ) ); else new KNSourceViewWindow( a->head() + "\n" + a->body() ); } @@ -1408,15 +1408,15 @@ void ArticleWidget::slotCopyURL() address = mCurrentURL.path(); else address = mCurrentURL.url(); - TQApplication::tqclipboard()->setText( address, TQClipboard::Clipboard ); - TQApplication::tqclipboard()->setText( address, TQClipboard::Selection ); + TQApplication::clipboard()->setText( address, TQClipboard::Clipboard ); + TQApplication::clipboard()->setText( address, TQClipboard::Selection ); } void ArticleWidget::slotAddBookmark() { if ( mCurrentURL.isEmpty() ) return; - 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, mCurrentURL.url(), mCurrentURL ); diff --git a/knode/headerview.cpp b/knode/headerview.cpp index 78b46a4cf..324e9d3e5 100644 --- a/knode/headerview.cpp +++ b/knode/headerview.cpp @@ -14,7 +14,7 @@ #include <tqcursor.h> #include <tqheader.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <tqtimer.h> #include <klocale.h> @@ -64,7 +64,7 @@ KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) : setColumnAlignment( mPaintInfo.sizeCol, TQt::AlignRight ); setColumnAlignment( mPaintInfo.scoreCol, TQt::AlignRight ); - // due to our own column text squeezing we need to tqrepaint on column resizing + // due to our own column text squeezing we need to repaint on column resizing disconnect( header(), TQT_SIGNAL(sizeChange(int, int, int)) ); connect( header(), TQT_SIGNAL(sizeChange(int, int, int)), TQT_SLOT(slotSizeChanged(int, int, int)) ); @@ -534,7 +534,7 @@ TQDragObject* KNHeaderView::dragObject() void KNHeaderView::slotSizeChanged( int section, int, int newSize ) { - viewport()->tqrepaint( header()->sectionPos(section), 0, newSize, visibleHeight(), false); + viewport()->repaint( header()->sectionPos(section), 0, newSize, visibleHeight(), false); } @@ -601,14 +601,14 @@ void KNHeaderViewToolTip::maybeTip( const TQPoint &p ) if ( !item->showToolTip( column ) ) return; - const TQRect tqitemRect = listView->tqitemRect( item ); - if ( !tqitemRect.isValid() ) + const TQRect itemRect = listView->itemRect( item ); + if ( !itemRect.isValid() ) return; const TQRect headerRect = listView->header()->sectionRect( column ); if ( !headerRect.isValid() ) return; - tip( TQRect( headerRect.left(), tqitemRect.top(), headerRect.width(), tqitemRect.height() ), + tip( TQRect( headerRect.left(), itemRect.top(), headerRect.width(), itemRect.height() ), TQStyleSheet::escape( item->text( column ) ) ); } diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp index 627ff4cdd..2dc8c931a 100644 --- a/knode/knaccountmanager.cpp +++ b/knode/knaccountmanager.cpp @@ -127,12 +127,12 @@ bool KNAccountManager::newAccount(KNNntpAccount *a) TQStringList entries(d.entryList("nntp.*", TQDir::Dirs)); int id = 1; - while (entries.findIndex(TQString("nntp.%1").tqarg(id))!=-1) + while (entries.findIndex(TQString("nntp.%1").arg(id))!=-1) ++id; a->setId(id); - dir = locateLocal("data",TQString("knode/nntp.%1/").tqarg(a->id())); + dir = locateLocal("data",TQString("knode/nntp.%1/").arg(a->id())); if (!dir.isNull()) { mAccounts.append(a); emit(accountAdded(a)); @@ -177,7 +177,7 @@ bool KNAccountManager::removeAccount(KNNntpAccount *a) } } dir.cdUp(); // directory should now be empty, deleting it - dir.rmdir(TQString("nntp.%1/").tqarg(a->id())); + dir.rmdir(TQString("nntp.%1/").arg(a->id())); } if(c_urrentAccount==a) setCurrentAccount(0); @@ -223,7 +223,7 @@ void KNAccountManager::loadPasswordsAsync() if ( !mWallet && !mWalletOpenFailed ) { if ( knGlobals.top ) mWallet = Wallet::openWallet( Wallet::NetworkWallet(), - knGlobals.topWidget->tqtopLevelWidget()->winId(), + knGlobals.topWidget->topLevelWidget()->winId(), Wallet::Asynchronous ); else mWallet = Wallet::openWallet( Wallet::NetworkWallet(), 0, Wallet::Asynchronous ); @@ -263,7 +263,7 @@ KWallet::Wallet* KNAccountManager::wallet() delete mWallet; if ( knGlobals.top ) mWallet = Wallet::openWallet( Wallet::NetworkWallet(), - knGlobals.topWidget->tqtopLevelWidget()->winId() ); + knGlobals.topWidget->topLevelWidget()->winId() ); else mWallet = Wallet::openWallet( Wallet::NetworkWallet() ); diff --git a/knode/knarticle.cpp b/knode/knarticle.cpp index e253d2ef8..fe475b1b3 100644 --- a/knode/knarticle.cpp +++ b/knode/knarticle.cpp @@ -209,7 +209,7 @@ void KNRemoteArticle::updateListItem() i_tem->setExpandable( (threadMode() && hasVisibleFollowUps()) ); - i_tem->tqrepaint(); //force tqrepaint + i_tem->repaint(); //force repaint } diff --git a/knode/knarticle.h b/knode/knarticle.h index 798742e17..b4e039ffd 100644 --- a/knode/knarticle.h +++ b/knode/knarticle.h @@ -16,7 +16,7 @@ #define KNARTICLE_H #include <tqstringlist.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <tqfont.h> #include <tqcolor.h> diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp index d82bb5c74..2b686cf2a 100644 --- a/knode/knarticlefactory.cpp +++ b/knode/knarticlefactory.cpp @@ -12,7 +12,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqvbox.h> @@ -209,9 +209,9 @@ void KNArticleFactory::createReply(KNRemoteArticle *a, TQString selectedText, bo TQString attribution=knGlobals.configManager()->postNewsComposer()->intro(); TQString name(a->from()->name()); if (name.isEmpty()) - name = TQString::tqfromLatin1(a->from()->email()); + name = TQString::fromLatin1(a->from()->email()); attribution.replace(TQRegExp("%NAME"),name); - attribution.replace(TQRegExp("%EMAIL"),TQString::tqfromLatin1(a->from()->email())); + attribution.replace(TQRegExp("%EMAIL"),TQString::fromLatin1(a->from()->email())); attribution.replace(TQRegExp("%DATE"),KGlobal::locale()->formatDateTime(a->date()->qdt(),false)); attribution.replace(TQRegExp("%MSID"),a->messageID()->asUnicodeString()); attribution.replace(TQRegExp("%GROUP"),g->groupname()); @@ -306,7 +306,7 @@ void KNArticleFactory::createForward(KNArticle *a) //--------------------------- <Body> ----------------------------- - TQString fwd = TQString("\n--------------- %1\n\n").tqarg(i18n("Forwarded message (begin)")); + TQString fwd = TQString("\n--------------- %1\n\n").arg(i18n("Forwarded message (begin)")); fwd+=( i18n("Subject") + ": " + a->subject()->asUnicodeString() + "\n" ); fwd+=( i18n("From") + ": " + a->from()->asUnicodeString() + "\n" ); @@ -321,7 +321,7 @@ void KNArticleFactory::createForward(KNArticle *a) fwd += (*it) + "\n"; } - fwd += TQString("\n--------------- %1\n").tqarg(i18n("Forwarded message (end)")); + fwd += TQString("\n--------------- %1\n").arg(i18n("Forwarded message (end)")); //--------------------------- </Body> ---------------------------- @@ -419,7 +419,7 @@ void KNArticleFactory::createCancel(KNArticle *a) art->lines()->setNumberOfLines(1); //body - art->fromUnicodeString(TQString::tqfromLatin1("cancel by original author\n")); + art->fromUnicodeString(TQString::fromLatin1("cancel by original author\n")); //assemble art->assemble(); @@ -601,7 +601,7 @@ void KNArticleFactory::edit(KNLocalArticle *a) KMessageBox::information(knGlobals.topWidget, i18n("<qt>The signature generator program produced the " "following output:<br><br>%1</qt>") - .tqarg(id->getSigGeneratorStdErr())); + .arg(id->getSigGeneratorStdErr())); mCompList.append( com ); connect(com, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); @@ -875,9 +875,9 @@ KNLocalArticle* KNArticleFactory::newArticle(KNCollection *col, TQString &sig, T if(origPost) { TQString name(origPost->from()->name()); if (name.isEmpty()) - name = TQString::tqfromLatin1(origPost->from()->email()); + name = TQString::fromLatin1(origPost->from()->email()); value.replace(TQRegExp("%NAME"), name); - value.replace(TQRegExp("%EMAIL"), TQString::tqfromLatin1(origPost->from()->email())); + value.replace(TQRegExp("%EMAIL"), TQString::fromLatin1(origPost->from()->email())); } else if(value.find("%NAME") != -1 || value.find("%EMAIL") != -1) @@ -895,7 +895,7 @@ KNLocalArticle* KNArticleFactory::newArticle(KNCollection *col, TQString &sig, T KMessageBox::information(knGlobals.topWidget, i18n("<qt>The signature generator program produced the " "following output:<br><br>%1</qt>") - .tqarg(id->getSigGeneratorStdErr())); + .arg(id->getSigGeneratorStdErr())); } else sig=TQString(); @@ -1070,8 +1070,8 @@ KNSendErrorDialog::KNSendErrorDialog() TQVBox *page = makeVBoxMainWidget(); - new TQLabel(TQString("<b>%1</b><br>%2").tqarg(i18n("Errors occurred while sending these articles:")) - .tqarg(i18n("The unsent articles are stored in the \"Outbox\" folder.")), page); + new TQLabel(TQString("<b>%1</b><br>%2").arg(i18n("Errors occurred while sending these articles:")) + .arg(i18n("The unsent articles are stored in the \"Outbox\" folder.")), page); j_obs=new KNDialogListBox(true, page); e_rror=new TQLabel(TQString(), page); diff --git a/knode/knarticlefilter.cpp b/knode/knarticlefilter.cpp index 359985198..65acb7c0b 100644 --- a/knode/knarticlefilter.cpp +++ b/knode/knarticlefilter.cpp @@ -74,7 +74,7 @@ KNArticleFilter::~KNArticleFilter() bool KNArticleFilter::loadInfo() { if (i_d!=-1) { - TQString fname(locate("data",TQString( "knode/filters/%1.fltr" ).tqarg(i_d) ) ); + TQString fname(locate("data",TQString( "knode/filters/%1.fltr" ).arg(i_d) ) ); if (fname.isNull()) return false; @@ -94,7 +94,7 @@ bool KNArticleFilter::loadInfo() void KNArticleFilter::load() { - TQString fname(locate("data",TQString( "knode/filters/%1.fltr").tqarg(i_d) ) ); + TQString fname(locate("data",TQString( "knode/filters/%1.fltr").arg(i_d) ) ); if (fname.isNull()) return; @@ -141,7 +141,7 @@ void KNArticleFilter::save() KNHelper::displayInternalFileError(); return; } - KSimpleConfig conf(dir+TQString("%1.fltr").tqarg(i_d)); + KSimpleConfig conf(dir+TQString("%1.fltr").arg(i_d)); conf.setGroup("GENERAL"); conf.writeEntry("name", TQString(n_ame)); @@ -324,7 +324,7 @@ void KNArticleFilter::setTranslatedName(const TQString &s) bool retranslated = false; for (const char **c=defFil;(*c)!=0;c++) // ok, try if it matches any of the standard filter names if (s==i18n("default filter name",*c)) { - n_ame = TQString::tqfromLatin1(*c); + n_ame = TQString::fromLatin1(*c); retranslated = true; break; } diff --git a/knode/knarticlemanager.cpp b/knode/knarticlemanager.cpp index 7673eabfd..088e98818 100644 --- a/knode/knarticlemanager.cpp +++ b/knode/knarticlemanager.cpp @@ -992,10 +992,10 @@ void KNArticleManager::updateStatusString() name += i18n(" (moderated)"); knGlobals.seStatusMsg(i18n(" %1: %2 new , %3 displayed") - .tqarg(name).tqarg(g_roup->newCount()).tqarg(displCnt),SB_GROUP); + .arg(name).arg(g_roup->newCount()).arg(displCnt),SB_GROUP); if(f_ilter) - knGlobals.seStatusMsg(i18n(" Filter: %1").tqarg(f_ilter->translatedName()), SB_FILTER); + knGlobals.seStatusMsg(i18n(" Filter: %1").arg(f_ilter->translatedName()), SB_FILTER); else knGlobals.seStatusMsg(TQString(), SB_FILTER); } @@ -1005,7 +1005,7 @@ void KNArticleManager::updateStatusString() else displCnt=f_older->count(); knGlobals.seStatusMsg(i18n(" %1: %2 displayed") - .tqarg(f_older->name()).tqarg(displCnt), SB_GROUP); + .arg(f_older->name()).arg(displCnt), SB_GROUP); knGlobals.seStatusMsg(TQString(), SB_FILTER); } else { knGlobals.seStatusMsg(TQString(), SB_GROUP); diff --git a/knode/kncleanup.cpp b/knode/kncleanup.cpp index 28993e7ce..70ab15f4c 100644 --- a/knode/kncleanup.cpp +++ b/knode/kncleanup.cpp @@ -16,7 +16,7 @@ #include <tqdir.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqprogressbar.h> #include <klocale.h> @@ -56,13 +56,13 @@ void KNCleanUp::start() for ( TQValueList<KNArticleCollection*>::Iterator it = mColList.begin(); it != mColList.end(); ++it ) { if ( (*it)->type() == KNCollection::CTgroup ) { - d_lg->showMessage( i18n("Deleting expired articles in <b>%1</b>").tqarg( (*it)->name() ) ); + d_lg->showMessage( i18n("Deleting expired articles in <b>%1</b>").arg( (*it)->name() ) ); kapp->processEvents(); expireGroup( static_cast<KNGroup*>( (*it) ) ); d_lg->doProgress(); } else if ( (*it)->type() == KNCollection::CTfolder ) { - d_lg->showMessage( i18n("Compacting folder <b>%1</b>").tqarg( (*it)->name() ) ); + d_lg->showMessage( i18n("Compacting folder <b>%1</b>").arg( (*it)->name() ) ); kapp->processEvents(); compactFolder( static_cast<KNFolder*>( (*it) ) ); d_lg->doProgress(); @@ -187,7 +187,7 @@ void KNCleanUp::expireGroup( KNGroup *g, bool showResult ) if(showResult) KMessageBox::information(knGlobals.topWidget, - i18n("<b>%1</b><br>expired: %2<br>left: %3").tqarg(g->groupname()).tqarg(delCnt).tqarg(leftCnt)); + i18n("<b>%1</b><br>expired: %2<br>left: %3").arg(g->groupname()).arg(delCnt).arg(leftCnt)); } diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp index 7b73cc7ba..e1fb20697 100644 --- a/knode/kncollectionview.cpp +++ b/knode/kncollectionview.cpp @@ -93,7 +93,7 @@ void KNCollectionView::readConfig() KConfig *conf = knGlobals.config(); conf->setGroup( "GroupView" ); - // execute the listview tqlayout stuff only once + // execute the listview layout stuff only once static bool initDone = false; if (!initDone) { initDone = true; diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index de354ef76..ac14f0607 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -13,8 +13,8 @@ */ #include <tqheader.h> -#include <tqtextcodec.h> -#include <tqclipboard.h> +#include <textcodec.h> +#include <clipboard.h> #include <tqapplication.h> #include <kspelldlg.h> #include <tdeversion.h> @@ -432,7 +432,7 @@ int KNComposer::listOfResultOfCheckWord( const TQStringList & lst , const TQStri void KNComposer::slotUndo() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; if (fw->inherits("KEdit")) @@ -443,7 +443,7 @@ void KNComposer::slotUndo() void KNComposer::slotRedo() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; if (fw->inherits("KEdit")) @@ -454,7 +454,7 @@ void KNComposer::slotRedo() void KNComposer::slotCut() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; if (fw->inherits("KEdit")) @@ -466,7 +466,7 @@ void KNComposer::slotCut() void KNComposer::slotCopy() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; if (fw->inherits("KEdit")) @@ -480,7 +480,7 @@ void KNComposer::slotCopy() void KNComposer::slotPaste() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; if (fw->inherits("KEdit")) @@ -492,7 +492,7 @@ void KNComposer::slotPaste() void KNComposer::slotSelectAll() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) @@ -969,7 +969,7 @@ void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitl ts.setCodec(codec); if (box) - temp = TQString::tqfromLatin1(",----[ %1 ]\n").tqarg(boxTitle); + temp = TQString::fromLatin1(",----[ %1 ]\n").arg(boxTitle); if (box && (v_iew->e_dit->wordWrap()!=TQMultiLineEdit::NoWrap)) { int wrapAt = v_iew->e_dit->wrapColumnOrWidth(); @@ -993,7 +993,7 @@ void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitl } if (box) - temp += TQString::tqfromLatin1("`----"); + temp += TQString::fromLatin1("`----"); if(clear) v_iew->e_dit->setText(temp); @@ -1374,18 +1374,18 @@ void KNComposer::slotUpdateStatusBar() else overwriteDesc = i18n(" INS "); - statusBar()->changeItem(i18n(" Type: %1 ").tqarg(typeDesc), 1); - statusBar()->changeItem(i18n(" Charset: %1 ").tqarg(TQString(c_harset)), 2); + statusBar()->changeItem(i18n(" Type: %1 ").arg(typeDesc), 1); + statusBar()->changeItem(i18n(" Charset: %1 ").arg(TQString(c_harset)), 2); statusBar()->changeItem(overwriteDesc, 3); - statusBar()->changeItem(i18n(" Column: %1 ").tqarg(v_iew->e_dit->currentColumn() + 1), 4); - statusBar()->changeItem(i18n(" Line: %1 ").tqarg(v_iew->e_dit->currentLine() + 1), 5); + statusBar()->changeItem(i18n(" Column: %1 ").arg(v_iew->e_dit->currentColumn() + 1), 4); + statusBar()->changeItem(i18n(" Line: %1 ").arg(v_iew->e_dit->currentLine() + 1), 5); } void KNComposer::slotUpdateCursorPos() { - statusBar()->changeItem(i18n(" Column: %1 ").tqarg(v_iew->e_dit->currentColumn() + 1), 4); - statusBar()->changeItem(i18n(" Line: %1 ").tqarg(v_iew->e_dit->currentLine() + 1), 5); + statusBar()->changeItem(i18n(" Column: %1 ").arg(v_iew->e_dit->currentColumn() + 1), 4); + statusBar()->changeItem(i18n(" Line: %1 ").arg(v_iew->e_dit->currentLine() + 1), 5); } @@ -1447,7 +1447,7 @@ void KNComposer::slotGroupsChanged(const TQString &t) split.init(t.latin1(), ","); splitOk=split.first(); while(splitOk) { - v_iew->f_up2->insertItem(TQString::tqfromLatin1(split.string())); + v_iew->f_up2->insertItem(TQString::fromLatin1(split.string())); splitOk=split.next(); } v_iew->f_up2->insertItem(""); @@ -1781,10 +1781,10 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) KConfig *config = knGlobals.config(); KConfigGroupSaver saver(config, "VISUAL_APPEARANCE"); - TQColor defaultColor1( kapp->tqpalette().active().text()); // defaults from kmreaderwin.cpp - TQColor defaultColor2( kapp->tqpalette().active().text() ); - TQColor defaultColor3( kapp->tqpalette().active().text() ); - TQColor defaultForeground( kapp->tqpalette().active().text() ); + TQColor defaultColor1( kapp->palette().active().text()); // defaults from kmreaderwin.cpp + TQColor defaultColor2( kapp->palette().active().text() ); + TQColor defaultColor3( kapp->palette().active().text() ); + TQColor defaultForeground( kapp->palette().active().text() ); TQColor col1 = config->readColorEntry( "ForegroundColor", &defaultForeground ); TQColor col2 = config->readColorEntry( "quote3Color", &defaultColor3 ); TQColor col3 = config->readColorEntry( "quote2Color", &defaultColor2 ); @@ -1998,7 +1998,7 @@ KNComposer::Editor::Editor(KNComposer::ComposerView *_composerView, KNComposer * spell = 0L; installEventFilter(this); KCursor::setAutoHideCursor( this, true, true ); - m_bound = TQRegExp( TQString::tqfromLatin1("[\\s\\W]") ); + m_bound = TQRegExp( TQString::fromLatin1("[\\s\\W]") ); } @@ -2152,7 +2152,7 @@ TQStringList KNComposer::Editor::processedText() void KNComposer::Editor::slotPasteAsQuotation() { - TQString s = TQApplication::tqclipboard()->text(); + TQString s = TQApplication::clipboard()->text(); if (!s.isEmpty()) { for (int i=0; (uint)i<s.length(); i++) { if ( s[i] < ' ' && s[i] != '\n' && s[i] != '\t' ) @@ -2233,7 +2233,7 @@ void KNComposer::Editor::slotAddBox() } else { int l = currentLine(); int c = currentColumn(); - TQString s = TQString::tqfromLatin1(",----[ ]\n| %1\n`----").tqarg(textLine(l)); + TQString s = TQString::fromLatin1(",----[ ]\n| %1\n`----").arg(textLine(l)); insertLine(s,l); removeLine(l+3); setCursorPosition(l+1,c+2); @@ -2244,7 +2244,7 @@ void KNComposer::Editor::slotAddBox() void KNComposer::Editor::slotRemoveBox() { if (hasMarkedText()) { - TQString s = TQString::tqfromLatin1("\n") + markedText() + TQString::tqfromLatin1("\n"); + TQString s = TQString::fromLatin1("\n") + markedText() + TQString::fromLatin1("\n"); s.replace(TQRegExp("\n,----[^\n]*\n"),"\n"); s.replace(TQRegExp("\n| "),"\n"); s.replace(TQRegExp("\n`----[^\n]*\n"),"\n"); @@ -2297,7 +2297,7 @@ void KNComposer::Editor::slotRemoveBox() setCursorPosition(l,c-2); setAutoUpdate(true); - tqrepaint(false); + repaint(false); } } @@ -2560,7 +2560,7 @@ KNComposer::AttachmentPropertiesDlg::AttachmentPropertiesDlg(KNAttachment *a, TQ fileL->addRowSpacing(0, fontMetrics().lineSpacing()-9); fileL->addWidget(new TQLabel(i18n("Name:"), fileGB) ,1,0); - fileL->addWidget(new TQLabel(TQString("<b>%1</b>").tqarg(a->name()), fileGB), 1,1, TQt::AlignLeft); + fileL->addWidget(new TQLabel(TQString("<b>%1</b>").arg(a->name()), fileGB), 1,1, TQt::AlignLeft); fileL->addWidget(new TQLabel(i18n("Size:"), fileGB), 2,0); fileL->addWidget(new TQLabel(a->contentSize(), fileGB), 2,1, TQt::AlignLeft); @@ -2604,7 +2604,7 @@ KNComposer::AttachmentPropertiesDlg::AttachmentPropertiesDlg(KNAttachment *a, TQ this, TQT_SLOT(slotMimeTypeTextChanged(const TQString&))); //finish GUI - setFixedHeight(tqsizeHint().height()); + setFixedHeight(sizeHint().height()); KNHelper::restoreWindowSize("attProperties", this, TQSize(300,250)); setHelp("anc-knode-editor-advanced"); } diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp index 98caed2bb..4e2d7f330 100644 --- a/knode/knconfig.cpp +++ b/knode/knconfig.cpp @@ -16,7 +16,7 @@ #include <stdlib.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <ksimpleconfig.h> #include <kmessagebox.h> @@ -452,7 +452,7 @@ TQColor KNConfig::Appearance::defaultColor(int i) const switch(i) { case background: - return kapp->tqpalette().active().base(); + return kapp->palette().active().base(); case alternateBackground: return KGlobalSettings::alternateBackgroundColor(); @@ -466,13 +466,13 @@ TQColor KNConfig::Appearance::defaultColor(int i) const case normalText: case unreadThread: - return kapp->tqpalette().active().text(); + return kapp->palette().active().text(); case url: return KGlobalSettings::linkColor(); case readThread: - return kapp->tqpalette().disabled().text(); + return kapp->palette().disabled().text(); case unreadArticle: return TQColor( 183, 154, 11 ); @@ -492,7 +492,7 @@ TQColor KNConfig::Appearance::defaultColor(int i) const return TQColor( 0xFF, 0x40, 0x40 ); } - return kapp->tqpalette().disabled().text(); + return kapp->palette().disabled().text(); } @@ -942,11 +942,11 @@ void KNConfig::PostNewsTechnical::save() conf->setGroup("POSTNEWS"); conf->writeEntry("ComposerCharsets", c_omposerCharsets); - conf->writeEntry("Charset", TQString::tqfromLatin1(c_harset)); + conf->writeEntry("Charset", TQString::fromLatin1(c_harset)); conf->writeEntry("8BitEncoding", a_llow8BitBody); conf->writeEntry("UseOwnCharset", u_seOwnCharset); conf->writeEntry("generateMId", g_enerateMID); - conf->writeEntry("MIdhost", TQString::tqfromLatin1(h_ostname)); + conf->writeEntry("MIdhost", TQString::fromLatin1(h_ostname)); conf->writeEntry("dontIncludeUA", d_ontIncludeUA); conf->writeEntry("useExternalMailer", u_seExternalMailer); @@ -1100,7 +1100,7 @@ KNConfig::Cleanup::Cleanup( bool global ) : // default values for new accounts / groups d_oExpire( true ), r_emoveUnavailable( true ), p_reserveThr( true ), e_xpireInterval( 5 ), r_eadMaxAge( 10 ), u_nreadMaxAge( 15 ), - mGlobal(global), mDefault(!global), mLastExpDate( TQDate::tqcurrentDate() ) + mGlobal(global), mDefault(!global), mLastExpDate( TQDate::currentDate() ) { if (mGlobal) { KConfig *conf = knGlobals.config(); @@ -1174,7 +1174,7 @@ bool KNConfig::Cleanup::expireToday() if (!d_oExpire) return false; - TQDate today = TQDate::tqcurrentDate(); + TQDate today = TQDate::currentDate(); if (mLastExpDate == TQDateTime(today)) return false; @@ -1184,7 +1184,7 @@ bool KNConfig::Cleanup::expireToday() void KNConfig::Cleanup::setLastExpireDate() { - mLastExpDate = TQDateTime::tqcurrentDateTime(); + mLastExpDate = TQDateTime::currentDateTime(); } @@ -1193,7 +1193,7 @@ bool KNConfig::Cleanup::compactToday() if (!d_oCompact) return false; - TQDate today = TQDate::tqcurrentDate(); + TQDate today = TQDate::currentDate(); if (mLastCompDate == TQDateTime(today)) return false; @@ -1203,7 +1203,7 @@ bool KNConfig::Cleanup::compactToday() void KNConfig::Cleanup::setLastCompactDate() { - mLastCompDate = TQDateTime::tqcurrentDateTime(); + mLastCompDate = TQDateTime::currentDateTime(); } diff --git a/knode/knconfig.h b/knode/knconfig.h index f2fd7d114..0f0f868cc 100644 --- a/knode/knconfig.h +++ b/knode/knconfig.h @@ -391,7 +391,7 @@ class KDE_EXPORT XHeader { TQCString name() { return n_ame; } TQString value() { return v_alue; } - TQString header() { return (TQString::tqfromLatin1(("X-"+n_ame+": "))+v_alue); } + TQString header() { return (TQString::fromLatin1(("X-"+n_ame+": "))+v_alue); } protected: TQCString n_ame; diff --git a/knode/knconfigpages.cpp b/knode/knconfigpages.cpp index c44b96954..547bf27a9 100644 --- a/knode/knconfigpages.cpp +++ b/knode/knconfigpages.cpp @@ -11,7 +11,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <tqlayout.h> +#include <layout.h> #include <kcmodule.h> #include <kdebug.h> diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp index 0860ee05e..b34d76381 100644 --- a/knode/knconfigwidgets.cpp +++ b/knode/knconfigwidgets.cpp @@ -395,8 +395,8 @@ void KNConfig::NntpAccountListWidget::slotSelectionChanged() LBoxItem *it = static_cast<LBoxItem*>(l_box->item(curr)); if(it) { - s_erverInfo->setText(i18n("Server: %1").tqarg(it->account->server())); - p_ortInfo->setText(i18n("Port: %1").tqarg(it->account->port())); + s_erverInfo->setText(i18n("Server: %1").arg(it->account->server())); + p_ortInfo->setText(i18n("Port: %1").arg(it->account->port())); } else { s_erverInfo->setText(i18n("Server: ")); @@ -461,7 +461,7 @@ void KNConfig::NntpAccountListWidget::slotSubBtnClicked() KNConfig::NntpAccountConfDialog::NntpAccountConfDialog(KNNntpAccount *a, TQWidget *p, const char *n) - : KDialogBase(Tabbed, (a->id()!=-1)? i18n("Properties of %1").tqarg(a->name()):i18n("New Account"), + : KDialogBase(Tabbed, (a->id()!=-1)? i18n("Properties of %1").arg(a->name()):i18n("New Account"), Ok|Cancel|Help, Ok, p, n), a_ccount(a) { @@ -561,7 +561,7 @@ KNConfig::NntpAccountConfDialog::NntpAccountConfDialog(KNNntpAccount *a, TQWidge connect( knGlobals.accountManager(), TQT_SIGNAL(passwordsChanged()), TQT_SLOT(slotPasswordChanged()) ); - KNHelper::restoreWindowSize("accNewsPropDLG", this, tqsizeHint()); + KNHelper::restoreWindowSize("accNewsPropDLG", this, sizeHint()); setHelp("anc-setting-the-news-account"); } @@ -773,7 +773,7 @@ int KNConfig::AppearanceWidget::ColorListItem::width(const TQListBox *lb ) const KNConfig::AppearanceWidget::FontListItem::FontListItem( const TQString &name, const TQFont &font ) : TQListBoxText(name), f_ont(font) { - fontInfo = TQString("[%1 %2]").tqarg(f_ont.family()).tqarg(f_ont.pointSize()); + fontInfo = TQString("[%1 %2]").arg(f_ont.family()).arg(f_ont.pointSize()); } @@ -785,7 +785,7 @@ KNConfig::AppearanceWidget::FontListItem::~FontListItem() void KNConfig::AppearanceWidget::FontListItem::setFont(const TQFont &font) { f_ont = font; - fontInfo = TQString("[%1 %2]").tqarg(f_ont.family()).tqarg(f_ont.pointSize()); + fontInfo = TQString("[%1 %2]").arg(f_ont.family()).arg(f_ont.pointSize()); } @@ -896,7 +896,7 @@ void KNConfig::AppearanceWidget::defaults() colorItem->setColor(d_ata->defaultColor(i)); } c_List->triggerUpdate(true); - c_List->tqrepaint(true); + c_List->repaint(true); // default fonts FontListItem *fontItem; @@ -1548,8 +1548,8 @@ KNConfig::DisplayedHeaderConfDialog::DisplayedHeaderConfDialog(KNDisplayedHeader v_alueCB[i]->setChecked(h->flag(i+4)); } - setFixedHeight(tqsizeHint().height()); - KNHelper::restoreWindowSize("accReadHdrPropDLG", this, tqsizeHint()); + setFixedHeight(sizeHint().height()); + KNHelper::restoreWindowSize("accReadHdrPropDLG", this, sizeHint()); connect(n_ameE, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotNameChanged(const TQString&))); @@ -2138,8 +2138,8 @@ KNConfig::XHeaderConfDialog::XHeaderConfDialog(const TQString &h, TQWidget *p, c v_alue->setText(h.mid(pos, h.length()-pos)); } - setFixedHeight(tqsizeHint().height()); - KNHelper::restoreWindowSize("XHeaderDlg", this, tqsizeHint()); + setFixedHeight(sizeHint().height()); + KNHelper::restoreWindowSize("XHeaderDlg", this, sizeHint()); n_ame->setFocus(); } @@ -2158,7 +2158,7 @@ TQString KNConfig::XHeaderConfDialog::result() TQString value = v_alue->text(); // just in case someone pastes a newline value.replace( '\n', ' ' ); - return TQString( "X-%1: %2" ).tqarg( n_ame->text() ).tqarg( value ); + return TQString( "X-%1: %2" ).arg( n_ame->text() ).arg( value ); } @@ -2373,10 +2373,10 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *paren mExpGroup = new TQGroupBox( i18n("Newsgroup Cleanup Settings"), this ); mExpGroup->setColumnLayout(0, Qt::Vertical ); - mExpGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); - mExpGroup->tqlayout()->setMargin( KDialog::marginHint() ); + mExpGroup->layout()->setSpacing( KDialog::spacingHint() ); + mExpGroup->layout()->setMargin( KDialog::marginHint() ); top->addWidget( mExpGroup ); - TQGridLayout *grid = new TQGridLayout( mExpGroup->tqlayout(), 7, 2 ); + TQGridLayout *grid = new TQGridLayout( mExpGroup->layout(), 7, 2 ); grid->setRowSpacing( 0, KDialog::spacingHint() ); @@ -2482,11 +2482,11 @@ KNConfig::CleanupWidget::CleanupWidget( TQWidget *p, const char *n ) : TQGroupBox *foldersB=new TQGroupBox(i18n("Folders"), this); foldersB->setColumnLayout(0, Qt::Vertical ); - foldersB->tqlayout()->setSpacing( KDialog::spacingHint() ); - foldersB->tqlayout()->setMargin( KDialog::marginHint() ); + foldersB->layout()->setSpacing( KDialog::spacingHint() ); + foldersB->layout()->setMargin( KDialog::marginHint() ); topL->addWidget(foldersB); - TQGridLayout *foldersL=new TQGridLayout(foldersB->tqlayout(), 3,2); + TQGridLayout *foldersL=new TQGridLayout(foldersB->layout(), 3,2); foldersL->setRowSpacing( 0, KDialog::spacingHint() ); diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp index 70d447034..aa730ab7f 100644 --- a/knode/knconvert.cpp +++ b/knode/knconvert.cpp @@ -12,7 +12,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <tqlayout.h> +#include <layout.h> #include <tqwidgetstack.h> #include <tqlabel.h> #include <tqcheckbox.h> @@ -73,7 +73,7 @@ KNConvert::KNConvert(const TQString &version) Unfortunately this version uses a different format for some data-files, so \ in order to keep your existing data it is necessary to convert it first. This is \ now done automatically by KNode. If you want to, a backup of your existing data \ -will be created before the conversion starts.").tqarg(KNODE_VERSION), w_1); +will be created before the conversion starts.").arg(KNODE_VERSION), w_1); w1L->addMultiCellWidget(l1, 0,0, 0,2); c_reateBkup=new TQCheckBox(i18n("Create backup of old data"), w_1); @@ -96,7 +96,7 @@ will be created before the conversion starts.").tqarg(KNODE_VERSION), w_1); w_2=new TQLabel(s_tack); w_2->setText(i18n("<b>Converting, please wait...</b>")); - w_2->tqsetAlignment(AlignCenter); + w_2->setAlignment(AlignCenter); s_tack->addWidget(w_2, 2); w_3=new TQWidget(s_tack); @@ -224,7 +224,7 @@ void KNConvert::slotTarExited(KProcess *proc) delete t_ar; t_ar = 0; if(success) - l_og.append(i18n("created backup of the old data-files in %1").tqarg(b_ackupPath->text())); + l_og.append(i18n("created backup of the old data-files in %1").arg(b_ackupPath->text())); else l_og.append(i18n("backup failed.")); @@ -402,7 +402,7 @@ int KNConvert::Converter04::convertFolder(TQString srcPrefix, TQString dstPrefix TQCString buff(size+10); srcMBox.at(oldIdx.so); int readBytes=srcMBox.readBlock(buff.data(), size); - buff.tqat(readBytes)='\0'; //terminate string; + buff.at(readBytes)='\0'; //terminate string; //remove "X-KNode-Overview" int pos=buff.find('\n'); diff --git a/knode/kndisplayedheader.cpp b/knode/kndisplayedheader.cpp index 1f6952f46..65b165222 100644 --- a/knode/kndisplayedheader.cpp +++ b/knode/kndisplayedheader.cpp @@ -107,7 +107,7 @@ void KNDisplayedHeader::setTranslatedName(const TQString &s) bool retranslated = false; for (const char **c=predef;(*c)!=0;c++) { // ok, first the standard header names if (s==i18n("collection of article headers",*c)) { - n_ame = TQString::tqfromLatin1(*c); + n_ame = TQString::fromLatin1(*c); retranslated = true; break; } @@ -116,7 +116,7 @@ void KNDisplayedHeader::setTranslatedName(const TQString &s) if (!retranslated) { for (const char **c=disp;(*c)!=0;c++) // now our standard display names if (s==i18n("collection of article headers",*c)) { - n_ame = TQString::tqfromLatin1(*c); + n_ame = TQString::fromLatin1(*c); retranslated = true; break; } diff --git a/knode/knfilterconfigwidget.cpp b/knode/knfilterconfigwidget.cpp index 3c7daee1e..3ff509194 100644 --- a/knode/knfilterconfigwidget.cpp +++ b/knode/knfilterconfigwidget.cpp @@ -14,7 +14,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> diff --git a/knode/knfilterdialog.cpp b/knode/knfilterdialog.cpp index ea05a21cc..79b0dad77 100644 --- a/knode/knfilterdialog.cpp +++ b/knode/knfilterdialog.cpp @@ -16,7 +16,7 @@ #include <tqlabel.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kmessagebox.h> @@ -31,7 +31,7 @@ KNFilterDialog::KNFilterDialog(KNArticleFilter *f, TQWidget *parent, const char *name) - : KDialogBase(Plain, (f->id()==-1)? i18n("New Filter"):i18n("Properties of %1").tqarg(f->name()), + : KDialogBase(Plain, (f->id()==-1)? i18n("New Filter"):i18n("Properties of %1").arg(f->name()), Ok|Cancel|Help, Ok, parent, name), fltr(f) { @@ -74,8 +74,8 @@ KNFilterDialog::KNFilterDialog(KNArticleFilter *f, TQWidget *parent, const char fw->messageId->setFilter(f->messageId); fw->references->setFilter(f->references); - setFixedHeight(tqsizeHint().height()); - KNHelper::restoreWindowSize("filterDLG", this, tqsizeHint()); + setFixedHeight(sizeHint().height()); + KNHelper::restoreWindowSize("filterDLG", this, sizeHint()); setHelp("anc-using-filters"); connect( fname, TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT( slotTextChanged( const TQString & ))); diff --git a/knode/knfolder.cpp b/knode/knfolder.cpp index 58ac7d0fc..852fe9aef 100644 --- a/knode/knfolder.cpp +++ b/knode/knfolder.cpp @@ -44,7 +44,7 @@ KNFolder::KNFolder() KNFolder::KNFolder(int id, const TQString &name, KNFolder *parent) : KNArticleCollection(parent), i_d(id), i_ndexDirty(false), w_asOpen(true) { - TQString fname=path()+TQString("custom_%1").tqarg(i_d); + TQString fname=path()+TQString("custom_%1").arg(i_d); n_ame = name; m_boxFile.setName(fname+".mbox"); @@ -63,7 +63,7 @@ KNFolder::KNFolder(int id, const TQString &name, KNFolder *parent) KNFolder::KNFolder(int id, const TQString &name, const TQString &prefix, KNFolder *parent) : KNArticleCollection(parent), i_d(id), i_ndexDirty(false), w_asOpen(true) { - TQString fname=path()+TQString("%1_%2").tqarg(prefix).tqarg(i_d); + TQString fname=path()+TQString("%1_%2").arg(prefix).arg(i_d); n_ame = name; m_boxFile.setName(fname+".mbox"); @@ -356,7 +356,7 @@ bool KNFolder::loadArticle(KNLocalArticle *a) } //set content - buff.tqat(readBytes)='\0'; //terminate string + buff.at(readBytes)='\0'; //terminate string a->setContent(buff); a->parse(); diff --git a/knode/knfoldermanager.cpp b/knode/knfoldermanager.cpp index 7041f4562..44ae78b4a 100644 --- a/knode/knfoldermanager.cpp +++ b/knode/knfoldermanager.cpp @@ -326,7 +326,7 @@ void KNFolderManager::importFromMBox(KNFolder *f) int readBytes=file->readBlock(buff.data(), size); if (readBytes != -1) { - buff.tqat(readBytes)='\0'; //terminate string + buff.at(readBytes)='\0'; //terminate string art = new KNLocalArticle(0); art->setEditDisabled(true); art->setContent(buff); @@ -345,7 +345,7 @@ void KNFolderManager::importFromMBox(KNFolder *f) int readBytes=file->readBlock(buff.data(), size); if (readBytes != -1) { - buff.tqat(readBytes)='\0'; //terminate string + buff.at(readBytes)='\0'; //terminate string art = new KNLocalArticle(0); art->setEditDisabled(true); art->setContent(buff); diff --git a/knode/kngroup.cpp b/knode/kngroup.cpp index df40915f2..c306b178e 100644 --- a/knode/kngroup.cpp +++ b/knode/kngroup.cpp @@ -71,7 +71,7 @@ void KNGroup::updateListItem() if(!l_istItem) return; l_istItem->setTotalCount( c_ount ); l_istItem->setUnreadCount( c_ount - r_eadCount - i_gnoreCount ); - l_istItem->tqrepaint(); + l_istItem->repaint(); } @@ -133,7 +133,7 @@ void KNGroup::saveInfo() info.writeEntry("dynDataFormat", d_ynDataFormat); info.writeEntry("name", n_ame); info.writeEntry("useCharset", u_seCharset); - info.writeEntry("defaultChSet", TQString::tqfromLatin1(d_efaultChSet)); + info.writeEntry("defaultChSet", TQString::fromLatin1(d_efaultChSet)); switch (s_tatus) { case unknown: info.writeEntry("status","unknown"); break; @@ -964,7 +964,7 @@ void KNGroup::reorganize() buildThreads(length()); saveStaticData(length(), true); saveDynamicData(length(), true); - knGlobals.top->headerView()->tqrepaint(); + knGlobals.top->headerView()->repaint(); knGlobals.seStatusMsg(TQString()); knGlobals.top->setCursorBusy(false); } @@ -1052,7 +1052,7 @@ TQString KNGroup::prepareForExecution() if (knGlobals.groupManager()->loadHeaders(this)) return TQString(); else - return i18n("Cannot load saved headers: %1").tqarg(groupname()); + return i18n("Cannot load saved headers: %1").arg(groupname()); } //*************************************************************************** diff --git a/knode/kngroup.h b/knode/kngroup.h index 387ff0f6e..76a9d0dd1 100644 --- a/knode/kngroup.h +++ b/knode/kngroup.h @@ -35,7 +35,7 @@ namespace KNConfig { class KNGroup : public KNArticleCollection , public KNJobItem { public: - enum tqStatus { unknown=0, readOnly=1, postingAllowed=2, moderated=3 }; + enum Status { unknown=0, readOnly=1, postingAllowed=2, moderated=3 }; KNGroup(KNCollection *p=0); ~KNGroup(); @@ -123,8 +123,8 @@ class KNGroup : public KNArticleCollection , public KNJobItem { KNNntpAccount* account(); KNConfig::Identity* identity()const { return i_dentity; } void setIdentity(KNConfig::Identity *i) { i_dentity=i; } - tqStatus status()const { return s_tatus; } - void setqStatus(tqStatus s) { s_tatus=s; } + Status status()const { return s_tatus; } + void seStatus(Status s) { s_tatus=s; } void showProperties(); // cleanup configuration @@ -153,7 +153,7 @@ class KNGroup : public KNArticleCollection , public KNJobItem { bool l_ocked, u_seCharset; - tqStatus s_tatus; + Status s_tatus; TQStringList c_rosspostIDBuffer; diff --git a/knode/kngroupbrowser.cpp b/knode/kngroupbrowser.cpp index a3bcb89f4..7c2176e16 100644 --- a/knode/kngroupbrowser.cpp +++ b/knode/kngroupbrowser.cpp @@ -14,7 +14,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqtimer.h> #include <tqapplication.h> @@ -92,7 +92,7 @@ KNGroupBrowser::KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntp connect(groupView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(slotItemDoubleClicked(TQListViewItem*))); - //tqlayout + //layout TQGridLayout *topL=new TQGridLayout(page,3,1,0,5); TQHBoxLayout *filterL=new TQHBoxLayout(10); TQVBoxLayout *arrL=new TQVBoxLayout(10); @@ -358,7 +358,7 @@ void KNGroupBrowser::slotFilter(const TQString &txt) lastFilter = filtertxt; incrementalFilter = !isRegexp; - leftLabel->setText(i18n("Groups on %1: (%2 displayed)").tqarg(a_ccount->name()).tqarg(matchList->count())); + leftLabel->setText(i18n("Groups on %1: (%2 displayed)").arg(a_ccount->name()).arg(matchList->count())); arrowBtn1->setEnabled(false); arrowBtn2->setEnabled(false); diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp index 0050e96a5..d9b25ba17 100644 --- a/knode/kngroupdialog.cpp +++ b/knode/kngroupdialog.cpp @@ -15,7 +15,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> #include <tqcheckbox.h> @@ -300,7 +300,7 @@ void KNGroupDialog::slotUser2() topL->addMultiCellWidget(takeCustom, 2, 2, 0, 1); KDatePicker *dateSel = new KDatePicker(btnGrp, lastDate); - dateSel->setMinimumSize(dateSel->tqsizeHint()); + dateSel->setMinimumSize(dateSel->sizeHint()); topL->addWidget(dateSel, 3, 1, TQt::AlignLeft); connect(takeCustom, TQT_SIGNAL(toggled(bool)), dateSel, TQT_SLOT(setEnabled(bool))); @@ -314,7 +314,7 @@ void KNGroupDialog::slotUser2() if (dlg->exec()) { if (takeCustom->isChecked()) lastDate = dateSel->date(); - a_ccount->setLastNewFetch(TQDate::tqcurrentDate()); + a_ccount->setLastNewFetch(TQDate::currentDate()); leftLabel->setText(i18n("Checking for new groups...")); enableButton(User1,false); enableButton(User2,false); diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp index dd8b05961..4aa6a9444 100644 --- a/knode/kngroupmanager.cpp +++ b/knode/kngroupmanager.cpp @@ -51,7 +51,7 @@ KNGroupInfo::KNGroupInfo() } -KNGroupInfo::KNGroupInfo(const TQString &n_ame, const TQString &d_escription, bool n_ewGroup, bool s_ubscribed, KNGroup::tqStatus s_tatus) +KNGroupInfo::KNGroupInfo(const TQString &n_ame, const TQString &d_escription, bool n_ewGroup, bool s_ubscribed, KNGroup::Status s_tatus) : name(n_ame), description(d_escription), newGroup(n_ewGroup), subscribed(s_ubscribed), status(s_tatus) { @@ -101,7 +101,7 @@ bool KNGroupListData::readIn(KNProtocolClient *client) int sepPos1,sepPos2; TQString name,description; bool sub; - KNGroup::tqStatus status=KNGroup::unknown; + KNGroup::Status status=KNGroup::unknown; TQTime timer; uint size=f.size()+2; @@ -435,7 +435,7 @@ void KNGroupManager::subscribeGroup(const KNGroupInfo *gi, KNNntpAccount *a) grp=new KNGroup(a); grp->setGroupname(gi->name); grp->setDescription(gi->description); - grp->setqStatus(gi->status); + grp->seStatus(gi->status); grp->saveInfo(); mGroupList.append( grp ); emit groupAdded(grp); @@ -449,7 +449,7 @@ bool KNGroupManager::unsubscribeGroup(KNGroup *g) if(!g) return false; if((g->isLocked()) || (g->lockedArticles()>0)) { - KMessageBox::sorry(knGlobals.topWidget, i18n("The group \"%1\" is being updated currently.\nIt is not possible to unsubscribe from it at the moment.").tqarg(g->groupname())); + KMessageBox::sorry(knGlobals.topWidget, i18n("The group \"%1\" is being updated currently.\nIt is not possible to unsubscribe from it at the moment.").arg(g->groupname())); return false; } @@ -596,7 +596,7 @@ void KNGroupManager::processJob(KNJobData *j) for ( KNGroupInfo* inf = d->groups->first(); inf; inf = d->groups->next() ) if ( inf->name == (*it)->groupname() ) { (*it)->setDescription( inf->description ); - (*it)->setqStatus( inf->status ); + (*it)->seStatus( inf->status ); break; } } diff --git a/knode/kngroupmanager.h b/knode/kngroupmanager.h index 8b34979d6..c6ccc92fb 100644 --- a/knode/kngroupmanager.h +++ b/knode/kngroupmanager.h @@ -38,13 +38,13 @@ class KNGroupInfo { public: KNGroupInfo(); - KNGroupInfo(const TQString &n_ame, const TQString &d_escription, bool n_ewGroup=false, bool s_ubscribed=false, KNGroup::tqStatus s_tatus=KNGroup::unknown ); + KNGroupInfo(const TQString &n_ame, const TQString &d_escription, bool n_ewGroup=false, bool s_ubscribed=false, KNGroup::Status s_tatus=KNGroup::unknown ); ~KNGroupInfo(); /** group names will be utf-8 encoded in the future... */ TQString name,description; bool newGroup, subscribed; - KNGroup::tqStatus status; + KNGroup::Status status; bool operator== (const KNGroupInfo &gi2); bool operator< (const KNGroupInfo &gi2); diff --git a/knode/kngrouppropdlg.cpp b/knode/kngrouppropdlg.cpp index c0a107afd..8e18802af 100644 --- a/knode/kngrouppropdlg.cpp +++ b/knode/kngrouppropdlg.cpp @@ -13,7 +13,7 @@ */ #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqcheckbox.h> @@ -30,7 +30,7 @@ KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *parent, const char *name ) - : KDialogBase(Tabbed, i18n("Properties of %1").tqarg(group->groupname()), + : KDialogBase(Tabbed, i18n("Properties of %1").arg(group->groupname()), Ok|Cancel|Help, Ok, parent, name), g_rp(group), n_ickChanged(false) { @@ -152,7 +152,7 @@ KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *parent, const char *nam cleanupLayout->addWidget( mCleanupWidget ); cleanupLayout->addStretch( 1 ); - KNHelper::restoreWindowSize("groupPropDLG", this, tqsizeHint()); + KNHelper::restoreWindowSize("groupPropDLG", this, sizeHint()); } diff --git a/knode/kngroupselectdialog.cpp b/knode/kngroupselectdialog.cpp index 6767d3f64..595fe0450 100644 --- a/knode/kngroupselectdialog.cpp +++ b/knode/kngroupselectdialog.cpp @@ -14,7 +14,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqheader.h> #include <tqcheckbox.h> diff --git a/knode/knhdrviewitem.cpp b/knode/knhdrviewitem.cpp index cf2713b8d..6330b89ab 100644 --- a/knode/knhdrviewitem.cpp +++ b/knode/knhdrviewitem.cpp @@ -114,7 +114,7 @@ int KNHdrViewItem::compare( TQListViewItem *i, int col, bool ) const } -void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ) +void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ) { int xText = 0, xPM = 3, yPM = 0; TQColor base; @@ -159,7 +159,7 @@ void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, TQString t2; TQFont f2; if (countUnreadInThread() > 0 && column == paintInfo->subCol && !isOpen()) { - t2 = TQString( " (%1)" ).tqarg( countUnreadInThread() ); + t2 = TQString( " (%1)" ).arg( countUnreadInThread() ); f2 = p->font(); f2.setBold( true ); cntWidth = TQFontMetrics( f2 ).width( t2, -1 ); @@ -172,7 +172,7 @@ void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, else mShowToolTip[column] = false; - p->drawText( xText, 0, width - xText - 5, height(), tqalignment | AlignVCenter, t ); + p->drawText( xText, 0, width - xText - 5, height(), alignment | AlignVCenter, t ); if (cntWidth) { TQFont orig = p->font(); p->setFont( f2 ); @@ -183,7 +183,7 @@ void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, pen.setColor( cg.link() ); } p->setPen( pen ); - p->drawText( xText + TQFontMetrics( orig ).width( t, -1 ), 0, width - xText - 5, height(), tqalignment | AlignVCenter, t2 ); + p->drawText( xText + TQFontMetrics( orig ).width( t, -1 ), 0, width - xText - 5, height(), alignment | AlignVCenter, t2 ); } } } diff --git a/knode/knhdrviewitem.h b/knode/knhdrviewitem.h index 163a45070..476c6d53c 100644 --- a/knode/knhdrviewitem.h +++ b/knode/knhdrviewitem.h @@ -33,7 +33,7 @@ class KNHdrViewItem : public KListViewItem { virtual int compare(TQListViewItem *i, int col, bool ascending) const; - void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); int width(const TQFontMetrics &fm, const TQListView *lv, int column); virtual TQString text( int col ) const; diff --git a/knode/knjobdata.cpp b/knode/knjobdata.cpp index a5cdac894..8d2c47bf1 100644 --- a/knode/knjobdata.cpp +++ b/knode/knjobdata.cpp @@ -24,7 +24,7 @@ #include "knnetaccess.h" #include "knnntpaccount.h" -#include <tqstylesheet.h> +#include <stylesheet.h> KNJobConsumer::KNJobConsumer() { @@ -95,7 +95,7 @@ void KNJobData::cancel() mJob = 0; } if ( mProgressItem ) { - mProgressItem->setqStatus( "Canceled" ); + mProgressItem->seStatus( "Canceled" ); mProgressItem->setComplete(); mProgressItem = 0; } @@ -140,7 +140,7 @@ void KNJobData::slotJobPercent( KIO::Job*, unsigned long percent ) void KNJobData::slotJobInfoMessage( KIO::Job*, const TQString &msg ) { kdDebug(5003) << k_funcinfo << "Status: " << msg << endl; - setqStatus( msg ); + seStatus( msg ); } diff --git a/knode/knjobdata.h b/knode/knjobdata.h index ade7b7f35..7f14dc7b9 100644 --- a/knode/knjobdata.h +++ b/knode/knjobdata.h @@ -115,7 +115,7 @@ class KNJobData : public TQObject void createProgressItem(); // safe forwards to the progress item - void setqStatus( const TQString &msg ) { if ( mProgressItem ) mProgressItem->setqStatus( msg ); } + void seStatus( const TQString &msg ) { if ( mProgressItem ) mProgressItem->seStatus( msg ); } void setProgress( unsigned int progress ) { if ( mProgressItem ) mProgressItem->setProgress( progress ); } void setComplete() { if ( mProgressItem ) { mProgressItem->setComplete(); mProgressItem = 0; } } diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp index 4294f7a51..21ead952a 100644 --- a/knode/knmainwidget.cpp +++ b/knode/knmainwidget.cpp @@ -14,7 +14,7 @@ #include "knmainwidget.h" #include <tqhbox.h> -#include <tqlayout.h> +#include <layout.h> #include <ktoolbar.h> #include <kinputdialog.h> @@ -305,19 +305,19 @@ KNMainWidget::~KNMainWidget() void KNMainWidget::iniStatusBar() { //statusbar - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget()); + KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); KStatusBar *sb = mainWin ? mainWin->statusBar() : 0; s_tatusFilter = new KRSqueezedTextLabel( TQString(), sb ); - s_tatusFilter->tqsetAlignment( AlignLeft | AlignVCenter ); + s_tatusFilter->setAlignment( AlignLeft | AlignVCenter ); s_tatusGroup = new KRSqueezedTextLabel( TQString(), sb ); - s_tatusGroup->tqsetAlignment( AlignLeft | AlignVCenter ); + s_tatusGroup->setAlignment( AlignLeft | AlignVCenter ); } //================================== GUI ================================= void KNMainWidget::seStatusMsg(const TQString& text, int id) { - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget()); + KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); KStatusBar *bar = mainWin ? mainWin->statusBar() : 0; if ( !bar ) return; @@ -342,7 +342,7 @@ void KNMainWidget::seStatusMsg(const TQString& text, int id) void KNMainWidget::seStatusHelpMsg(const TQString& text) { - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget()); + KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); KStatusBar *bar = mainWin ? mainWin->statusBar() : 0; if ( bar ) bar->message(text, 2000); @@ -375,7 +375,7 @@ void KNMainWidget::setCursorBusy(bool b) void KNMainWidget::blockUI(bool b) { b_lockui = b; - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget()); + KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); KMenuBar *mbar = mainWin ? mainWin->menuBar() : 0; if ( mbar ) mbar->setEnabled(!b); @@ -394,7 +394,7 @@ void KNMainWidget::blockUI(bool b) void KNMainWidget::disableAccels(bool b) { a_ccel->setEnabled(!b); - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget()); + KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); KAccel *naccel = mainWin ? mainWin->accel() : 0; if ( naccel ) naccel->setEnabled(!b); @@ -409,7 +409,7 @@ void KNMainWidget::disableAccels(bool b) void KNMainWidget::secureProcessEvents() { b_lockui = true; - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget()); + KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); KMenuBar *mbar = mainWin ? mainWin->menuBar() : 0; if ( mbar ) mbar->setEnabled(false); @@ -431,7 +431,7 @@ void KNMainWidget::secureProcessEvents() } -TQSize KNMainWidget::tqsizeHint() const +TQSize KNMainWidget::sizeHint() const { return TQSize(759,478); // default optimized for 800x600 } @@ -775,7 +775,7 @@ bool KNMainWidget::firstStart() emailConf.setGroup("Defaults"); TQString group = emailConf.readEntry("Profile","Default"); - emailConf.setGroup(TQString("PROFILE_%1").tqarg(group)); + emailConf.setGroup(TQString("PROFILE_%1").arg(group)); KNConfig::Identity *id=knGlobals.configManager()->identity(); id->setName(emailConf.readEntry("FullName")); id->setEmail(emailConf.readEntry("EmailAddress").latin1()); @@ -903,7 +903,7 @@ bool KNMainWidget::queryClose() void KNMainWidget::showEvent(TQShowEvent *) { - slotCheckDockWidgetqStatus(); + slotCheckDockWidgeStatus(); } @@ -1301,7 +1301,7 @@ void KNMainWidget::slotNetworkActive(bool b) } -void KNMainWidget::slotCheckDockWidgetqStatus() +void KNMainWidget::slotCheckDockWidgeStatus() { a_ctToggleGroupView->setChecked(c_olDock->isVisible()); a_ctToggleArticleViewer->setChecked(a_rtDock->isVisible()); @@ -1511,7 +1511,7 @@ void KNMainWidget::slotGrpUnsubscribe() kdDebug(5003) << "KNMainWidget::slotGrpUnsubscribe()" << endl; if(g_rpManager->currentGroup()) { if(KMessageBox::Yes==KMessageBox::questionYesNo(knGlobals.topWidget, - i18n("Do you really want to unsubscribe from %1?").tqarg(g_rpManager->currentGroup()->groupname()), TQString(), i18n("Unsubscribe"), KStdGuiItem::cancel())) + i18n("Do you really want to unsubscribe from %1?").arg(g_rpManager->currentGroup()->groupname()), TQString(), i18n("Unsubscribe"), KStdGuiItem::cancel())) if (g_rpManager->unsubscribeGroup(g_rpManager->currentGroup())) slotCollectionSelected(0); } @@ -1588,7 +1588,7 @@ void KNMainWidget::slotFolDelete() KMessageBox::sorry(knGlobals.topWidget, i18n("You cannot delete a standard folder.")); else if( KMessageBox::Continue==KMessageBox::warningContinueCancel(knGlobals.topWidget, - i18n("Do you really want to delete this folder and all its tqchildren?"),"",KGuiItem(i18n("&Delete"),"editdelete")) ) { + i18n("Do you really want to delete this folder and all its children?"),"",KGuiItem(i18n("&Delete"),"editdelete")) ) { if(!f_olManager->deleteFolder(f_olManager->currentFolder())) KMessageBox::sorry(knGlobals.topWidget, @@ -1639,7 +1639,7 @@ void KNMainWidget::slotFolEmpty() return; } if( KMessageBox::Continue == KMessageBox::warningContinueCancel( - this, i18n("Do you really want to delete all articles in %1?").tqarg(f_olManager->currentFolder()->name()),"",KGuiItem(i18n("&Delete"),"editdelete")) ) + this, i18n("Do you really want to delete all articles in %1?").arg(f_olManager->currentFolder()->name()),"",KGuiItem(i18n("&Delete"),"editdelete")) ) f_olManager->emptyFolder(f_olManager->currentFolder()); } } @@ -1948,7 +1948,7 @@ void KNMainWidget::slotFetchArticleWithID() TQString id = dlg->messageId().simplifyWhiteSpace(); if (id.find(TQRegExp("*@*",false,true))!=-1) { if (id.find(TQRegExp("<*>",false,true))==-1) // add "<>" when necessary - id = TQString("<%1>").tqarg(id); + id = TQString("<%1>").arg(id); if(!KNArticleWindow::raiseWindowForArticle(id.latin1())) { //article not yet opened KNRemoteArticle *a=new KNRemoteArticle(g_rpManager->currentGroup()); @@ -1966,7 +1966,7 @@ void KNMainWidget::slotFetchArticleWithID() void KNMainWidget::slotToggleGroupView() { c_olDock->changeHideShowState(); - slotCheckDockWidgetqStatus(); + slotCheckDockWidgeStatus(); } @@ -1977,19 +1977,19 @@ void KNMainWidget::slotToggleHeaderView() if ( !h_drDock->isDockBackPossible() ) { h_drDock->manualDock( a_rtDock, KDockWidget::DockTop ); h_drDock->makeDockVisible(); - slotCheckDockWidgetqStatus(); + slotCheckDockWidgeStatus(); return; } h_drDock->changeHideShowState(); - slotCheckDockWidgetqStatus(); + slotCheckDockWidgeStatus(); } void KNMainWidget::slotToggleArticleViewer() { a_rtDock->changeHideShowState(); - slotCheckDockWidgetqStatus(); + slotCheckDockWidgeStatus(); } void KNMainWidget::slotToggleQuickSearch() diff --git a/knode/knmainwidget.h b/knode/knmainwidget.h index c00c69982..6a6e8ed1a 100644 --- a/knode/knmainwidget.h +++ b/knode/knmainwidget.h @@ -83,7 +83,7 @@ public: void secureProcessEvents(); /** useful default value */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** handle URL given as command-line argument */ void openURL(const KURL &url); @@ -230,7 +230,7 @@ protected slots: void slotNetworkActive(bool b); //dock widget slots - void slotCheckDockWidgetqStatus(); + void slotCheckDockWidgeStatus(); void slotGroupDockHidden(); void slotHeaderDockHidden(); void slotArticleDockHidden(); diff --git a/knode/knmemorymanager.cpp b/knode/knmemorymanager.cpp index 365e9f8c9..37a639287 100644 --- a/knode/knmemorymanager.cpp +++ b/knode/knmemorymanager.cpp @@ -162,7 +162,7 @@ void KNMemoryManager::checkMemoryUsageCollections() for ( TQValueList<CollectionItem*>::Iterator it = tempList.begin(); it != tempList.end(); ) { if ( c_ollCacheSize <= maxSize ) break; - // unloadHeaders() will remove the cache entry and thus tqinvalidate the iterator! + // unloadHeaders() will remove the cache entry and thus invalidate the iterator! c = (*it)->col; ++it; @@ -191,7 +191,7 @@ void KNMemoryManager::checkMemoryUsageArticles() for ( TQValueList<ArticleItem*>::Iterator it = mArtList.begin(); it != mArtList.end(); ) { if ( a_rtCacheSize <= maxSize ) break; - // unloadArticle() will remove the cache entry and thus tqinvalidate the iterator! + // unloadArticle() will remove the cache entry and thus invalidate the iterator! KNArticle *art = (*it)->art; ++it; knGlobals.articleManager()->unloadArticle( art, false ); // *try* to unload diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp index ec2c86632..1b67d62ea 100644 --- a/knode/knnetaccess.cpp +++ b/knode/knnetaccess.cpp @@ -102,7 +102,7 @@ void KNNetAccess::addJob(KNJobData *job) if ( !job->account()->readyForLogin() ) { mWalletQueue.append( job ); knGlobals.accountManager()->loadPasswordsAsync(); - job->setqStatus( i18n( "Waiting for KWallet..." ) ); + job->seStatus( i18n( "Waiting for KWallet..." ) ); return; } @@ -142,7 +142,7 @@ void KNNetAccess::addJob(KNJobData *job) startJobNntp(); } } - updatetqStatus(); + updateStatus(); } @@ -178,7 +178,7 @@ void KNNetAccess::stopJobsNntp( int type ) } else ++it; } - updatetqStatus(); + updateStatus(); } @@ -207,7 +207,7 @@ void KNNetAccess::stopJobsSmtp( int type ) } else ++it; } - updatetqStatus(); + updateStatus(); } @@ -340,7 +340,7 @@ void KNNetAccess::threadDoneNntp() if (!nntpJobQueue.isEmpty()) startJobNntp(); - updatetqStatus(); + updateStatus(); } @@ -368,7 +368,7 @@ void KNNetAccess::threadDoneSmtp() if (!smtpJobQueue.isEmpty()) startJobSmtp(); - updatetqStatus(); + updateStatus(); } @@ -399,52 +399,52 @@ void KNNetAccess::slotThreadSignal(int i) case KNProtocolClient::TSconnect: currMsg = i18n(" Connecting to server..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->setqStatus(currMsg); + currentNntpJob->seStatus(currMsg); break; case KNProtocolClient::TSloadGrouplist: currMsg = i18n(" Loading group list from disk..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->setqStatus(currMsg); + currentNntpJob->seStatus(currMsg); break; case KNProtocolClient::TSwriteGrouplist: currMsg = i18n(" Writing group list to disk..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->setqStatus(currMsg); + currentNntpJob->seStatus(currMsg); break; case KNProtocolClient::TSdownloadGrouplist: currMsg = i18n(" Downloading group list..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->setqStatus(currMsg); + currentNntpJob->seStatus(currMsg); break; case KNProtocolClient::TSdownloadNewGroups: currMsg = i18n(" Looking for new groups..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->setqStatus(currMsg); + currentNntpJob->seStatus(currMsg); break; case KNProtocolClient::TSdownloadDesc: currMsg = i18n(" Downloading group descriptions..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->setqStatus(currMsg); + currentNntpJob->seStatus(currMsg); break; case KNProtocolClient::TSdownloadNew: currMsg = i18n(" Downloading new headers..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->setqStatus(currMsg); + currentNntpJob->seStatus(currMsg); break; case KNProtocolClient::TSsortNew: currMsg = i18n(" Sorting..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->setqStatus(currMsg); + currentNntpJob->seStatus(currMsg); break; case KNProtocolClient::TSdownloadArticle: currMsg = i18n(" Downloading article..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->setqStatus(currMsg); + currentNntpJob->seStatus(currMsg); break; case KNProtocolClient::TSsendArticle: currMsg = i18n(" Sending article..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->setqStatus(currMsg); + currentNntpJob->seStatus(currMsg); break; case KNProtocolClient::TSjobStarted: currentNntpJob->setProgress(0); @@ -477,7 +477,7 @@ void KNNetAccess::slotPasswordsChanged() { TQValueList<KNJobData*>::ConstIterator it; for ( it = mWalletQueue.begin(); it != mWalletQueue.end(); ++it ) { - (*it)->setqStatus( i18n("Waiting...") ); + (*it)->seStatus( i18n("Waiting...") ); if ( (*it)->type() == KNJobData::JTmail ) smtpJobQueue.append( (*it) ); else @@ -528,10 +528,10 @@ void KNNetAccess::slotCancelJob( KPIM::ProgressItem *item ) if ( currentSmtpJob && currentSmtpJob->progressItem() == item ) cancelCurrentSmtpJob(); - updatetqStatus(); + updateStatus(); } -void KNNetAccess::updatetqStatus( ) +void KNNetAccess::updateStatus( ) { if ( nntpJobQueue.isEmpty() && smtpJobQueue.isEmpty() && !currentNntpJob && !currentSmtpJob && mWalletQueue.isEmpty() ) diff --git a/knode/knnetaccess.h b/knode/knnetaccess.h index 6b34937a1..23e34e0c0 100644 --- a/knode/knnetaccess.h +++ b/knode/knnetaccess.h @@ -85,7 +85,7 @@ class KNNetAccess : public TQObject { void cancelCurrentNntpJob( int type = 0 ); void cancelCurrentSmtpJob( int type = 0 ); /** Update activitiy status, i.e. emit netActive signal. */ - void updatetqStatus(); + void updateStatus(); private slots: void slotJobResult( KIO::Job *job ); diff --git a/knode/knnntpaccount.cpp b/knode/knnntpaccount.cpp index 81b3cc425..ba1657c0c 100644 --- a/knode/knnntpaccount.cpp +++ b/knode/knnntpaccount.cpp @@ -75,7 +75,7 @@ void KNNntpAccountIntervalChecking::slotCheckNews() KNNntpAccount::KNNntpAccount() : KNCollection(0), KNServerInfo(), i_dentity(0), f_etchDescriptions(true), w_asOpen(false), i_ntervalChecking(false), c_heckInterval(10) { - l_astNewFetch = TQDate::tqcurrentDate(); + l_astNewFetch = TQDate::currentDate(); a_ccountIntervalChecking = new KNNntpAccountIntervalChecking(this); mCleanupConf = new KNConfig::Cleanup( false ); } @@ -174,7 +174,7 @@ void KNNntpAccount::saveInfo() TQString KNNntpAccount::path() { - TQString dir(locateLocal("data","knode/")+TQString("nntp.%1/").tqarg(i_d)); + TQString dir(locateLocal("data","knode/")+TQString("nntp.%1/").arg(i_d)); if (dir.isNull()) KNHelper::displayInternalFileError(); return (dir); diff --git a/knode/knnntpclient.cpp b/knode/knnntpclient.cpp index 26473b6a1..d49f9053a 100644 --- a/knode/knnntpclient.cpp +++ b/knode/knnntpclient.cpp @@ -16,7 +16,7 @@ #include <stdlib.h> #include <klocale.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqmutex.h> #include "kngroupmanager.h" @@ -93,7 +93,7 @@ void KNNntpClient::doFetchGroups() char *s, *line; TQString name; - KNGroup::tqStatus status; + KNGroup::Status status; bool subscribed; while (getNextLine()) { @@ -228,7 +228,7 @@ void KNNntpClient::doCheckNewGroups() char *s, *line; TQString name; - KNGroup::tqStatus status; + KNGroup::Status status; TQSortedList<KNGroupInfo> tmpList; tmpList.setAutoDelete(true); @@ -336,7 +336,7 @@ void KNNntpClient::doFetchNewHeaders() sendSignal(TSdownloadNew); errorPrefix=i18n("No new articles could be retrieved for\n%1/%2.\nThe following error occurred:\n") - .tqarg(account.server()).tqarg(target->groupname()); + .arg(account.server()).arg(target->groupname()); cmd="GROUP "; cmd+=target->groupname().utf8(); @@ -482,7 +482,7 @@ void KNNntpClient::doFetchArticle() job->setErrorString( errorPrefix + getCurrentLine() + i18n("<br><br>The article you requested is not available on your news server." "<br>You could try to get it from <a href=\"http://groups.google.com/groups?selm=%1\">groups.google.com</a>.") - .tqarg( msgId ) ); + .arg( msgId ) ); } return; } @@ -638,7 +638,7 @@ bool KNNntpClient::openConnection() #ifndef NDEBUG qDebug("knode: Authorization failed"); #endif - job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").tqarg(getCurrentLine())); + job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").arg(getCurrentLine())); job->setAuthError(true); closeConnection(); return false; @@ -695,7 +695,7 @@ bool KNNntpClient::sendCommand(const TQCString &cmd, int &rep) //qDebug("knode: Password required"); if (!account.pass().length()) { - job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").tqarg(getCurrentLine())); + job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").arg(getCurrentLine())); job->setAuthError(true); closeConnection(); return false; @@ -716,7 +716,7 @@ bool KNNntpClient::sendCommand(const TQCString &cmd, int &rep) if (!KNProtocolClient::sendCommand(cmd,rep)) // retry the original command return false; } else { - job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").tqarg(getCurrentLine())); + job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").arg(getCurrentLine())); job->setAuthError(true); closeConnection(); return false; @@ -729,7 +729,7 @@ bool KNNntpClient::sendCommand(const TQCString &cmd, int &rep) void KNNntpClient::handleErrors() { if (errorPrefix.isEmpty()) - job->setErrorString(i18n("An error occurred:\n%1").tqarg(getCurrentLine())); + job->setErrorString(i18n("An error occurred:\n%1").arg(getCurrentLine())); else job->setErrorString(errorPrefix + getCurrentLine()); diff --git a/knode/knode.cpp b/knode/knode.cpp index e0963816b..1af62747b 100644 --- a/knode/knode.cpp +++ b/knode/knode.cpp @@ -109,7 +109,7 @@ void KNMainWindow::setupStatusBar() statusBar()->addWidget( mLittleProgress, 0 , true ); mStatusMsgLabel = new KRSqueezedTextLabel( TQString(), statusBar() ); - mStatusMsgLabel->tqsetAlignment( AlignLeft | AlignVCenter ); + mStatusMsgLabel->setAlignment( AlignLeft | AlignVCenter ); statusBar()->addWidget( mStatusMsgLabel, 2 ); statusBar()->addWidget(m_mainWidget->statusBarLabelFilter(), 2); statusBar()->addWidget(m_mainWidget->statusBarLabelGroup(), 3); diff --git a/knode/knode_part.cpp b/knode/knode_part.cpp index b20a5bb8b..1268733cb 100644 --- a/knode/knode_part.cpp +++ b/knode/knode_part.cpp @@ -41,7 +41,7 @@ #include <kstatusbar.h> #include <krsqueezedtextlabel.h> -#include <tqlayout.h> +#include <layout.h> typedef KParts::GenericFactory< KNodePart > KNodeFactory; diff --git a/knode/knprotocolclient.cpp b/knode/knprotocolclient.cpp index dd0db677a..330199bde 100644 --- a/knode/knprotocolclient.cpp +++ b/knode/knprotocolclient.cpp @@ -201,11 +201,11 @@ bool KNProtocolClient::openConnection() if (ks.status() == IO_LookupError) { job->setErrorString(i18n("Unable to resolve hostname")); } else if (ks.status() == IO_ConnectError) { - job->setErrorString(i18n("Unable to connect:\n%1").tqarg(KExtendedSocket::strError(ks.status(), errno))); + job->setErrorString(i18n("Unable to connect:\n%1").arg(KExtendedSocket::strError(ks.status(), errno))); } else if (ks.status() == IO_TimeOutError) job->setErrorString(i18n("A delay occurred which exceeded the\ncurrent timeout limit.")); else - job->setErrorString(i18n("Unable to connect:\n%1").tqarg(KExtendedSocket::strError(ks.status(), errno))); + job->setErrorString(i18n("Unable to connect:\n%1").arg(KExtendedSocket::strError(ks.status(), errno))); closeSocket(); return false; @@ -432,7 +432,7 @@ bool KNProtocolClient::checkNextResponse(int code) void KNProtocolClient::handleErrors() { if (errorPrefix.isEmpty()) - job->setErrorString(i18n("An error occurred:\n%1").tqarg(thisLine)); + job->setErrorString(i18n("An error occurred:\n%1").arg(thisLine)); else job->setErrorString(errorPrefix + thisLine); diff --git a/knode/knrangefilter.cpp b/knode/knrangefilter.cpp index 28c67b030..ef9b611ec 100644 --- a/knode/knrangefilter.cpp +++ b/knode/knrangefilter.cpp @@ -15,7 +15,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqcombobox.h> @@ -118,7 +118,7 @@ KNRangeFilterWidget::KNRangeFilterWidget(const TQString& value, int min, int max op2->insertItem("<="); des=new TQLabel(value, this); - des->tqsetAlignment(AlignCenter); + des->setAlignment(AlignCenter); TQGridLayout *topL=new TQGridLayout(this, 2,6, 8,5 ); diff --git a/knode/knsearchdialog.cpp b/knode/knsearchdialog.cpp index 4344cbbab..f4e3bbb3a 100644 --- a/knode/knsearchdialog.cpp +++ b/knode/knsearchdialog.cpp @@ -14,7 +14,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <klocale.h> @@ -68,8 +68,8 @@ KNSearchDialog::KNSearchDialog(searchType /*t*/, TQWidget *parent) f_ilter->setLoaded(true); f_ilter->setSearchFilter(true); - setFixedHeight(tqsizeHint().height()); - KNHelper::restoreWindowSize("searchDlg", this, tqsizeHint()); + setFixedHeight(sizeHint().height()); + KNHelper::restoreWindowSize("searchDlg", this, sizeHint()); fcw->setStartFocus(); } diff --git a/knode/knserverinfo.cpp b/knode/knserverinfo.cpp index c0351349b..d314a7710 100644 --- a/knode/knserverinfo.cpp +++ b/knode/knserverinfo.cpp @@ -111,7 +111,7 @@ void KNServerInfo::saveConf(KConfig *conf) "but should not be considered secure from decryption efforts " "if access to the configuration file is obtained.\n" "Do you want to store the password for server '%1' in the " - "configuration file?").tqarg( server() ), + "configuration file?").arg( server() ), i18n("KWallet Not Available"), KGuiItem( i18n("Store Password") ), KGuiItem( i18n("Do Not Store Password") ) ) diff --git a/knode/knstatusfilter.cpp b/knode/knstatusfilter.cpp index a1379a265..e99d764c4 100644 --- a/knode/knstatusfilter.cpp +++ b/knode/knstatusfilter.cpp @@ -14,7 +14,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <klocale.h> #include <ksimpleconfig.h> diff --git a/knode/knstringfilter.cpp b/knode/knstringfilter.cpp index 4f69f7eaf..322840b25 100644 --- a/knode/knstringfilter.cpp +++ b/knode/knstringfilter.cpp @@ -13,7 +13,7 @@ */ #include <tqcombobox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <klocale.h> diff --git a/knode/knwidgets.cpp b/knode/knwidgets.cpp index c3f21959a..b4c9a160c 100644 --- a/knode/knwidgets.cpp +++ b/knode/knwidgets.cpp @@ -107,10 +107,10 @@ void KNDialogListBox::keyPressEvent(TQKeyEvent *e) //==================================================================================== -KNDockWidgetHeaderDrag::KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name ) +KNDockWidgetHeaderDrag::KNDockWidgetHeaderDrag(TQWidget *focusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name ) : KDockWidgetHeaderDrag(parent, dock, name), f_ocus(false) { - connect(tqfocusWidget, TQT_SIGNAL(focusChanged(TQFocusEvent*)), TQT_SLOT(slotFocusChanged(TQFocusEvent*))); + connect(focusWidget, TQT_SIGNAL(focusChanged(TQFocusEvent*)), TQT_SLOT(slotFocusChanged(TQFocusEvent*))); } @@ -141,9 +141,9 @@ void KNDockWidgetHeaderDrag::paintEvent(TQPaintEvent* ev) TQPainter paint; paint.begin(&drawBuffer); - paint.fillRect(drawBuffer.rect(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background))); + paint.fillRect(drawBuffer.rect(), TQBrush(colorGroup().brush(TQColorGroup::Background))); - paint.setPen(tqpalette().active().highlight()); + paint.setPen(palette().active().highlight()); paint.drawLine(1, 2, width(), 2); paint.drawLine(1, 3, width(), 3); paint.drawLine(1, 5, width(), 5); diff --git a/knode/knwidgets.h b/knode/knwidgets.h index 002e31373..e9e782e20 100644 --- a/knode/knwidgets.h +++ b/knode/knwidgets.h @@ -72,7 +72,7 @@ class KNDockWidgetHeaderDrag : public KDockWidgetHeaderDrag TQ_OBJECT public: - KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, + KNDockWidgetHeaderDrag(TQWidget *focusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name = 0); virtual ~KNDockWidgetHeaderDrag(); diff --git a/knode/smtpaccountwidget_base.ui b/knode/smtpaccountwidget_base.ui index b742d4dd7..54ffb5e4a 100644 --- a/knode/smtpaccountwidget_base.ui +++ b/knode/smtpaccountwidget_base.ui @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/knode/utilities.cpp b/knode/utilities.cpp index 2297387bf..49454c0e5 100644 --- a/knode/utilities.cpp +++ b/knode/utilities.cpp @@ -12,7 +12,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <tqlayout.h> +#include <layout.h> #include <tqregexp.h> #include <tqapplication.h> #include <tqcursor.h> @@ -167,7 +167,7 @@ TQFile* KNSaveHelper::getFile(const TQString &dialogTitle) if (url.isLocalFile()) { if (TQFileInfo(url.path()).exists() && (KMessageBox::warningContinueCancel(knGlobals.topWidget, - i18n("<qt>A file named <b>%1</b> already exists.<br>Do you want to replace it?</qt>").tqarg(url.path()), + i18n("<qt>A file named <b>%1</b> already exists.<br>Do you want to replace it?</qt>").arg(url.path()), dialogTitle, i18n("&Replace")) != KMessageBox::Continue)) { return 0; } @@ -293,7 +293,7 @@ int KNHelper::selectDialog(TQWidget *parent, const TQString &caption, const TQSt return ret; } -// **** window tqgeometry managing ********************************************* +// **** window geometry managing ********************************************* void KNHelper::saveWindowSize(const TQString &name, const TQSize &s) { |