summaryrefslogtreecommitdiffstats
path: root/knode
diff options
context:
space:
mode:
Diffstat (limited to 'knode')
-rw-r--r--knode/articlewidget.cpp100
-rw-r--r--knode/headerview.cpp6
-rw-r--r--knode/knaccountmanager.cpp6
-rw-r--r--knode/knarticlefactory.cpp12
-rw-r--r--knode/knarticlefilter.cpp6
-rw-r--r--knode/knarticlemanager.cpp6
-rw-r--r--knode/knarticlewindow.cpp4
-rw-r--r--knode/kncleanup.cpp6
-rw-r--r--knode/kncollectionview.cpp6
-rw-r--r--knode/kncomposer.cpp118
-rw-r--r--knode/knconfig.cpp20
-rw-r--r--knode/knconfigwidgets.cpp18
-rw-r--r--knode/knconvert.cpp6
-rw-r--r--knode/knfilterdialog.cpp2
-rw-r--r--knode/knfiltermanager.cpp2
-rw-r--r--knode/knfolder.cpp6
-rw-r--r--knode/knfoldermanager.cpp4
-rw-r--r--knode/kngroup.cpp14
-rw-r--r--knode/kngroup.h2
-rw-r--r--knode/kngroupbrowser.cpp2
-rw-r--r--knode/kngroupdialog.cpp6
-rw-r--r--knode/kngroupmanager.cpp2
-rw-r--r--knode/kngrouppropdlg.cpp2
-rw-r--r--knode/kngroupselectdialog.cpp4
-rw-r--r--knode/knhdrviewitem.cpp2
-rw-r--r--knode/knmainwidget.cpp156
-rw-r--r--knode/knnntpaccount.cpp2
-rw-r--r--knode/knnntpclient.cpp16
-rw-r--r--knode/knode.cpp6
-rw-r--r--knode/knode_part.cpp4
-rw-r--r--knode/knprotocolclient.cpp6
-rw-r--r--knode/knserverinfo.cpp2
-rw-r--r--knode/knwidgets.cpp2
-rw-r--r--knode/utilities.cpp4
34 files changed, 280 insertions, 280 deletions
diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp
index 301c9bb58..30af3f603 100644
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@@ -98,13 +98,13 @@ ArticleWidget::ArticleWidget( TQWidget *tqparent,
TQHBoxLayout *box = new TQHBoxLayout( this );
mViewer = new KHTMLPart( this, "mViewer" );
box->addWidget( mViewer->widget() );
- mViewer->widget()->setFocusPolicy( WheelFocus );
+ mViewer->widget()->setFocusPolicy( Qt::WheelFocus );
mViewer->setPluginsEnabled( false );
mViewer->setJScriptEnabled( false );
mViewer->setJavaEnabled( false );
mViewer->setMetaRefreshEnabled( false );
mViewer->setOnlyLocalReferences( true );
- mViewer->view()->setFocusPolicy( TQWidget::WheelFocus );
+ mViewer->view()->setFocusPolicy( Qt::WheelFocus );
connect( mViewer->browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)),
TQT_SLOT(slotURLClicked(const KURL&)) );
connect( mViewer, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)),
@@ -134,58 +134,58 @@ ArticleWidget::~ArticleWidget()
void ArticleWidget::initActions()
{
- mSaveAction = KStdAction::save( this, TQT_SLOT(slotSave()), mActionCollection );
+ mSaveAction = KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT(slotSave()), mActionCollection );
mSaveAction->setText( KStdGuiItem::saveAs().text() );
- mPrintAction = KStdAction::print( this, TQT_SLOT(slotPrint()), mActionCollection );
- mCopySelectionAction = KStdAction::copy( this, TQT_SLOT(slotCopySelection()), mActionCollection );
- mSelectAllAction = KStdAction::selectAll( this, TQT_SLOT(slotSelectAll()), mActionCollection );
- mFindAction = KStdAction::tqfind( this, TQT_SLOT(slotFind()), mActionCollection, "find_in_article" );
+ mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), mActionCollection );
+ mCopySelectionAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopySelection()), mActionCollection );
+ mSelectAllAction = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), mActionCollection );
+ mFindAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT(slotFind()), mActionCollection, "find_in_article" );
mFindAction->setText( i18n("F&ind in Article...") );
- mViewSourceAction = new KAction( i18n("&View Source"), Key_V , this,
+ mViewSourceAction = new KAction( i18n("&View Source"), Key_V , TQT_TQOBJECT(this),
TQT_SLOT(slotViewSource()), mActionCollection, "article_viewSource" );
mReplyAction = new KAction( i18n("&Followup to Newsgroup..."), "message_reply",
- Key_R, this, TQT_SLOT(slotReply()), mActionCollection, "article_postReply" );
+ Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotReply()), mActionCollection, "article_postReply" );
mRemailAction = new KAction( i18n("Reply by E&mail..."), "mail_reply",
- Key_A, this, TQT_SLOT(slotRemail()), mActionCollection, "article_mailReply" );
+ Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotRemail()), mActionCollection, "article_mailReply" );
mForwardAction = new KAction( i18n("Forw&ard by Email..."), "mail_forward",
- Key_F, this, TQT_SLOT(slotForward()), mActionCollection, "article_forward" );
+ Key_F, TQT_TQOBJECT(this), TQT_SLOT(slotForward()), mActionCollection, "article_forward" );
mCancelAction = new KAction( i18n("article","&Cancel Article"),
- 0, this, TQT_SLOT(slotCancel()), mActionCollection, "article_cancel" );
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotCancel()), mActionCollection, "article_cancel" );
mSupersedeAction = new KAction(i18n("S&upersede Article"),
- 0, this, TQT_SLOT(slotSupersede()), mActionCollection, "article_supersede" );
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotSupersede()), mActionCollection, "article_supersede" );
mFixedFontToggle = new KToggleAction( i18n("U&se Fixed Font"),
- Key_X ,this, TQT_SLOT(slotToggleFixedFont()), mActionCollection, "view_useFixedFont" );
+ Key_X ,TQT_TQOBJECT(this), TQT_SLOT(slotToggleFixedFont()), mActionCollection, "view_useFixedFont" );
mFancyToggle = new KToggleAction( i18n("Fancy Formating"),
- Key_Y, this, TQT_SLOT(slotToggleFancyFormating()), mActionCollection, "view_fancyFormating" );
- mRot13Toggle = new KToggleAction( i18n("&Unscramble (Rot 13)"), "decrypted", 0 , this,
+ Key_Y, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFancyFormating()), mActionCollection, "view_fancyFormating" );
+ mRot13Toggle = new KToggleAction( i18n("&Unscramble (Rot 13)"), "decrypted", 0 , TQT_TQOBJECT(this),
TQT_SLOT(slotToggleRot13()), mActionCollection, "view_rot13" );
mRot13Toggle->setChecked( false );
KRadioAction *ra;
mHeaderStyleMenu = new KActionMenu( i18n("&Headers"), mActionCollection, "view_headers" );
- ra = new KRadioAction( i18n("&Fancy Headers"), 0, this, TQT_SLOT(slotFancyHeaders()),
+ ra = new KRadioAction( i18n("&Fancy Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFancyHeaders()),
mActionCollection, "view_headers_fancy" );
ra->setExclusiveGroup( "view_headers" );
mHeaderStyleMenu->insert( ra );
- ra = new KRadioAction( i18n("&Standard Headers"), 0, this, TQT_SLOT(slotStandardHeaders()),
+ ra = new KRadioAction( i18n("&Standard Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotStandardHeaders()),
mActionCollection, "view_headers_standard" );
ra->setExclusiveGroup( "view_headers" );
mHeaderStyleMenu->insert( ra );
- ra = new KRadioAction( i18n("&All Headers"), 0, this, TQT_SLOT(slotAllHeaders()),
+ ra = new KRadioAction( i18n("&All Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAllHeaders()),
mActionCollection, "view_headers_all" );
ra->setExclusiveGroup( "view_headers" );
mHeaderStyleMenu->insert( ra );
mAttachmentStyleMenu = new KActionMenu( i18n("&Attachments"), mActionCollection, "view_attachments" );
- ra = new KRadioAction( i18n("&As Icon"), 0, this, TQT_SLOT(slotIconAttachments()),
+ ra = new KRadioAction( i18n("&As Icon"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotIconAttachments()),
mActionCollection, "view_attachments_icon" );
ra->setExclusiveGroup( "view_attachments" );
mAttachmentStyleMenu->insert( ra );
- ra = new KRadioAction( i18n("&Inline"), 0, this, TQT_SLOT(slotInlineAttachments()),
+ ra = new KRadioAction( i18n("&Inline"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInlineAttachments()),
mActionCollection, "view_attachments_inline" );
ra->setExclusiveGroup( "view_attachments" );
mAttachmentStyleMenu->insert( ra );
- ra = new KRadioAction( i18n("&Hide"), 0, this, TQT_SLOT(slotHideAttachments()),
+ ra = new KRadioAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotHideAttachments()),
mActionCollection, "view_attachments_hide" );
ra->setExclusiveGroup( "view_attachments" );
mAttachmentStyleMenu->insert( ra );
@@ -197,22 +197,22 @@ void ArticleWidget::initActions()
mCharsetSelect->setItems( cs );
mCharsetSelect->setCurrentItem( 0 );
connect( mCharsetSelect, TQT_SIGNAL(activated(const TQString&)),TQT_SLOT(slotSetCharset(const TQString&)) );
- mCharsetSelectKeyb = new KAction( i18n("Charset"), Key_C, this,
+ mCharsetSelectKeyb = new KAction( i18n("Charset"), Key_C, TQT_TQOBJECT(this),
TQT_SLOT(slotSetCharsetKeyboard()), mActionCollection, "set_charset_keyboard" );
- new KAction( i18n("&Open URL"), "fileopen", 0, this, TQT_SLOT(slotOpenURL()),
+ new KAction( i18n("&Open URL"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenURL()),
mActionCollection, "open_url" );
- new KAction( i18n("&Copy Link Address"), "editcopy", 0, this, TQT_SLOT( slotCopyURL()),
+ new KAction( i18n("&Copy Link Address"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL()),
mActionCollection, "copy_url" );
- new KAction( i18n("&Bookmark This Link"), "bookmark_add", 0, this, TQT_SLOT(slotAddBookmark()),
+ new KAction( i18n("&Bookmark This Link"), "bookmark_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmark()),
mActionCollection, "add_bookmark" );
- new KAction( i18n("&Add to Address Book"), 0, this, TQT_SLOT(slotAddToAddressBook()),
+ new KAction( i18n("&Add to Address Book"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddToAddressBook()),
mActionCollection, "add_addr_book" );
- new KAction( i18n("&Open in Address Book"), 0, this, TQT_SLOT(slotOpenInAddressBook()),
+ new KAction( i18n("&Open in Address Book"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenInAddressBook()),
mActionCollection, "openin_addr_book" );
- new KAction( i18n("&Open Attachment"), "fileopen", 0, this, TQT_SLOT(slotOpenAttachment()),
+ new KAction( i18n("&Open Attachment"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenAttachment()),
mActionCollection, "open_attachment" );
- new KAction( i18n("&Save Attachment As..."), "filesaveas", 0, this, TQT_SLOT(slotSaveAttachment()),
+ new KAction( i18n("&Save Attachment As..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachment()),
mActionCollection, "save_attachment" );
}
@@ -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").arg(mAttachmentStyle).latin1() ) );
+ ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_attachments_%1").tqarg(mAttachmentStyle).latin1() ) );
ra->setChecked( true );
- ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_headers_%1").arg(mHeaderStyle).latin1() ) );
+ ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_headers_%1").tqarg(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>")
- .arg( i18n("Unknown charset. Default charset is used instead.") );
+ .tqarg( i18n("Unknown charset. Default charset is used instead.") );
kdDebug(5003) << k_funcinfo << "unknown charset = " << text->contentType()->charset() << endl;
}
@@ -473,7 +473,7 @@ void ArticleWidget::displayArticle()
text->decodedText( htmlTxt, true, cfgMgr->readNewsViewer()->removeTrailingNewlines() );
if ( mShowHtml ) {
// strip </html> & </body>
- int i = kMin( htmlTxt.findRev( "</html>", -1, false ), htmlTxt.findRev( "</body>", -1, false ) );
+ int i = kMin( htmlTxt.tqfindRev( "</html>", -1, false ), htmlTxt.tqfindRev( "</body>", -1, false ) );
if ( i >= 0 )
htmlTxt.truncate( i );
html += htmlTxt;
@@ -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>" )
- .arg( toHtmlString( header->type(), None ) + ": " )
- .arg( toHtmlString( header->asUnicodeString() , ParseURL ) );
+ .tqarg( toHtmlString( header->type(), None ) + ": " )
+ .tqarg( 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>")
- .arg( KPIM::getEmailAddress( hb->asUnicodeString() ) )
- .arg( toHtmlString( hb->asUnicodeString(), None ) );
+ .tqarg( KPIM::getEmailAddress( hb->asUnicodeString() ) )
+ .tqarg( toHtmlString( hb->asUnicodeString(), None ) );
KMime::Headers::Base *orgHdr = mArticle->getHeaderByType( "Organization" );
if ( orgHdr && !orgHdr->isEmpty() ) {
headerHtml += "&nbsp;&nbsp;(";
@@ -636,7 +636,7 @@ void ArticleWidget::displayHeader()
if ( !xfhead.isEmpty() ) {
KPIM::KXFace xf;
xface = TQString::tqfromLatin1( "<div class=\"senderpic\"><img src=\"%1\" width=\"48\" height=\"48\"/></div>" )
- .arg( imgToDataUrl( xf.toImage( xfhead ), "PNG" ) );
+ .tqarg( imgToDataUrl( xf.toImage( xfhead ), "PNG" ) );
}
// fancy header style
@@ -660,7 +660,7 @@ 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>" ).arg( i18n("References:") );
+ html += TQString( "<b>%1</b>" ).tqarg( i18n("References:") );
while ( i <= refCnt ) {
html += " <a href=\"news:" + TQString::tqfromLatin1( id ) + "\">" + TQString::number( i ) + "</a>";
@@ -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." )
- .arg( signerKey );
+ .tqarg( 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)." )
- .arg( signer )
- .arg( signerKey );
+ .tqarg( signer )
+ .tqarg( TQString(signerKey) );
else
- message += i18n( "Message was signed by %1." ).arg( signer );
+ message += i18n( "Message was signed by %1." ).tqarg( signer );
message += "<br/>";
if( block->goodSignature() ) {
@@ -916,7 +916,7 @@ TQString ArticleWidget::imgToDataUrl( const TQImage &image, const char* fmt )
buffer.open( IO_WriteOnly );
image.save( &buffer, fmt );
return TQString::tqfromLatin1("data:image/%1;base64,%2")
- .arg( fmt, KCodecs::base64Encode( ba ) );
+ .tqarg( fmt, TQString(KCodecs::base64Encode( ba )) );
}
@@ -989,7 +989,7 @@ TQString ArticleWidget::writeAttachmentToTempFile( KMime::Content *att, int part
// strip off a leading path
KMime::Headers::ContentType* ct = att->contentType();
TQString attName = ct->name();
- int slashPos = attName.findRev( '/' );
+ int slashPos = attName.tqfindRev( '/' );
if( -1 != slashPos )
attName = attName.mid( slashPos + 1 );
if( attName.isEmpty() )
@@ -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")
- .arg( job->errorString() ) );
+ .tqarg( job->errorString() ) );
else
new KNSourceViewWindow( a->head() + "\n" + a->body() );
}
@@ -1408,8 +1408,8 @@ void ArticleWidget::slotCopyURL()
address = mCurrentURL.path();
else
address = mCurrentURL.url();
- TQApplication::clipboard()->setText( address, TQClipboard::Clipboard );
- TQApplication::clipboard()->setText( address, TQClipboard::Selection );
+ TQApplication::tqclipboard()->setText( address, TQClipboard::Clipboard );
+ TQApplication::tqclipboard()->setText( address, TQClipboard::Selection );
}
void ArticleWidget::slotAddBookmark()
@@ -1472,7 +1472,7 @@ void ArticleWidget::focusOutEvent( TQFocusEvent *e )
bool ArticleWidget::eventFilter( TQObject *o, TQEvent *e )
{
- if ( e->type() == TQEvent::KeyPress && (static_cast<TQKeyEvent*>(e)->key() == Key_Tab) ) {
+ if ( e->type() == TQEvent::KeyPress && (TQT_TQKEYEVENT(e)->key() == Key_Tab) ) {
emit focusChangeRequest( this );
if ( !hasFocus() ) // focusChangeRequest was successful
return true;
diff --git a/knode/headerview.cpp b/knode/headerview.cpp
index 0007ffe67..998d6893b 100644
--- a/knode/headerview.cpp
+++ b/knode/headerview.cpp
@@ -540,7 +540,7 @@ void KNHeaderView::slotSizeChanged( int section, int, int newSize )
bool KNHeaderView::eventFilter(TQObject *o, TQEvent *e)
{
- if ((e->type() == TQEvent::KeyPress) && (static_cast<TQKeyEvent*>(e)->key() == Key_Tab)) {
+ if ((e->type() == TQEvent::KeyPress) && (TQT_TQKEYEVENT(e)->key() == Key_Tab)) {
emit(focusChangeRequest(this));
if (!hasFocus()) // focusChangeRequest was successful
return true;
@@ -548,10 +548,10 @@ bool KNHeaderView::eventFilter(TQObject *o, TQEvent *e)
// right click on header
if ( e->type() == TQEvent::MouseButtonPress &&
- static_cast<TQMouseEvent*>(e)->button() == RightButton &&
+ TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton &&
o->isA(TQHEADER_OBJECT_NAME_STRING) )
{
- mPopup->popup( static_cast<TQMouseEvent*>(e)->globalPos() );
+ mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() );
return true;
}
diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp
index af319731f..b62679a2f 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").arg(id))!=-1)
+ while (entries.tqfindIndex(TQString("nntp.%1").tqarg(id))!=-1)
++id;
a->setId(id);
- dir = locateLocal("data",TQString("knode/nntp.%1/").arg(a->id()));
+ dir = locateLocal("data",TQString("knode/nntp.%1/").tqarg(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/").arg(a->id()));
+ dir.rmdir(TQString("nntp.%1/").tqarg(a->id()));
}
if(c_urrentAccount==a) setCurrentAccount(0);
diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp
index 1421b405e..37c1b4961 100644
--- a/knode/knarticlefactory.cpp
+++ b/knode/knarticlefactory.cpp
@@ -306,7 +306,7 @@ void KNArticleFactory::createForward(KNArticle *a)
//--------------------------- <Body> -----------------------------
- TQString fwd = TQString("\n--------------- %1\n\n").arg(i18n("Forwarded message (begin)"));
+ TQString fwd = TQString("\n--------------- %1\n\n").tqarg(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").arg(i18n("Forwarded message (end)"));
+ fwd += TQString("\n--------------- %1\n").tqarg(i18n("Forwarded message (end)"));
//--------------------------- </Body> ----------------------------
@@ -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>")
- .arg(id->getSigGeneratorStdErr()));
+ .tqarg(id->getSigGeneratorStdErr()));
mCompList.append( com );
connect(com, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*)));
@@ -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>")
- .arg(id->getSigGeneratorStdErr()));
+ .tqarg(id->getSigGeneratorStdErr()));
}
else
sig=TQString();
@@ -1070,8 +1070,8 @@ KNSendErrorDialog::KNSendErrorDialog()
TQVBox *page = makeVBoxMainWidget();
- 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);
+ 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);
j_obs=new KNDialogListBox(true, page);
e_rror=new TQLabel(TQString(), page);
diff --git a/knode/knarticlefilter.cpp b/knode/knarticlefilter.cpp
index 56460a34f..359985198 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" ).arg(i_d) ) );
+ TQString fname(locate("data",TQString( "knode/filters/%1.fltr" ).tqarg(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").arg(i_d) ) );
+ TQString fname(locate("data",TQString( "knode/filters/%1.fltr").tqarg(i_d) ) );
if (fname.isNull())
return;
@@ -141,7 +141,7 @@ void KNArticleFilter::save()
KNHelper::displayInternalFileError();
return;
}
- KSimpleConfig conf(dir+TQString("%1.fltr").arg(i_d));
+ KSimpleConfig conf(dir+TQString("%1.fltr").tqarg(i_d));
conf.setGroup("GENERAL");
conf.writeEntry("name", TQString(n_ame));
diff --git a/knode/knarticlemanager.cpp b/knode/knarticlemanager.cpp
index 4e97c2d2b..625f22f06 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")
- .arg(name).arg(g_roup->newCount()).arg(displCnt),SB_GROUP);
+ .tqarg(name).tqarg(g_roup->newCount()).tqarg(displCnt),SB_GROUP);
if(f_ilter)
- knGlobals.seStatusMsg(i18n(" Filter: %1").arg(f_ilter->translatedName()), SB_FILTER);
+ knGlobals.seStatusMsg(i18n(" Filter: %1").tqarg(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")
- .arg(f_older->name()).arg(displCnt), SB_GROUP);
+ .tqarg(f_older->name()).tqarg(displCnt), SB_GROUP);
knGlobals.seStatusMsg(TQString(), SB_FILTER);
} else {
knGlobals.seStatusMsg(TQString(), SB_GROUP);
diff --git a/knode/knarticlewindow.cpp b/knode/knarticlewindow.cpp
index 05b4f83ae..aef3aab0c 100644
--- a/knode/knarticlewindow.cpp
+++ b/knode/knarticlewindow.cpp
@@ -101,10 +101,10 @@ KNArticleWindow::KNArticleWindow(KNArticle *art)
mInstances.append( this );
// file menu
- KStdAction::close( this, TQT_SLOT(close()), actionCollection() );
+ KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() );
// settings menu
- KStdAction::preferences(knGlobals.top, TQT_SLOT(slotSettings()), actionCollection());
+ KStdAction::preferences(TQT_TQOBJECT(knGlobals.top), TQT_SLOT(slotSettings()), actionCollection());
KAccel *accel = new KAccel( this );
artW->setCharsetKeyboardAction()->plugAccel( accel );
diff --git a/knode/kncleanup.cpp b/knode/kncleanup.cpp
index 3e79b4a62..28993e7ce 100644
--- a/knode/kncleanup.cpp
+++ b/knode/kncleanup.cpp
@@ -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>").arg( (*it)->name() ) );
+ d_lg->showMessage( i18n("Deleting expired articles in <b>%1</b>").tqarg( (*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>").arg( (*it)->name() ) );
+ d_lg->showMessage( i18n("Compacting folder <b>%1</b>").tqarg( (*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").arg(g->groupname()).arg(delCnt).arg(leftCnt));
+ i18n("<b>%1</b><br>expired: %2<br>left: %3").tqarg(g->groupname()).tqarg(delCnt).tqarg(leftCnt));
}
diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp
index ef97c653e..1026e642d 100644
--- a/knode/kncollectionview.cpp
+++ b/knode/kncollectionview.cpp
@@ -421,7 +421,7 @@ void KNCollectionView::updatePopup() const
bool KNCollectionView::eventFilter(TQObject *o, TQEvent *e)
{
- if ((e->type() == TQEvent::KeyPress) && (static_cast<TQKeyEvent*>(e)->key() == Key_Tab)) {
+ if ((e->type() == TQEvent::KeyPress) && (TQT_TQKEYEVENT(e)->key() == Key_Tab)) {
emit(focusChangeRequest(this));
if (!hasFocus()) // focusChangeRequest was successful
return true;
@@ -429,10 +429,10 @@ bool KNCollectionView::eventFilter(TQObject *o, TQEvent *e)
// header popup menu
if ( e->type() == TQEvent::MouseButtonPress &&
- static_cast<TQMouseEvent*>(e)->button() == RightButton &&
+ TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton &&
o->isA(TQHEADER_OBJECT_NAME_STRING) )
{
- mPopup->popup( static_cast<TQMouseEvent*>(e)->globalPos() );
+ mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() );
return true;
}
diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp
index 4e928a495..160ab38e5 100644
--- a/knode/kncomposer.cpp
+++ b/knode/kncomposer.cpp
@@ -205,70 +205,70 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString &
//------------------------------- <Actions> --------------------------------------
//file menu
- new KAction(i18n("&Send Now"),"mail_send", CTRL + Key_Return , this,
+ new KAction(i18n("&Send Now"),"mail_send", CTRL + Key_Return , TQT_TQOBJECT(this),
TQT_SLOT(slotSendNow()), actionCollection(), "send_now");
- new KAction(i18n("Send &Later"), "queue", 0, this,
+ new KAction(i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotSendLater()), actionCollection(), "send_later");
- new KAction(i18n("Save as &Draft"),"filesave", 0 , this,
+ new KAction(i18n("Save as &Draft"),"filesave", 0 , TQT_TQOBJECT(this),
TQT_SLOT(slotSaveAsDraft()), actionCollection(), "save_as_draft");
- new KAction(i18n("D&elete"),"editdelete", 0 , this,
+ new KAction(i18n("D&elete"),"editdelete", 0 , TQT_TQOBJECT(this),
TQT_SLOT(slotArtDelete()), actionCollection(), "art_delete");
- KStdAction::close(this, TQT_SLOT(close()),actionCollection());
+ KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()),actionCollection());
//edit menu
- KStdAction::undo(this, TQT_SLOT(slotUndo()), actionCollection());
- KStdAction::redo(this, TQT_SLOT(slotRedo()), actionCollection());
+ KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actionCollection());
+ KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actionCollection());
- KStdAction::cut(this, TQT_SLOT(slotCut()), actionCollection());
+ KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), actionCollection());
- KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection());
+ KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actionCollection());
- KStdAction::pasteText(this, TQT_SLOT(slotPaste()), actionCollection());
+ KStdAction::pasteText(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), actionCollection());
- new KAction(i18n("Paste as &Quotation"), 0, v_iew->e_dit,
+ new KAction(i18n("Paste as &Quotation"), 0, TQT_TQOBJECT(v_iew->e_dit),
TQT_SLOT(slotPasteAsQuotation()), actionCollection(), "paste_quoted");
- KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), actionCollection());
+ KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection());
- KStdAction::tqfind(v_iew->e_dit, TQT_SLOT(slotFind()), actionCollection());
- KStdAction::findNext(v_iew->e_dit, TQT_SLOT(slotSearchAgain()), actionCollection());
+ KStdAction::find(TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotFind()), actionCollection());
+ KStdAction::findNext(TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotSearchAgain()), actionCollection());
- KStdAction::tqreplace(v_iew->e_dit, TQT_SLOT(slotReplace()), actionCollection());
+ KStdAction::replace(TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotReplace()), actionCollection());
//attach menu
- new KAction(i18n("Append &Signature"), 0 , this, TQT_SLOT(slotAppendSig()),
+ new KAction(i18n("Append &Signature"), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotAppendSig()),
actionCollection(), "append_signature");
- new KAction(i18n("&Insert File..."), 0, this, TQT_SLOT(slotInsertFile()),
+ new KAction(i18n("&Insert File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertFile()),
actionCollection(), "insert_file");
- new KAction(i18n("Insert File (in a &box)..."), 0, this, TQT_SLOT(slotInsertFileBoxed()),
+ new KAction(i18n("Insert File (in a &box)..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertFileBoxed()),
actionCollection(), "insert_file_boxed");
- new KAction(i18n("Attach &File..."), "attach", 0, this, TQT_SLOT(slotAttachFile()),
+ new KAction(i18n("Attach &File..."), "attach", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachFile()),
actionCollection(), "attach_file");
a_ctPGPsign = new KToggleAction(i18n("Sign Article with &PGP"),
"signature", 0,
actionCollection(), "sign_article");
- a_ctRemoveAttachment = new KAction(i18n("&Remove"), 0, this,
+ a_ctRemoveAttachment = new KAction(i18n("&Remove"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotRemoveAttachment()), actionCollection(), "remove_attachment");
- a_ctAttachmentProperties = new KAction(i18n("&Properties"), 0, this,
+ a_ctAttachmentProperties = new KAction(i18n("&Properties"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotAttachmentProperties()), actionCollection(), "attachment_properties");
//options menu
- a_ctDoPost = new KToggleAction(i18n("Send &News Article"), "filenew", 0 , this,
+ a_ctDoPost = new KToggleAction(i18n("Send &News Article"), "filenew", 0 , TQT_TQOBJECT(this),
TQT_SLOT(slotToggleDoPost()), actionCollection(), "send_news");
- a_ctDoMail = new KToggleAction(i18n("Send E&mail"), "mail_generic" , 0 , this,
+ a_ctDoMail = new KToggleAction(i18n("Send E&mail"), "mail_generic" , 0 , TQT_TQOBJECT(this),
TQT_SLOT(slotToggleDoMail()), actionCollection(), "send_mail");
a_ctSetCharset = new KSelectAction(i18n("Set &Charset"), 0, actionCollection(), "set_charset");
@@ -277,50 +277,50 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString &
connect(a_ctSetCharset, TQT_SIGNAL(activated(const TQString&)),
this, TQT_SLOT(slotSetCharset(const TQString&)));
- a_ctSetCharsetKeyb = new KAction(i18n("Set Charset"), 0, this,
+ a_ctSetCharsetKeyb = new KAction(i18n("Set Charset"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotSetCharsetKeyboard()), actionCollection(), "set_charset_keyboard");
- a_ctWordWrap = new KToggleAction(i18n("&Word Wrap"), 0 , this,
+ a_ctWordWrap = new KToggleAction(i18n("&Word Wrap"), 0 , TQT_TQOBJECT(this),
TQT_SLOT(slotToggleWordWrap()), actionCollection(), "toggle_wordwrap");
//tools menu
- new KAction(i18n("Add &Quote Characters"), 0, v_iew->e_dit,
+ new KAction(i18n("Add &Quote Characters"), 0, TQT_TQOBJECT(v_iew->e_dit),
TQT_SLOT(slotAddQuotes()), actionCollection(), "tools_quote");
- new KAction(i18n("&Remove Quote Characters"), 0, v_iew->e_dit,
+ new KAction(i18n("&Remove Quote Characters"), 0, TQT_TQOBJECT(v_iew->e_dit),
TQT_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote");
- new KAction(i18n("Add &Box"), 0, v_iew->e_dit,
+ new KAction(i18n("Add &Box"), 0, TQT_TQOBJECT(v_iew->e_dit),
TQT_SLOT(slotAddBox()), actionCollection(), "tools_box");
- new KAction(i18n("Re&move Box"), 0, v_iew->e_dit,
+ new KAction(i18n("Re&move Box"), 0, TQT_TQOBJECT(v_iew->e_dit),
TQT_SLOT(slotRemoveBox()), actionCollection(), "tools_unbox");
- KAction *undoRewrap = new KAction(i18n("Get &Original Text (not re-wrapped)"), 0, this,
+ KAction *undoRewrap = new KAction(i18n("Get &Original Text (not re-wrapped)"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotUndoRewrap()), actionCollection(), "tools_undoRewrap");
undoRewrap->setEnabled(!u_nwraped.isNull());
- KAction *rot13 = new KAction(i18n("S&cramble (Rot 13)"), "encrypted", 0, v_iew->e_dit,
+ KAction *rot13 = new KAction(i18n("S&cramble (Rot 13)"), "encrypted", 0, TQT_TQOBJECT(v_iew->e_dit),
TQT_SLOT(slotRot13()), actionCollection(), "tools_rot13");
rot13->setEnabled(false);
connect(v_iew->e_dit, TQT_SIGNAL(copyAvailable(bool)), rot13, TQT_SLOT(setEnabled(bool)));
- a_ctExternalEditor = new KAction(i18n("Start &External Editor"), "run", 0, this,
+ a_ctExternalEditor = new KAction(i18n("Start &External Editor"), "run", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotExternalEditor()), actionCollection(), "external_editor");
- a_ctSpellCheck = KStdAction::spelling (this, TQT_SLOT(slotSpellcheck()), actionCollection());
+ a_ctSpellCheck = KStdAction::spelling (TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheck()), actionCollection());
//settings menu
createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true);
- KStdAction::keyBindings(this, TQT_SLOT(slotConfKeys()), actionCollection());
+ KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfKeys()), actionCollection());
- KStdAction::configureToolbars(this, TQT_SLOT(slotConfToolbar()), actionCollection());
+ KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbar()), actionCollection());
- KStdAction::preferences(knGlobals.top, TQT_SLOT(slotSettings()), actionCollection());
+ KStdAction::preferences(TQT_TQOBJECT(knGlobals.top), TQT_SLOT(slotSettings()), actionCollection());
a_ccel=new KAccel(this);
a_ctSetCharsetKeyb->plugAccel(a_ccel);
@@ -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").arg(boxTitle);
+ temp = TQString::tqfromLatin1(",----[ %1 ]\n").tqarg(boxTitle);
if (box && (v_iew->e_dit->wordWrap()!=TQMultiLineEdit::NoWrap)) {
int wrapAt = v_iew->e_dit->wrapColumnOrWidth();
@@ -1327,7 +1327,7 @@ void KNComposer::slotSpellcheck()
a_ctExternalEditor->setEnabled(false);
a_ctSpellCheck->setEnabled(false);
- s_pellChecker = new KSpell(this, i18n("Spellcheck"), this, TQT_SLOT(slotSpellStarted(KSpell *)));
+ s_pellChecker = new KSpell(TQT_TQWIDGET(this), i18n("Spellcheck"), TQT_TQOBJECT(this), TQT_SLOT(slotSpellStarted(KSpell *)));
TQStringList l = KSpellingHighlighter::personalWords();
for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) {
s_pellChecker->addPersonal( *it );
@@ -1374,18 +1374,18 @@ void KNComposer::slotUpdateStatusBar()
else
overwriteDesc = i18n(" INS ");
- statusBar()->changeItem(i18n(" Type: %1 ").arg(typeDesc), 1);
- statusBar()->changeItem(i18n(" Charset: %1 ").arg(c_harset), 2);
+ statusBar()->changeItem(i18n(" Type: %1 ").tqarg(typeDesc), 1);
+ statusBar()->changeItem(i18n(" Charset: %1 ").tqarg(TQString(c_harset)), 2);
statusBar()->changeItem(overwriteDesc, 3);
- 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);
+ 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);
}
void KNComposer::slotUpdateCursorPos()
{
- 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);
+ 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);
}
@@ -1643,7 +1643,7 @@ void KNComposer::slotSpellFinished()
{
a_ctExternalEditor->setEnabled(true);
a_ctSpellCheck->setEnabled(true);
- KSpell::spelltqStatus status=s_pellChecker->status();
+ KSpell::spellStatus status=s_pellChecker->status();
delete s_pellChecker;
s_pellChecker=0;
@@ -1725,7 +1725,7 @@ TQPopupMenu * KNComposer::popupMenu( const TQString& name )
KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n)
- : TQSplitter(TQSplitter::Vertical, composer, n), a_ttWidget(0), a_ttView(0), v_iewOpen(false)
+ : TQSplitter(Qt::Vertical, composer, n), a_ttWidget(0), a_ttView(0), v_iewOpen(false)
{
TQWidget *main=new TQWidget(this);
@@ -1781,10 +1781,10 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n)
KConfig *config = knGlobals.config();
KConfigGroupSaver saver(config, "VISUAL_APPEARANCE");
- 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 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 col1 = config->readColorEntry( "ForegroundColor", &defaultForeground );
TQColor col2 = config->readColorEntry( "quote3Color", &defaultColor3 );
TQColor col3 = config->readColorEntry( "quote2Color", &defaultColor2 );
@@ -1798,7 +1798,7 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n)
TQVBoxLayout *notL=new TQVBoxLayout(e_dit);
notL->addStretch(1);
- n_otification=new TQGroupBox(2, TQt::Horizontal, e_dit);
+ n_otification=new TQGroupBox(2, Qt::Horizontal, e_dit);
l=new TQLabel(i18n("You are currently editing the article body\nin an external editor. To continue, you have\nto close the external editor."), n_otification);
c_ancelEditorBtn=new TQPushButton(i18n("&Kill External Editor"), n_otification);
n_otification->setFrameStyle(TQFrame::Panel | TQFrame::Raised);
@@ -2011,7 +2011,7 @@ KNComposer::Editor::~Editor()
//-----------------------------------------------------------------------------
bool KNComposer::Editor::eventFilter(TQObject*o, TQEvent* e)
{
- if (o == this)
+ if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this))
KCursor::autoHideEventFilter(o, e);
if (e->type() == TQEvent::KeyPress)
@@ -2046,7 +2046,7 @@ bool KNComposer::Editor::eventFilter(TQObject*o, TQEvent* e)
if( !paraText.at(charPos).isSpace() )
{
//Get word right clicked on
- firstSpace = paraText.findRev( m_bound, charPos ) + 1;
+ firstSpace = paraText.tqfindRev( m_bound, charPos ) + 1;
lastSpace = paraText.tqfind( m_bound, charPos );
if( lastSpace == -1 )
lastSpace = paraText.length();
@@ -2152,7 +2152,7 @@ TQStringList KNComposer::Editor::processedText()
void KNComposer::Editor::slotPasteAsQuotation()
{
- TQString s = TQApplication::clipboard()->text();
+ TQString s = TQApplication::tqclipboard()->text();
if (!s.isEmpty()) {
for (int i=0; (uint)i<s.length(); i++) {
if ( s[i] < ' ' && s[i] != '\n' && s[i] != '\t' )
@@ -2177,7 +2177,7 @@ void KNComposer::Editor::slotSearchAgain()
void KNComposer::Editor::slotReplace()
{
- tqreplace();
+ replace();
}
@@ -2233,7 +2233,7 @@ void KNComposer::Editor::slotAddBox()
} else {
int l = currentLine();
int c = currentColumn();
- TQString s = TQString::tqfromLatin1(",----[ ]\n| %1\n`----").arg(textLine(l));
+ TQString s = TQString::tqfromLatin1(",----[ ]\n| %1\n`----").tqarg(textLine(l));
insertLine(s,l);
removeLine(l+3);
setCursorPosition(l+1,c+2);
@@ -2398,7 +2398,7 @@ void KNComposer::Editor::contentsContextMenuEvent( TQContextMenuEvent */*e*/ )
}
else
{
- spell = new KSpell(this, i18n("Spellcheck"), this, TQT_SLOT(slotSpellStarted(KSpell *)));
+ spell = new KSpell(this, i18n("Spellcheck"), TQT_TQOBJECT(this), TQT_SLOT(slotSpellStarted(KSpell *)));
TQStringList l = KSpellingHighlighter::personalWords();
for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) {
spell->addPersonal( *it );
@@ -2423,7 +2423,7 @@ void KNComposer::Editor::slotSpellDone(const TQString &/*newtext*/)
void KNComposer::Editor::slotSpellFinished()
{
- KSpell::spelltqStatus status=spell->status();
+ KSpell::spellStatus status=spell->status();
delete spell;
spell=0;
@@ -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>").arg(a->name()), fileGB), 1,1, TQt::AlignLeft);
+ fileL->addWidget(new TQLabel(TQString("<b>%1</b>").tqarg(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);
diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp
index a75343867..608e625a9 100644
--- a/knode/knconfig.cpp
+++ b/knode/knconfig.cpp
@@ -452,7 +452,7 @@ TQColor KNConfig::Appearance::defaultColor(int i) const
switch(i) {
case background:
- return kapp->palette().active().base();
+ return kapp->tqpalette().active().base();
case alternateBackground:
return KGlobalSettings::alternateBackgroundColor();
@@ -466,13 +466,13 @@ TQColor KNConfig::Appearance::defaultColor(int i) const
case normalText:
case unreadThread:
- return kapp->palette().active().text();
+ return kapp->tqpalette().active().text();
case url:
return KGlobalSettings::linkColor();
case readThread:
- return kapp->palette().disabled().text();
+ return kapp->tqpalette().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->palette().disabled().text();
+ return kapp->tqpalette().disabled().text();
}
@@ -801,7 +801,7 @@ void KNConfig::DisplayedHeaders::remove(KNDisplayedHeader *h)
void KNConfig::DisplayedHeaders::up(KNDisplayedHeader *h)
{
- int idx = mHeaderList.findIndex( h );
+ int idx = mHeaderList.tqfindIndex( h );
if ( idx != -1 ) {
mHeaderList.remove( mHeaderList.at( idx ) );
mHeaderList.insert( mHeaderList.at( idx - 1 ), h );
@@ -812,7 +812,7 @@ void KNConfig::DisplayedHeaders::up(KNDisplayedHeader *h)
void KNConfig::DisplayedHeaders::down(KNDisplayedHeader *h)
{
- int idx = mHeaderList.findIndex( h );
+ int idx = mHeaderList.tqfindIndex( h );
if ( idx != -1 ) {
mHeaderList.remove( mHeaderList.at( idx ) );
mHeaderList.insert( mHeaderList.at( idx + 1 ), h );
@@ -1175,10 +1175,10 @@ bool KNConfig::Cleanup::expireToday()
return false;
TQDate today = TQDate::tqcurrentDate();
- if (mLastExpDate == today)
+ if (mLastExpDate == TQDateTime(today))
return false;
- return (mLastExpDate.daysTo( today ) >= e_xpireInterval);
+ return (mLastExpDate.daysTo( TQDateTime(today) ) >= e_xpireInterval);
}
@@ -1194,10 +1194,10 @@ bool KNConfig::Cleanup::compactToday()
return false;
TQDate today = TQDate::tqcurrentDate();
- if (mLastCompDate == today)
+ if (mLastCompDate == TQDateTime(today))
return false;
- return (mLastCompDate.daysTo( today ) >= c_ompactInterval);
+ return (mLastCompDate.daysTo( TQDateTime(today) ) >= c_ompactInterval);
}
diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp
index e02338fa6..dd7012c2c 100644
--- a/knode/knconfigwidgets.cpp
+++ b/knode/knconfigwidgets.cpp
@@ -294,7 +294,7 @@ KNConfig::NntpAccountListWidget::NntpAccountListWidget(TQWidget *p, const char *
topL->addMultiCellWidget(l_box, 0,4, 0,0);
// info box
- TQGroupBox *gb = new TQGroupBox(2,TQt::Vertical,TQString(),this);
+ TQGroupBox *gb = new TQGroupBox(2,Qt::Vertical,TQString(),this);
topL->addWidget(gb,5,0);
s_erverInfo = new TQLabel(gb);
@@ -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").arg(it->account->server()));
- p_ortInfo->setText(i18n("Port: %1").arg(it->account->port()));
+ s_erverInfo->setText(i18n("Server: %1").tqarg(it->account->server()));
+ p_ortInfo->setText(i18n("Port: %1").tqarg(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").arg(a->name()):i18n("New Account"),
+ : KDialogBase(Tabbed, (a->id()!=-1)? i18n("Properties of %1").tqarg(a->name()):i18n("New Account"),
Ok|Cancel|Help, Ok, p, n),
a_ccount(a)
{
@@ -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]").arg(f_ont.family()).arg(f_ont.pointSize());
+ fontInfo = TQString("[%1 %2]").tqarg(f_ont.family()).tqarg(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]").arg(f_ont.family()).arg(f_ont.pointSize());
+ fontInfo = TQString("[%1 %2]").tqarg(f_ont.family()).tqarg(f_ont.pointSize());
}
@@ -2158,7 +2158,7 @@ TQString KNConfig::XHeaderConfDialog::result()
TQString value = v_alue->text();
// just in case someone pastes a newline
value.tqreplace( '\n', ' ' );
- return TQString( "X-%1: %2" ).arg( n_ame->text() ).arg( value );
+ return TQString( "X-%1: %2" ).tqarg( n_ame->text() ).tqarg( value );
}
@@ -2372,7 +2372,7 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *tqpar
}
mExpGroup = new TQGroupBox( i18n("Newsgroup Cleanup Settings"), this );
- mExpGroup->setColumnLayout(0, TQt::Vertical );
+ mExpGroup->setColumnLayout(0, Qt::Vertical );
mExpGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
mExpGroup->tqlayout()->setMargin( KDialog::marginHint() );
top->addWidget( mExpGroup );
@@ -2481,7 +2481,7 @@ KNConfig::CleanupWidget::CleanupWidget( TQWidget *p, const char *n ) :
// === folders =========================================================
TQGroupBox *foldersB=new TQGroupBox(i18n("Folders"), this);
- foldersB->setColumnLayout(0, TQt::Vertical );
+ foldersB->setColumnLayout(0, Qt::Vertical );
foldersB->tqlayout()->setSpacing( KDialog::spacingHint() );
foldersB->tqlayout()->setMargin( KDialog::marginHint() );
diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp
index e925c26d4..da039f54a 100644
--- a/knode/knconvert.cpp
+++ b/knode/knconvert.cpp
@@ -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.").arg(KNODE_VERSION), w_1);
+will be created before the conversion starts.").tqarg(KNODE_VERSION), w_1);
w1L->addMultiCellWidget(l1, 0,0, 0,2);
c_reateBkup=new TQCheckBox(i18n("Create backup of old data"), w_1);
@@ -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").arg(b_ackupPath->text()));
+ l_og.append(i18n("created backup of the old data-files in %1").tqarg(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.at(readBytes)='\0'; //terminate string;
+ buff.tqat(readBytes)='\0'; //terminate string;
//remove "X-KNode-Overview"
int pos=buff.tqfind('\n');
diff --git a/knode/knfilterdialog.cpp b/knode/knfilterdialog.cpp
index 0cd0b2ad6..399c0078b 100644
--- a/knode/knfilterdialog.cpp
+++ b/knode/knfilterdialog.cpp
@@ -31,7 +31,7 @@
KNFilterDialog::KNFilterDialog(KNArticleFilter *f, TQWidget *tqparent, const char *name)
- : KDialogBase(Plain, (f->id()==-1)? i18n("New Filter"):i18n("Properties of %1").arg(f->name()),
+ : KDialogBase(Plain, (f->id()==-1)? i18n("New Filter"):i18n("Properties of %1").tqarg(f->name()),
Ok|Cancel|Help, Ok, tqparent, name),
fltr(f)
{
diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp
index 0d01698e1..70f00b711 100644
--- a/knode/knfiltermanager.cpp
+++ b/knode/knfiltermanager.cpp
@@ -369,7 +369,7 @@ void KNFilterManager::slotShowFilterChooser()
int currentItem=0;
if (currFilter)
- currentItem=ids.findIndex(currFilter->id());
+ currentItem=ids.tqfindIndex(currFilter->id());
if (currentItem==-1)
currentItem=0;
diff --git a/knode/knfolder.cpp b/knode/knfolder.cpp
index 0044abc8b..4984b69a2 100644
--- a/knode/knfolder.cpp
+++ b/knode/knfolder.cpp
@@ -44,7 +44,7 @@ KNFolder::KNFolder()
KNFolder::KNFolder(int id, const TQString &name, KNFolder *tqparent)
: KNArticleCollection(tqparent), i_d(id), i_ndexDirty(false), w_asOpen(true)
{
- TQString fname=path()+TQString("custom_%1").arg(i_d);
+ TQString fname=path()+TQString("custom_%1").tqarg(i_d);
n_ame = name;
m_boxFile.setName(fname+".mbox");
@@ -63,7 +63,7 @@ KNFolder::KNFolder(int id, const TQString &name, KNFolder *tqparent)
KNFolder::KNFolder(int id, const TQString &name, const TQString &prefix, KNFolder *tqparent)
: KNArticleCollection(tqparent), i_d(id), i_ndexDirty(false), w_asOpen(true)
{
- TQString fname=path()+TQString("%1_%2").arg(prefix).arg(i_d);
+ TQString fname=path()+TQString("%1_%2").tqarg(prefix).tqarg(i_d);
n_ame = name;
m_boxFile.setName(fname+".mbox");
@@ -356,7 +356,7 @@ bool KNFolder::loadArticle(KNLocalArticle *a)
}
//set content
- buff.at(readBytes)='\0'; //terminate string
+ buff.tqat(readBytes)='\0'; //terminate string
a->setContent(buff);
a->parse();
diff --git a/knode/knfoldermanager.cpp b/knode/knfoldermanager.cpp
index bdcbed4a2..c1c2d2e8a 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.at(readBytes)='\0'; //terminate string
+ buff.tqat(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.at(readBytes)='\0'; //terminate string
+ buff.tqat(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 1815027c0..aad26b8b3 100644
--- a/knode/kngroup.cpp
+++ b/knode/kngroup.cpp
@@ -453,14 +453,14 @@ void KNGroup::insortNewHeaders(TQStrList *hdrs, TQStrList *hdrfmt, KNProtocolCli
// optinal additional headers
mOptionalHeaders = *hdrfmt;
- for (hdr = hdrfmt->first(); hdr; hdr = hdrfmt->next()) {
+ for (hdr = hdrfmt->first(); !hdr.isNull(); hdr = hdrfmt->next()) {
if (!split.next())
break;
data = split.string();
int pos = hdr.tqfind(':');
hdrName = hdr.left( pos );
// if the header format is 'full' we have to strip the header name
- if (hdr.findRev("full") == (int)(hdr.length() - 4))
+ if (hdr.tqfindRev("full") == (int)(hdr.length() - 4))
data = data.right( data.length() - (hdrName.length() + 2) );
// add header
@@ -557,7 +557,7 @@ int KNGroup::saveStaticData(int cnt,bool ovr)
// optional headers
ts << mOptionalHeaders.count() << '\n';
- for (TQCString hdrName = mOptionalHeaders.first(); hdrName; hdrName = mOptionalHeaders.next()) {
+ for (TQCString hdrName = mOptionalHeaders.first(); !hdrName.isNull(); hdrName = mOptionalHeaders.next()) {
hdrName = hdrName.left( hdrName.tqfind(':') );
KMime::Headers::Base *hdr = art->getHeaderByType( hdrName );
if ( hdr )
@@ -701,7 +701,7 @@ void KNGroup::buildThreads(int cnt, KNProtocolClient *client)
art=at(idx);
if(art->threadingLevel()>1) {
oldRef=art->idRef();
- ref=findReference(art);
+ ref=tqfindReference(art);
if(ref) {
// this method is called from the nntp-thread!!!
#ifndef NDEBUG
@@ -720,7 +720,7 @@ void KNGroup::buildThreads(int cnt, KNProtocolClient *client)
if(art->idRef()==-1 && !art->references()->isEmpty() ){ //hdr has references
refCnt++;
- if(findReference(art))
+ if(tqfindReference(art))
foundCnt++;
}
else {
@@ -866,7 +866,7 @@ void KNGroup::buildThreads(int cnt, KNProtocolClient *client)
}
-KNRemoteArticle* KNGroup::findReference(KNRemoteArticle *a)
+KNRemoteArticle* KNGroup::tqfindReference(KNRemoteArticle *a)
{
int found=false;
TQCString ref_mid;
@@ -1052,7 +1052,7 @@ TQString KNGroup::prepareForExecution()
if (knGlobals.groupManager()->loadHeaders(this))
return TQString();
else
- return i18n("Cannot load saved headers: %1").arg(groupname());
+ return i18n("Cannot load saved headers: %1").tqarg(groupname());
}
//***************************************************************************
diff --git a/knode/kngroup.h b/knode/kngroup.h
index 387ff0f6e..b0c31f93f 100644
--- a/knode/kngroup.h
+++ b/knode/kngroup.h
@@ -134,7 +134,7 @@ class KNGroup : public KNArticleCollection , public KNJobItem {
protected:
void buildThreads(int cnt, KNProtocolClient *client=0);
- KNRemoteArticle* findReference(KNRemoteArticle *a);
+ KNRemoteArticle* tqfindReference(KNRemoteArticle *a);
int n_ewCount,
l_astFetchCount,
diff --git a/knode/kngroupbrowser.cpp b/knode/kngroupbrowser.cpp
index d28e9ed92..c3ab27d98 100644
--- a/knode/kngroupbrowser.cpp
+++ b/knode/kngroupbrowser.cpp
@@ -358,7 +358,7 @@ void KNGroupBrowser::slotFilter(const TQString &txt)
lastFilter = filtertxt;
incrementalFilter = !isRegexp;
- leftLabel->setText(i18n("Groups on %1: (%2 displayed)").arg(a_ccount->name()).arg(matchList->count()));
+ leftLabel->setText(i18n("Groups on %1: (%2 displayed)").tqarg(a_ccount->name()).tqarg(matchList->count()));
arrowBtn1->setEnabled(false);
arrowBtn2->setEnabled(false);
diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp
index eadaf06b9..4d86178fb 100644
--- a/knode/kngroupdialog.cpp
+++ b/knode/kngroupdialog.cpp
@@ -177,17 +177,17 @@ void KNGroupDialog::setButtonDirection(arrowButton b, arrowDirection d)
void KNGroupDialog::slotItemSelected(TQListViewItem *it)
{
- const TQObject *s=sender();
+ const TQObject *s=TQT_TQOBJECT(sender());
- if(s==subView) {
+ if(TQT_BASE_OBJECT_CONST(s)==TQT_BASE_OBJECT(subView)) {
unsubView->clearSelection();
groupView->clearSelection();
arrowBtn2->setEnabled(false);
arrowBtn1->setEnabled(true);
setButtonDirection(btn1, left);
}
- else if(s==unsubView) {
+ else if(TQT_BASE_OBJECT_CONST(s)==TQT_BASE_OBJECT(unsubView)) {
subView->clearSelection();
groupView->clearSelection();
arrowBtn1->setEnabled(false);
diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp
index 48cfc117c..151efa0f0 100644
--- a/knode/kngroupmanager.cpp
+++ b/knode/kngroupmanager.cpp
@@ -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.").arg(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.").tqarg(g->groupname()));
return false;
}
diff --git a/knode/kngrouppropdlg.cpp b/knode/kngrouppropdlg.cpp
index ef8e28700..d5cd71755 100644
--- a/knode/kngrouppropdlg.cpp
+++ b/knode/kngrouppropdlg.cpp
@@ -30,7 +30,7 @@
KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *tqparent, const char *name )
- : KDialogBase(Tabbed, i18n("Properties of %1").arg(group->groupname()),
+ : KDialogBase(Tabbed, i18n("Properties of %1").tqarg(group->groupname()),
Ok|Cancel|Help, Ok, tqparent, name),
g_rp(group), n_ickChanged(false)
{
diff --git a/knode/kngroupselectdialog.cpp b/knode/kngroupselectdialog.cpp
index d5188ad1f..0476442b3 100644
--- a/knode/kngroupselectdialog.cpp
+++ b/knode/kngroupselectdialog.cpp
@@ -114,9 +114,9 @@ TQString KNGroupSelectDialog::selectedGroups()const
void KNGroupSelectDialog::slotItemSelected(TQListViewItem *it)
{
- const TQObject *s=sender();
+ const TQObject *s=TQT_TQOBJECT(sender());
- if(s==groupView) {
+ if(TQT_BASE_OBJECT_CONST(s)==TQT_BASE_OBJECT(groupView)) {
selView->clearSelection();
arrowBtn2->setEnabled(false);
if(it)
diff --git a/knode/knhdrviewitem.cpp b/knode/knhdrviewitem.cpp
index 748bcb4f5..207d22ba4 100644
--- a/knode/knhdrviewitem.cpp
+++ b/knode/knhdrviewitem.cpp
@@ -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)" ).arg( countUnreadInThread() );
+ t2 = TQString( " (%1)" ).tqarg( countUnreadInThread() );
f2 = p->font();
f2.setBold( true );
cntWidth = TQFontMetrics( f2 ).width( t2, -1 );
diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp
index 8da3b97ee..45738c37a 100644
--- a/knode/knmainwidget.cpp
+++ b/knode/knmainwidget.cpp
@@ -550,113 +550,113 @@ void KNMainWidget::initActions()
//navigation
a_ctNavNextArt = new KAction( KGuiItem(i18n("&Next Article"), "next",
- i18n("Go to next article")), "N;Right", h_drView,
+ i18n("Go to next article")), "N;Right", TQT_TQOBJECT(h_drView),
TQT_SLOT(nextArticle()), actionCollection(), "go_nextArticle" );
a_ctNavPrevArt = new KAction( KGuiItem(i18n("&Previous Article"), "previous",
- i18n("Go to previous article")), "P;Left" , h_drView,
+ i18n("Go to previous article")), "P;Left" , TQT_TQOBJECT(h_drView),
TQT_SLOT(prevArticle()), actionCollection(), "go_prevArticle" );
- a_ctNavNextUnreadArt = new KAction(i18n("Next Unread &Article"), "1rightarrow", ALT+SHIFT+Key_Space , this,
+ a_ctNavNextUnreadArt = new KAction(i18n("Next Unread &Article"), "1rightarrow", ALT+SHIFT+Key_Space , TQT_TQOBJECT(this),
TQT_SLOT(slotNavNextUnreadArt()), actionCollection(), "go_nextUnreadArticle");
- a_ctNavNextUnreadThread = new KAction(i18n("Next Unread &Thread"),"2rightarrow", SHIFT+Key_Space , this,
+ a_ctNavNextUnreadThread = new KAction(i18n("Next Unread &Thread"),"2rightarrow", SHIFT+Key_Space , TQT_TQOBJECT(this),
TQT_SLOT(slotNavNextUnreadThread()), actionCollection(), "go_nextUnreadThread");
- a_ctNavNextGroup = new KAction(i18n("Ne&xt Group"), "down", Key_Plus , c_olView,
+ a_ctNavNextGroup = new KAction(i18n("Ne&xt Group"), "down", Key_Plus , TQT_TQOBJECT(c_olView),
TQT_SLOT(nextGroup()), actionCollection(), "go_nextGroup");
- a_ctNavPrevGroup = new KAction(i18n("Pre&vious Group"), "up", Key_Minus , c_olView,
+ a_ctNavPrevGroup = new KAction(i18n("Pre&vious Group"), "up", Key_Minus , TQT_TQOBJECT(c_olView),
TQT_SLOT(prevGroup()), actionCollection(), "go_prevGroup");
- a_ctNavReadThrough = new KAction(i18n("Read &Through Articles"), Key_Space , this,
+ a_ctNavReadThrough = new KAction(i18n("Read &Through Articles"), Key_Space , TQT_TQOBJECT(this),
TQT_SLOT(slotNavReadThrough()), actionCollection(), "go_readThrough");
a_ctNavReadThrough->plugAccel(a_ccel);
TQAccel *accel = new TQAccel( this );
- new KAction( i18n("Focus on Next Folder"), CTRL+Key_Right, c_olView,
+ new KAction( i18n("Focus on Next Folder"), CTRL+Key_Right, TQT_TQOBJECT(c_olView),
TQT_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder" );
accel->connectItem(accel->insertItem(CTRL+Key_Right),
c_olView, TQT_SLOT(incCurrentFolder()));
- new KAction( i18n("Focus on Previous Folder"), CTRL+Key_Left, c_olView,
+ new KAction( i18n("Focus on Previous Folder"), CTRL+Key_Left, TQT_TQOBJECT(c_olView),
TQT_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder" );
accel->connectItem(accel->insertItem(CTRL+Key_Left),
c_olView, TQT_SLOT(decCurrentFolder()));
- new KAction( i18n("Select Folder with Focus"), CTRL+Key_Space, c_olView,
+ new KAction( i18n("Select Folder with Focus"), CTRL+Key_Space, TQT_TQOBJECT(c_olView),
TQT_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder" );
accel->connectItem(accel->insertItem(CTRL+Key_Space),
c_olView, TQT_SLOT(selectCurrentFolder()));
- new KAction( i18n("Focus on Next Article"), ALT+Key_Right, h_drView,
+ new KAction( i18n("Focus on Next Article"), ALT+Key_Right, TQT_TQOBJECT(h_drView),
TQT_SLOT(incCurrentArticle()), actionCollection(), "inc_current_article" );
accel->connectItem( accel->insertItem(ALT+Key_Right),
- h_drView, TQT_SLOT(incCurrentArticle()) );
- new KAction( i18n("Focus on Previous Article"), ALT+Key_Left, h_drView,
+ TQT_TQOBJECT(h_drView), TQT_SLOT(incCurrentArticle()) );
+ new KAction( i18n("Focus on Previous Article"), ALT+Key_Left, TQT_TQOBJECT(h_drView),
TQT_SLOT(decCurrentArticle()), actionCollection(), "dec_current_article" );
accel->connectItem( accel->insertItem(ALT+Key_Left),
- h_drView, TQT_SLOT(decCurrentArticle()) );
- new KAction( i18n("Select Article with Focus"), ALT+Key_Space, h_drView,
+ TQT_TQOBJECT(h_drView), TQT_SLOT(decCurrentArticle()) );
+ new KAction( i18n("Select Article with Focus"), ALT+Key_Space, TQT_TQOBJECT(h_drView),
TQT_SLOT(selectCurrentArticle()), actionCollection(), "select_current_article" );
accel->connectItem( accel->insertItem(ALT+Key_Space),
- h_drView, TQT_SLOT(selectCurrentArticle()) );
+ TQT_TQOBJECT(h_drView), TQT_SLOT(selectCurrentArticle()) );
//collection-view - accounts
- a_ctAccProperties = new KAction(i18n("Account &Properties"), "configure", 0, this,
+ a_ctAccProperties = new KAction(i18n("Account &Properties"), "configure", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotAccProperties()), actionCollection(), "account_properties");
- a_ctAccRename = new KAction(i18n("&Rename Account"), "text", 0, this,
+ a_ctAccRename = new KAction(i18n("&Rename Account"), "text", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotAccRename()), actionCollection(), "account_rename");
- a_ctAccSubscribe = new KAction(i18n("&Subscribe to Newsgroups..."), "news_subscribe", 0, this,
+ a_ctAccSubscribe = new KAction(i18n("&Subscribe to Newsgroups..."), "news_subscribe", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotAccSubscribe()), actionCollection(), "account_subscribe");
- a_ctAccExpireAll = new KAction(i18n("&Expire All Groups"), 0, this,
+ a_ctAccExpireAll = new KAction(i18n("&Expire All Groups"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotAccExpireAll()), actionCollection(), "account_expire_all");
- a_ctAccGetNewHdrs = new KAction(i18n("&Get New Articles in All Groups"), "mail_get", 0, this,
+ a_ctAccGetNewHdrs = new KAction(i18n("&Get New Articles in All Groups"), "mail_get", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotAccGetNewHdrs()), actionCollection(), "account_dnlHeaders");
- a_ctAccGetNewHdrsAll = new KAction(i18n("&Get New Articles in All Accounts"), "mail_get_all", 0, this,
+ a_ctAccGetNewHdrsAll = new KAction(i18n("&Get New Articles in All Accounts"), "mail_get_all", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotAccGetNewHdrsAll()), actionCollection(), "account_dnlAllHeaders");
- a_ctAccDelete = new KAction(i18n("&Delete Account"), "editdelete", 0, this,
+ a_ctAccDelete = new KAction(i18n("&Delete Account"), "editdelete", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotAccDelete()), actionCollection(), "account_delete");
- a_ctAccPostNewArticle = new KAction(i18n("&Post to Newsgroup..."), "mail_new", CTRL+Key_N, this,
+ a_ctAccPostNewArticle = new KAction(i18n("&Post to Newsgroup..."), "mail_new", CTRL+Key_N, TQT_TQOBJECT(this),
TQT_SLOT(slotAccPostNewArticle()), actionCollection(), "article_postNew");
//collection-view - groups
- a_ctGrpProperties = new KAction(i18n("Group &Properties"), "configure", 0, this,
+ a_ctGrpProperties = new KAction(i18n("Group &Properties"), "configure", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotGrpProperties()), actionCollection(), "group_properties");
- a_ctGrpRename = new KAction(i18n("Rename &Group"), "text", 0, this,
+ a_ctGrpRename = new KAction(i18n("Rename &Group"), "text", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotGrpRename()), actionCollection(), "group_rename");
- a_ctGrpGetNewHdrs = new KAction(i18n("&Get New Articles"), "mail_get" , 0, this,
+ a_ctGrpGetNewHdrs = new KAction(i18n("&Get New Articles"), "mail_get" , 0, TQT_TQOBJECT(this),
TQT_SLOT(slotGrpGetNewHdrs()), actionCollection(), "group_dnlHeaders");
- a_ctGrpExpire = new KAction(i18n("E&xpire Group"), "wizard", 0, this,
+ a_ctGrpExpire = new KAction(i18n("E&xpire Group"), "wizard", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotGrpExpire()), actionCollection(), "group_expire");
- a_ctGrpReorganize = new KAction(i18n("Re&organize Group"), 0, this,
+ a_ctGrpReorganize = new KAction(i18n("Re&organize Group"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotGrpReorganize()), actionCollection(), "group_reorg");
- a_ctGrpUnsubscribe = new KAction(i18n("&Unsubscribe From Group"), "news_unsubscribe", 0, this,
+ a_ctGrpUnsubscribe = new KAction(i18n("&Unsubscribe From Group"), "news_unsubscribe", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotGrpUnsubscribe()), actionCollection(), "group_unsubscribe");
- a_ctGrpSetAllRead = new KAction(i18n("Mark All as &Read"), "goto", 0, this,
+ a_ctGrpSetAllRead = new KAction(i18n("Mark All as &Read"), "goto", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotGrpSetAllRead()), actionCollection(), "group_allRead");
- a_ctGrpSetAllUnread = new KAction(i18n("Mark All as U&nread"), 0, this,
+ a_ctGrpSetAllUnread = new KAction(i18n("Mark All as U&nread"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotGrpSetAllUnread()), actionCollection(), "group_allUnread");
- a_ctGrpSetUnread = new KAction(i18n("Mark Last as Unr&ead..."), 0, this,
+ a_ctGrpSetUnread = new KAction(i18n("Mark Last as Unr&ead..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotGrpSetUnread()), actionCollection(), "group_unread");
(void) new KAction( i18n("&Configure KNode..."),
- "configure", 0, this,
+ "configure", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotSettings()), actionCollection(),
"knode_configure_knode" );
//collection-view - folder
- a_ctFolNew = new KAction(i18n("&New Folder"), "folder_new", 0, this,
+ a_ctFolNew = new KAction(i18n("&New Folder"), "folder_new", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFolNew()), actionCollection(), "folder_new");
- a_ctFolNewChild = new KAction(i18n("New &Subfolder"), "folder_new", 0, this,
+ a_ctFolNewChild = new KAction(i18n("New &Subfolder"), "folder_new", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFolNewChild()), actionCollection(), "folder_newChild");
- a_ctFolDelete = new KAction(i18n("&Delete Folder"), "editdelete", 0, this,
+ a_ctFolDelete = new KAction(i18n("&Delete Folder"), "editdelete", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFolDelete()), actionCollection(), "folder_delete");
- a_ctFolRename = new KAction(i18n("&Rename Folder"), "text", 0, this,
+ a_ctFolRename = new KAction(i18n("&Rename Folder"), "text", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFolRename()), actionCollection(), "folder_rename");
- a_ctFolCompact = new KAction(i18n("C&ompact Folder"), "wizard", 0, this,
+ a_ctFolCompact = new KAction(i18n("C&ompact Folder"), "wizard", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFolCompact()), actionCollection(), "folder_compact");
- a_ctFolCompactAll = new KAction(i18n("Co&mpact All Folders"), 0, this,
+ a_ctFolCompactAll = new KAction(i18n("Co&mpact All Folders"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFolCompactAll()), actionCollection(), "folder_compact_all");
- a_ctFolEmpty = new KAction(i18n("&Empty Folder"), 0, this,
+ a_ctFolEmpty = new KAction(i18n("&Empty Folder"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFolEmpty()), actionCollection(), "folder_empty");
- a_ctFolMboxImport = new KAction(i18n("&Import MBox Folder..."), 0, this,
+ a_ctFolMboxImport = new KAction(i18n("&Import MBox Folder..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFolMBoxImport()), actionCollection(), "folder_MboxImport");
- a_ctFolMboxExport = new KAction(i18n("E&xport as MBox Folder..."), 0, this,
+ a_ctFolMboxExport = new KAction(i18n("E&xport as MBox Folder..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFolMBoxExport()), actionCollection(), "folder_MboxExport");
//header-view - list-handling
@@ -670,7 +670,7 @@ void KNMainWidget::initActions()
a_ctArtSortHeaders->setItems(items);
a_ctArtSortHeaders->setShortcutConfigurable(false);
connect(a_ctArtSortHeaders, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotArtSortHeaders(int)));
- a_ctArtSortHeadersKeyb = new KAction(i18n("Sort"), TQString(), Key_F7 , this,
+ a_ctArtSortHeadersKeyb = new KAction(i18n("Sort"), TQString(), Key_F7 , TQT_TQOBJECT(this),
TQT_SLOT(slotArtSortHeadersKeyb()), actionCollection(), "view_Sort_Keyb");
a_ctArtSortHeadersKeyb->plugAccel(a_ccel);
a_ctArtFilter = new KNFilterSelectAction(i18n("&Filter"), "filter",
@@ -678,86 +678,86 @@ void KNMainWidget::initActions()
a_ctArtFilter->setShortcutConfigurable(false);
a_ctArtFilterKeyb = new KAction(i18n("Filter"), Key_F6, actionCollection(), "view_Filter_Keyb");
a_ctArtFilterKeyb->plugAccel(a_ccel);
- a_ctArtSearch = new KAction(i18n("&Search Articles..."),"mail_tqfind" , Key_F4 , this,
+ a_ctArtSearch = new KAction(i18n("&Search Articles..."),"mail_tqfind" , Key_F4 , TQT_TQOBJECT(this),
TQT_SLOT(slotArtSearch()), actionCollection(), "article_search");
- a_ctArtRefreshList = new KAction(i18n("&Refresh List"),"reload", KStdAccel::shortcut(KStdAccel::Reload), this,
+ a_ctArtRefreshList = new KAction(i18n("&Refresh List"),"reload", KStdAccel::shortcut(KStdAccel::Reload), TQT_TQOBJECT(this),
TQT_SLOT(slotArtRefreshList()), actionCollection(), "view_Refresh");
- a_ctArtCollapseAll = new KAction(i18n("&Collapse All Threads"), 0 , this,
+ a_ctArtCollapseAll = new KAction(i18n("&Collapse All Threads"), 0 , TQT_TQOBJECT(this),
TQT_SLOT(slotArtCollapseAll()), actionCollection(), "view_CollapseAll");
- a_ctArtExpandAll = new KAction(i18n("E&xpand All Threads"), 0 , this,
+ a_ctArtExpandAll = new KAction(i18n("E&xpand All Threads"), 0 , TQT_TQOBJECT(this),
TQT_SLOT(slotArtExpandAll()), actionCollection(), "view_ExpandAll");
- a_ctArtToggleThread = new KAction(i18n("&Toggle Subthread"), Key_T, this,
+ a_ctArtToggleThread = new KAction(i18n("&Toggle Subthread"), Key_T, TQT_TQOBJECT(this),
TQT_SLOT(slotArtToggleThread()), actionCollection(), "thread_toggle");
- a_ctArtToggleShowThreads = new KToggleAction(i18n("Show T&hreads"), 0 , this,
+ a_ctArtToggleShowThreads = new KToggleAction(i18n("Show T&hreads"), 0 , TQT_TQOBJECT(this),
TQT_SLOT(slotArtToggleShowThreads()), actionCollection(), "view_showThreads");
a_ctArtToggleShowThreads->setCheckedState(i18n("Hide T&hreads"));
a_ctArtToggleShowThreads->setChecked(c_fgManager->readNewsGeneral()->showThreads());
//header-view - remote articles
- a_ctArtSetArtRead = new KAction(i18n("Mark as &Read"), Key_D , this,
+ a_ctArtSetArtRead = new KAction(i18n("Mark as &Read"), Key_D , TQT_TQOBJECT(this),
TQT_SLOT(slotArtSetArtRead()), actionCollection(), "article_read");
- a_ctArtSetArtUnread = new KAction(i18n("Mar&k as Unread"), Key_U , this,
+ a_ctArtSetArtUnread = new KAction(i18n("Mar&k as Unread"), Key_U , TQT_TQOBJECT(this),
TQT_SLOT(slotArtSetArtUnread()), actionCollection(), "article_unread");
- a_ctArtSetThreadRead = new KAction(i18n("Mark &Thread as Read"), CTRL+Key_D , this,
+ a_ctArtSetThreadRead = new KAction(i18n("Mark &Thread as Read"), CTRL+Key_D , TQT_TQOBJECT(this),
TQT_SLOT(slotArtSetThreadRead()), actionCollection(), "thread_read");
- a_ctArtSetThreadUnread = new KAction(i18n("Mark T&hread as Unread"), CTRL+Key_U , this,
+ a_ctArtSetThreadUnread = new KAction(i18n("Mark T&hread as Unread"), CTRL+Key_U , TQT_TQOBJECT(this),
TQT_SLOT(slotArtSetThreadUnread()), actionCollection(), "thread_unread");
- a_ctArtOpenNewWindow = new KAction(i18n("Open in Own &Window"), "window_new", Key_O , this,
+ a_ctArtOpenNewWindow = new KAction(i18n("Open in Own &Window"), "window_new", Key_O , TQT_TQOBJECT(this),
TQT_SLOT(slotArtOpenNewWindow()), actionCollection(), "article_ownWindow");
// scoring
- a_ctScoresEdit = new KAction(i18n("&Edit Scoring Rules..."), "edit", CTRL+Key_E, this,
+ a_ctScoresEdit = new KAction(i18n("&Edit Scoring Rules..."), "edit", CTRL+Key_E, TQT_TQOBJECT(this),
TQT_SLOT(slotScoreEdit()), actionCollection(), "scoreedit");
- a_ctReScore = new KAction(i18n("Recalculate &Scores"), 0, this,
+ a_ctReScore = new KAction(i18n("Recalculate &Scores"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotReScore()),actionCollection(),"rescore");
- a_ctScoreLower = new KAction(i18n("&Lower Score for Author..."), CTRL+Key_L, this,
+ a_ctScoreLower = new KAction(i18n("&Lower Score for Author..."), CTRL+Key_L, TQT_TQOBJECT(this),
TQT_SLOT(slotScoreLower()), actionCollection(), "scorelower");
- a_ctScoreRaise = new KAction(i18n("&Raise Score for Author..."), CTRL+Key_I, this,
+ a_ctScoreRaise = new KAction(i18n("&Raise Score for Author..."), CTRL+Key_I, TQT_TQOBJECT(this),
TQT_SLOT(slotScoreRaise()),actionCollection(),"scoreraise");
- a_ctArtToggleIgnored = new KAction(i18n("&Ignore Thread"), "bottom", Key_I , this,
+ a_ctArtToggleIgnored = new KAction(i18n("&Ignore Thread"), "bottom", Key_I , TQT_TQOBJECT(this),
TQT_SLOT(slotArtToggleIgnored()), actionCollection(), "thread_ignore");
- a_ctArtToggleWatched = new KAction(i18n("&Watch Thread"), "top", Key_W , this,
+ a_ctArtToggleWatched = new KAction(i18n("&Watch Thread"), "top", Key_W , TQT_TQOBJECT(this),
TQT_SLOT(slotArtToggleWatched()), actionCollection(), "thread_watch");
//header-view local articles
- a_ctArtSendOutbox = new KAction(i18n("Sen&d Pending Messages"), "mail_send", 0, this,
+ a_ctArtSendOutbox = new KAction(i18n("Sen&d Pending Messages"), "mail_send", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotArtSendOutbox()), actionCollection(), "net_sendPending");
- a_ctArtDelete = new KAction(i18n("&Delete Article"), "editdelete", Key_Delete, this,
+ a_ctArtDelete = new KAction(i18n("&Delete Article"), "editdelete", Key_Delete, TQT_TQOBJECT(this),
TQT_SLOT(slotArtDelete()), actionCollection(), "article_delete");
- a_ctArtSendNow = new KAction(i18n("Send &Now"),"mail_send", 0 , this,
+ a_ctArtSendNow = new KAction(i18n("Send &Now"),"mail_send", 0 , TQT_TQOBJECT(this),
TQT_SLOT(slotArtSendNow()), actionCollection(), "article_sendNow");
- a_ctArtEdit = new KAction(i18n("edit article","&Edit Article..."), "edit", Key_E , this,
+ a_ctArtEdit = new KAction(i18n("edit article","&Edit Article..."), "edit", Key_E , TQT_TQOBJECT(this),
TQT_SLOT(slotArtEdit()), actionCollection(), "article_edit");
//network
- a_ctNetCancel = new KAction(i18n("Stop &Network"),"stop",0, this,
+ a_ctNetCancel = new KAction(i18n("Stop &Network"),"stop",0, TQT_TQOBJECT(this),
TQT_SLOT(slotNetCancel()), actionCollection(), "net_stop");
a_ctNetCancel->setEnabled(false);
- a_ctFetchArticleWithID = new KAction(i18n("&Fetch Article with ID..."), 0, this,
+ a_ctFetchArticleWithID = new KAction(i18n("&Fetch Article with ID..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFetchArticleWithID()), actionCollection(), "fetch_article_with_id");
a_ctFetchArticleWithID->setEnabled(false);
- a_ctToggleGroupView = new KToggleAction(i18n("Show &Group View"), CTRL+Key_G, this,
+ a_ctToggleGroupView = new KToggleAction(i18n("Show &Group View"), CTRL+Key_G, TQT_TQOBJECT(this),
TQT_SLOT(slotToggleGroupView()), actionCollection(), "settings_show_groupView");
a_ctToggleGroupView->setCheckedState(i18n("Hide &Group View"));
- a_ctToggleHeaderView = new KToggleAction(i18n("Show &Header View"), CTRL+Key_H, this,
+ a_ctToggleHeaderView = new KToggleAction(i18n("Show &Header View"), CTRL+Key_H, TQT_TQOBJECT(this),
TQT_SLOT(slotToggleHeaderView()), actionCollection(), "settings_show_headerView");
a_ctToggleHeaderView->setCheckedState(i18n("Hide &Header View"));
- a_ctToggleArticleViewer = new KToggleAction(i18n("Show &Article Viewer"), CTRL+Key_J, this,
+ a_ctToggleArticleViewer = new KToggleAction(i18n("Show &Article Viewer"), CTRL+Key_J, TQT_TQOBJECT(this),
TQT_SLOT(slotToggleArticleViewer()), actionCollection(), "settings_show_articleViewer");
a_ctToggleArticleViewer->setCheckedState(i18n("Hide &Article Viewer"));
- a_ctToggleQuickSearch = new KToggleAction(i18n("Show Quick Search"), TQString(), this,
+ a_ctToggleQuickSearch = new KToggleAction(i18n("Show Quick Search"), TQString(), TQT_TQOBJECT(this),
TQT_SLOT(slotToggleQuickSearch()), actionCollection(), "settings_show_quickSearch");
a_ctToggleQuickSearch->setCheckedState(i18n("Hide Quick Search"));
- a_ctSwitchToGroupView = new KAction(i18n("Switch to Group View"), Key_G , this,
+ a_ctSwitchToGroupView = new KAction(i18n("Switch to Group View"), Key_G , TQT_TQOBJECT(this),
TQT_SLOT(slotSwitchToGroupView()), actionCollection(), "switch_to_group_view");
a_ctSwitchToGroupView->plugAccel(a_ccel);
- a_ctSwitchToHeaderView = new KAction(i18n("Switch to Header View"), Key_H , this,
+ a_ctSwitchToHeaderView = new KAction(i18n("Switch to Header View"), Key_H , TQT_TQOBJECT(this),
TQT_SLOT(slotSwitchToHeaderView()), actionCollection(), "switch_to_header_view");
a_ctSwitchToHeaderView->plugAccel(a_ccel);
- a_ctSwitchToArticleViewer = new KAction(i18n("Switch to Article Viewer"), Key_J , this,
+ a_ctSwitchToArticleViewer = new KAction(i18n("Switch to Article Viewer"), Key_J , TQT_TQOBJECT(this),
TQT_SLOT(slotSwitchToArticleViewer()), actionCollection(), "switch_to_article_viewer");
a_ctSwitchToArticleViewer->plugAccel(a_ccel);
}
@@ -775,7 +775,7 @@ bool KNMainWidget::firstStart()
emailConf.setGroup("Defaults");
TQString group = emailConf.readEntry("Profile","Default");
- emailConf.setGroup(TQString("PROFILE_%1").arg(group));
+ emailConf.setGroup(TQString("PROFILE_%1").tqarg(group));
KNConfig::Identity *id=knGlobals.configManager()->identity();
id->setName(emailConf.readEntry("FullName"));
id->setEmail(emailConf.readEntry("EmailAddress").latin1());
@@ -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?").arg(g_rpManager->currentGroup()->groupname()), TQString(), i18n("Unsubscribe"), KStdGuiItem::cancel()))
+ i18n("Do you really want to unsubscribe from %1?").tqarg(g_rpManager->currentGroup()->groupname()), TQString(), i18n("Unsubscribe"), KStdGuiItem::cancel()))
if (g_rpManager->unsubscribeGroup(g_rpManager->currentGroup()))
slotCollectionSelected(0);
}
@@ -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?").arg(f_olManager->currentFolder()->name()),"",KGuiItem(i18n("&Delete"),"editdelete")) )
+ this, i18n("Do you really want to delete all articles in %1?").tqarg(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.tqfind(TQRegExp("*@*",false,true))!=-1) {
if (id.tqfind(TQRegExp("<*>",false,true))==-1) // add "<>" when necessary
- id = TQString("<%1>").arg(id);
+ id = TQString("<%1>").tqarg(id);
if(!KNArticleWindow::raiseWindowForArticle(id.latin1())) { //article not yet opened
KNRemoteArticle *a=new KNRemoteArticle(g_rpManager->currentGroup());
diff --git a/knode/knnntpaccount.cpp b/knode/knnntpaccount.cpp
index 0e685531e..1795cbc58 100644
--- a/knode/knnntpaccount.cpp
+++ b/knode/knnntpaccount.cpp
@@ -174,7 +174,7 @@ void KNNntpAccount::saveInfo()
TQString KNNntpAccount::path()
{
- TQString dir(locateLocal("data","knode/")+TQString("nntp.%1/").arg(i_d));
+ TQString dir(locateLocal("data","knode/")+TQString("nntp.%1/").tqarg(i_d));
if (dir.isNull())
KNHelper::displayInternalFileError();
return (dir);
diff --git a/knode/knnntpclient.cpp b/knode/knnntpclient.cpp
index a6b1e566c..b81f13485 100644
--- a/knode/knnntpclient.cpp
+++ b/knode/knnntpclient.cpp
@@ -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")
- .arg(account.server()).arg(target->groupname());
+ .tqarg(account.server()).tqarg(target->groupname());
cmd="GROUP ";
cmd+=target->groupname().utf8();
@@ -401,7 +401,7 @@ void KNNntpClient::doFetchNewHeaders()
if ( sendCommand( cmd, rep ) && rep == 215 ) {
TQStrList tmp;
if (getMsg(tmp)) {
- for(TQCString s = tmp.first(); s; s = tmp.next()) {
+ for(TQCString s = tmp.first(); !s.isNull(); s = tmp.next()) {
s = s.stripWhiteSpace();
// remove the mandatory xover header
if (s == "Subject:" || s == "From:" || s == "Date:" || s == "Message-ID:"
@@ -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>.")
- .arg( msgId ) );
+ .tqarg( msgId ) );
}
return;
}
@@ -523,7 +523,7 @@ void KNNntpClient::doPostArticle()
if (art->messageID(false)==0) { // article has no message ID => search for a ID in the response
TQCString s = getCurrentLine();
- int start = s.findRev(TQRegExp("<[^\\s]*@[^\\s]*>"));
+ int start = s.tqfindRev(TQRegExp("<[^\\s]*@[^\\s]*>"));
if (start != -1) { // post response includes a recommended id
int end = s.tqfind('>',start);
art->messageID()->from7BitString(s.mid(start,end-start+1));
@@ -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").arg(getCurrentLine()));
+ job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").tqarg(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").arg(getCurrentLine()));
+ job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").tqarg(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").arg(getCurrentLine()));
+ job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").tqarg(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").arg(getCurrentLine()));
+ job->setErrorString(i18n("An error occurred:\n%1").tqarg(getCurrentLine()));
else
job->setErrorString(errorPrefix + getCurrentLine());
diff --git a/knode/knode.cpp b/knode/knode.cpp
index 188851cfe..48748ddff 100644
--- a/knode/knode.cpp
+++ b/knode/knode.cpp
@@ -46,9 +46,9 @@ KNMainWindow::KNMainWindow( TQWidget* pWidget )
setStandardToolBarMenuEnabled(true);
//config stuff
- KStdAction::quit(kapp, TQT_SLOT(closeAllWindows()), actionCollection());
- KStdAction::configureToolbars(this, TQT_SLOT(slotConfToolbar()), actionCollection());
- KStdAction::keyBindings(this, TQT_SLOT(slotConfKeys()), actionCollection());
+ KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(closeAllWindows()), actionCollection());
+ KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbar()), actionCollection());
+ KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfKeys()), actionCollection());
m_mainWidget = new KNMainWidget( this, true, this, 0 );
connect( m_mainWidget, TQT_SIGNAL(signalCaptionChangeRequest(const TQString&)),
diff --git a/knode/knode_part.cpp b/knode/knode_part.cpp
index 0dc09d460..ad01aef7d 100644
--- a/knode/knode_part.cpp
+++ b/knode/knode_part.cpp
@@ -68,13 +68,13 @@ KNodePart::KNodePart(TQWidget *tqparentWidget, const char *widgetName,
// create a canvas to insert our widget
TQWidget *canvas = new TQWidget(tqparentWidget, widgetName);
- canvas->setFocusPolicy(TQWidget::ClickFocus);
+ canvas->setFocusPolicy(Qt::ClickFocus);
setWidget(canvas);
mainWidget = new KNMainWidget( this, false, canvas, "knode_widget" );
TQVBoxLayout *topLayout = new TQVBoxLayout(canvas);
topLayout->addWidget(mainWidget);
- mainWidget->setFocusPolicy(TQWidget::ClickFocus);
+ mainWidget->setFocusPolicy(Qt::ClickFocus);
kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
diff --git a/knode/knprotocolclient.cpp b/knode/knprotocolclient.cpp
index 4b9137a5e..c1b52a77f 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").arg(KExtendedSocket::strError(ks.status(), errno)));
+ job->setErrorString(i18n("Unable to connect:\n%1").tqarg(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").arg(KExtendedSocket::strError(ks.status(), errno)));
+ job->setErrorString(i18n("Unable to connect:\n%1").tqarg(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").arg(thisLine));
+ job->setErrorString(i18n("An error occurred:\n%1").tqarg(thisLine));
else
job->setErrorString(errorPrefix + thisLine);
diff --git a/knode/knserverinfo.cpp b/knode/knserverinfo.cpp
index 0a2598159..5b7dc407c 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?").arg( server() ),
+ "configuration file?").tqarg( server() ),
i18n("KWallet Not Available"),
KGuiItem( i18n("Store Password") ),
KGuiItem( i18n("Do Not Store Password") ) )
diff --git a/knode/knwidgets.cpp b/knode/knwidgets.cpp
index 0bf4fcc26..53feed61d 100644
--- a/knode/knwidgets.cpp
+++ b/knode/knwidgets.cpp
@@ -143,7 +143,7 @@ void KNDockWidgetHeaderDrag::paintEvent(TQPaintEvent* ev)
paint.begin(&drawBuffer);
paint.fillRect(drawBuffer.rect(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)));
- paint.setPen(palette().active().highlight());
+ paint.setPen(tqpalette().active().highlight());
paint.drawLine(1, 2, width(), 2);
paint.drawLine(1, 3, width(), 3);
paint.drawLine(1, 5, width(), 5);
diff --git a/knode/utilities.cpp b/knode/utilities.cpp
index d634b7dfa..5fd418fe4 100644
--- a/knode/utilities.cpp
+++ b/knode/utilities.cpp
@@ -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>").arg(url.path()),
+ i18n("<qt>A file named <b>%1</b> already exists.<br>Do you want to replace it?</qt>").tqarg(url.path()),
dialogTitle, i18n("&Replace")) != KMessageBox::Continue)) {
return 0;
}
@@ -410,7 +410,7 @@ TQString KNHelper::rewrapStringList(TQStringList text, int wrapAt, TQChar quoteC
if (!alwaysSpace && (thisLine[0]==quoteChar))
thisLine.prepend(quoteChar); // second quote level without space
else
- thisLine.prepend(quoteChar+' ');
+ thisLine.prepend(quoteChar+TQString(' '));
thisPrefix=TQString();
TQChar c;