diff options
Diffstat (limited to 'knode')
98 files changed, 578 insertions, 516 deletions
diff --git a/knode/ChangeLog b/knode/ChangeLog index f9585f5f..646df19d 100644 --- a/knode/ChangeLog +++ b/knode/ChangeLog @@ -130,7 +130,7 @@ changes between 0.1.13 and 0.3.2 - ability to display attachments inline - posting of MIME multipart-messages (attachments) - significantly improved composer: - + all standard editor features (find, replace, select all, ...) + + all standard editor features (tqfind, tqreplace, select all, ...) + spellchecker + optional external editor + nice attachment handling diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index 491d2c9b..301c9bb5 100644 --- a/knode/articlewidget.cpp +++ b/knode/articlewidget.cpp @@ -75,11 +75,11 @@ using namespace KNode; TQValueList<ArticleWidget*> ArticleWidget::mInstances; -ArticleWidget::ArticleWidget( TQWidget *parent, +ArticleWidget::ArticleWidget( TQWidget *tqparent, KXMLGUIClient *guiClient, KActionCollection *actionCollection, const char *name ) : - TQWidget( parent, name ), + TQWidget( tqparent, name ), mArticle( 0 ), mViewer( 0 ), mCSSHelper( 0 ), @@ -139,7 +139,7 @@ void ArticleWidget::initActions() 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::find( this, TQT_SLOT(slotFind()), mActionCollection, "find_in_article" ); + mFindAction = KStdAction::tqfind( this, TQT_SLOT(slotFind()), mActionCollection, "find_in_article" ); mFindAction->setText( i18n("F&ind in Article...") ); mViewSourceAction = new KAction( i18n("&View Source"), Key_V , this, TQT_SLOT(slotViewSource()), mActionCollection, "article_viewSource" ); @@ -374,7 +374,7 @@ void ArticleWidget::displayArticle() mViewer->view()->ensureVisible( 0, 0 ); if ( !mArticle->hasContent() ) { - displayErrorMessage( i18n("The article tqcontains no data.") ); + displayErrorMessage( i18n("The article contains no data.") ); return; } @@ -410,12 +410,12 @@ void ArticleWidget::displayArticle() // signature, we show a nice header: TQPtrList<Kpgp::Block> pgpBlocks; TQStrList nonPgpBlocks; - bool tqcontainsPGP = Kpgp::Module::prepareMessageForDecryption( mArticle->body(), pgpBlocks, nonPgpBlocks ); + bool containsPGP = Kpgp::Module::prepareMessageForDecryption( mArticle->body(), pgpBlocks, nonPgpBlocks ); mViewer->write ( html ); html = TQString(); - if ( tqcontainsPGP ) { + if ( containsPGP ) { TQPtrListIterator<Kpgp::Block> pbit( pgpBlocks ); TQStrListIterator npbit( nonPgpBlocks ); TQTextCodec *codec; @@ -490,7 +490,7 @@ void ArticleWidget::displayArticle() } } else { - if ( !tqcontainsPGP ) { + if ( !containsPGP ) { TQStringList lines; text->decodedText( lines, true, cfgMgr->readNewsViewer()->removeTrailingNewlines() ); displayBodyBlock( lines ); @@ -535,7 +535,7 @@ void ArticleWidget::displayErrorMessage( const TQString &msg ) KNConfigManager *cfgMgr = knGlobals.configManager(); if ( cfgMgr->readNewsGeneral()->autoMark() && mArticle && mArticle->type() == KMime::Base::ATremote && !mArticle->isOrphant() && - ( msg.find("430") != -1 || msg.find("423") != -1 ) ) { + ( msg.tqfind("430") != -1 || msg.tqfind("423") != -1 ) ) { KNRemoteArticle::List l; l.append( static_cast<KNRemoteArticle*>( mArticle ) ); knGlobals.articleManager()->setRead( l, true ); @@ -836,7 +836,7 @@ void ArticleWidget::displayAttachment( KMime::Content *att, int partNum ) TQString label = ct->name(); if ( label.isEmpty() ) label = i18n("unnamed" ); - // if label consists of only whitespace tqreplace them by underscores + // if label consists of only whitespace replace them by underscores if ( (uint)label.tqcontains( ' ' ) == label.length() ) label.tqreplace( TQRegExp( " ", true, true ), "_" ); label = toHtmlString( label, None ); @@ -882,7 +882,7 @@ void ArticleWidget::displayAttachment( KMime::Content *att, int partNum ) } else { // icon TQCString mimetype = ct->mimeType(); KPIM::kAsciiToLower( mimetype.data() ); - TQString iconName = KMimeType::mimeType( mimetype )->icon( TQString::null, false ); + TQString iconName = KMimeType::mimeType( mimetype )->icon( TQString(), false ); TQString iconFile = KGlobal::instance()->iconLoader()->iconPath( iconName, KIcon::Desktop ); html += "<div><a href=\"" + href + "\"><img src=\"" + iconFile + "\" border=\"0\">" + label + @@ -928,7 +928,7 @@ int ArticleWidget::quotingDepth( const TQString &line, const TQString "eChar // skip spaces if ( line[i].isSpace() ) continue; - if ( quoteChars.find( line[i] ) != -1 ) + if ( quoteChars.tqfind( line[i] ) != -1 ) ++level; else break; @@ -972,7 +972,7 @@ void ArticleWidget::updateContents() TQString ArticleWidget::writeAttachmentToTempFile( KMime::Content *att, int partNum ) { // more or less KMail code - KTempFile *tempFile = new KTempFile( TQString::null, "." + TQString::number( partNum ) ); + KTempFile *tempFile = new KTempFile( TQString(), "." + TQString::number( partNum ) ); tempFile->setAutoDelete( true ); TQString fname = tempFile->name(); delete tempFile; @@ -981,7 +981,7 @@ TQString ArticleWidget::writeAttachmentToTempFile( KMime::Content *att, int part // Not there or not writable if( ::mkdir( TQFile::encodeName( fname ), 0 ) != 0 || ::chmod( TQFile::encodeName( fname ), S_IRWXU ) != 0 ) - return TQString::null; //failed create + return TQString(); //failed create Q_ASSERT( !fname.isNull() ); @@ -1000,7 +1000,7 @@ TQString ArticleWidget::writeAttachmentToTempFile( KMime::Content *att, int part size_t size = data.size(); // ### KMail does crlf2lf conversion here before writing the file if( !KPIM::kBytesToFile( data.data(), size, fname, false, false, false ) ) - return TQString::null; + return TQString(); mTempFiles.append( fname ); // make file read-only so that nobody gets the impression that he might @@ -1167,7 +1167,7 @@ void ArticleWidget::slotURLClicked( const KURL &url, bool forceOpen) KMime::Content *c = mAttachments.at( partNum ); if ( !c ) return; - // TODO: tqreplace with message box as done in KMail + // TODO: replace with message box as done in KMail KNConfigManager *cfgMgr = knGlobals.configManager(); if ( forceOpen || cfgMgr->readNewsViewer()->openAttachmentsOnClick() ) knGlobals.articleManager()->openContent( c ); @@ -1240,7 +1240,7 @@ void ArticleWidget::slotSelectAll() void ArticleWidget::slotFind() { - mViewer->tqfindText(); + mViewer->findText(); } @@ -1408,8 +1408,8 @@ void ArticleWidget::slotCopyURL() address = mCurrentURL.path(); else address = mCurrentURL.url(); - TQApplication::clipboard()->setText( address, QClipboard::Clipboard ); - TQApplication::clipboard()->setText( address, QClipboard::Selection ); + TQApplication::clipboard()->setText( address, TQClipboard::Clipboard ); + TQApplication::clipboard()->setText( address, TQClipboard::Selection ); } void ArticleWidget::slotAddBookmark() diff --git a/knode/articlewidget.h b/knode/articlewidget.h index 2d44fdfc..7333bf5d 100644 --- a/knode/articlewidget.h +++ b/knode/articlewidget.h @@ -53,10 +53,11 @@ class CSSHelper; class ArticleWidget : public TQWidget, public KNJobConsumer { Q_OBJECT + TQ_OBJECT public: /// Construct a new article widget - ArticleWidget( TQWidget *parent, + ArticleWidget( TQWidget *tqparent, KXMLGUIClient *guiClient, KActionCollection *actionCollection, const char *name = 0 ); @@ -125,7 +126,7 @@ class ArticleWidget : public TQWidget, public KNJobConsumer { /// displays the given error message in the viewer void displayErrorMessage( const TQString &msg ); - /// display the message header (should be tqreplaced by KMail's HeaderStyle class) + /// display the message header (should be replaced by KMail's HeaderStyle class) void displayHeader(); /** displays the given text block, including quote and signature handling * @param lines A list of lines to display. diff --git a/knode/filters/1.fltr b/knode/filters/1.fltr index f66021cd..16e64457 100644 --- a/knode/filters/1.fltr +++ b/knode/filters/1.fltr @@ -6,7 +6,7 @@ val1=0 val2=0 [FROM] Data= -contains=true +tqcontains=true enabled=false regX=false [GENERAL] @@ -37,6 +37,6 @@ EN_R=false EN_US=false [SUBJECT] Data= -contains=true +tqcontains=true enabled=false regX=false diff --git a/knode/filters/2.fltr b/knode/filters/2.fltr index 7b11f48e..f9f7b84f 100644 --- a/knode/filters/2.fltr +++ b/knode/filters/2.fltr @@ -6,7 +6,7 @@ val1=0 val2=0 [FROM] Data= -contains=true +tqcontains=true enabled=false regX=false [GENERAL] @@ -37,6 +37,6 @@ EN_R=true EN_US=false [SUBJECT] Data= -contains=true +tqcontains=true enabled=false regX=false diff --git a/knode/filters/3.fltr b/knode/filters/3.fltr index e7c3e0f6..82139623 100644 --- a/knode/filters/3.fltr +++ b/knode/filters/3.fltr @@ -6,7 +6,7 @@ val1=0 val2=0 [FROM] Data= -contains=true +tqcontains=true enabled=false regX=false [GENERAL] @@ -37,6 +37,6 @@ EN_R=false EN_US=false [SUBJECT] Data= -contains=true +tqcontains=true enabled=false regX=false diff --git a/knode/filters/4.fltr b/knode/filters/4.fltr index 4972266f..ee6cb67b 100644 --- a/knode/filters/4.fltr +++ b/knode/filters/4.fltr @@ -6,7 +6,7 @@ val1=0 val2=0 [FROM] Data= -contains=true +tqcontains=true enabled=false regX=false [GENERAL] @@ -37,6 +37,6 @@ EN_R=false EN_US=false [SUBJECT] Data= -contains=true +tqcontains=true enabled=false regX=false diff --git a/knode/filters/5.fltr b/knode/filters/5.fltr index 24ca696b..1386f4d7 100644 --- a/knode/filters/5.fltr +++ b/knode/filters/5.fltr @@ -6,7 +6,7 @@ val1=0 val2=0 [FROM] Data= -contains=true +tqcontains=true enabled=false regX=false [GENERAL] @@ -37,6 +37,6 @@ EN_R=true EN_US=false [SUBJECT] Data= -contains=true +tqcontains=true enabled=false regX=false diff --git a/knode/filters/6.fltr b/knode/filters/6.fltr index 7ad3d612..867e8029 100644 --- a/knode/filters/6.fltr +++ b/knode/filters/6.fltr @@ -6,7 +6,7 @@ val1=0 val2=0 [FROM] Data= -contains=true +tqcontains=true enabled=false regX=false [GENERAL] @@ -37,6 +37,6 @@ EN_R=false EN_US=false [SUBJECT] Data= -contains=true +tqcontains=true enabled=false regX=false diff --git a/knode/filters/7.fltr b/knode/filters/7.fltr index 81fec0cd..07f16f3b 100644 --- a/knode/filters/7.fltr +++ b/knode/filters/7.fltr @@ -6,7 +6,7 @@ val1=0 val2=0 [FROM] Data=%MYNAME -contains=true +tqcontains=true enabled=true regX=false [GENERAL] @@ -37,6 +37,6 @@ EN_R=false EN_US=false [SUBJECT] Data= -contains=true +tqcontains=true enabled=false regX=false diff --git a/knode/filters/8.fltr b/knode/filters/8.fltr index 5978c616..dc0859ff 100644 --- a/knode/filters/8.fltr +++ b/knode/filters/8.fltr @@ -6,7 +6,7 @@ val1=0 val2=0 [FROM] Data=%MYNAME -contains=true +tqcontains=true enabled=true regX=false [GENERAL] @@ -37,6 +37,6 @@ EN_R=false EN_US=false [SUBJECT] Data= -contains=true +tqcontains=true enabled=false regX=false diff --git a/knode/headerview.cpp b/knode/headerview.cpp index be497e6d..0007ffe6 100644 --- a/knode/headerview.cpp +++ b/knode/headerview.cpp @@ -32,8 +32,8 @@ #include "knmainwidget.h" -KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) : - KListView(parent,name), +KNHeaderView::KNHeaderView(TQWidget *tqparent, const char *name) : + KListView(tqparent,name), mSortCol( -1 ), mSortAsc( true ), mSortByThreadChangeDate( false ), @@ -61,8 +61,8 @@ KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) : setRootIsDecorated( true ); setSorting( mPaintInfo.dateCol ); header()->setMovingEnabled( true ); - setColumnAlignment( mPaintInfo.sizeCol, Qt::AlignRight ); - setColumnAlignment( mPaintInfo.scoreCol, Qt::AlignRight ); + setColumnAlignment( mPaintInfo.sizeCol, TQt::AlignRight ); + setColumnAlignment( mPaintInfo.scoreCol, TQt::AlignRight ); // due to our own column text squeezing we need to tqrepaint on column resizing disconnect( header(), TQT_SIGNAL(sizeChange(int, int, int)) ); @@ -171,11 +171,11 @@ void KNHeaderView::ensureItemVisibleWithMargin( const TQListViewItem *i ) if ( !i ) return; - TQListViewItem *parent = i->parent(); - while ( parent ) { - if ( !parent->isOpen() ) - parent->setOpen( true ); - parent = parent->parent(); + TQListViewItem *tqparent = i->tqparent(); + while ( tqparent ) { + if ( !tqparent->isOpen() ) + tqparent->setOpen( true ); + tqparent = tqparent->tqparent(); } mDelayedCenter = -1; @@ -582,9 +582,9 @@ void KNHeaderView::resetCurrentTime() //BEGIN: KNHeaderViewToolTip ================================================== -KNHeaderViewToolTip::KNHeaderViewToolTip( KNHeaderView *parent ) : - TQToolTip( parent->viewport() ), - listView( parent ) +KNHeaderViewToolTip::KNHeaderViewToolTip( KNHeaderView *tqparent ) : + TQToolTip( tqparent->viewport() ), + listView( tqparent ) { } diff --git a/knode/headerview.h b/knode/headerview.h index 519b7d84..c7d4c9f6 100644 --- a/knode/headerview.h +++ b/knode/headerview.h @@ -27,11 +27,12 @@ class KNHdrViewItem; class KNHeaderView : public KListView { Q_OBJECT + TQ_OBJECT friend class KNHdrViewItem; public: - KNHeaderView( TQWidget *parent, const char *name = 0 ); + KNHeaderView( TQWidget *tqparent, const char *name = 0 ); ~KNHeaderView(); void setActive( TQListViewItem *item ); @@ -107,7 +108,7 @@ class KNHeaderView : public KListView { class KNHeaderViewToolTip : public TQToolTip { public: - KNHeaderViewToolTip( KNHeaderView *parent ); + KNHeaderViewToolTip( KNHeaderView *tqparent ); protected: void maybeTip( const TQPoint &p ); diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp index 76466ddb..af319731 100644 --- a/knode/knaccountmanager.cpp +++ b/knode/knaccountmanager.cpp @@ -34,8 +34,8 @@ KWallet::Wallet* KNAccountManager::mWallet = 0; bool KNAccountManager::mWalletOpenFailed = false; -KNAccountManager::KNAccountManager(KNGroupManager *gm, TQObject * parent, const char * name) - : TQObject(parent, name), gManager(gm), c_urrentAccount(0), +KNAccountManager::KNAccountManager(KNGroupManager *gm, TQObject * tqparent, const char * name) + : TQObject(tqparent, name), gManager(gm), c_urrentAccount(0), mAsyncOpening( false ) { s_mtp = new KNServerInfo(); @@ -168,9 +168,9 @@ bool KNAccountManager::removeAccount(KNNntpAccount *a) TQDir dir(a->path()); if (dir.exists()) { - const QFileInfoList *list = dir.entryInfoList(); // get list of matching files and delete all + const TQFileInfoList *list = dir.entryInfoList(); // get list of matching files and delete all if (list) { - QFileInfoListIterator it( *list ); + TQFileInfoListIterator it( *list ); while (it.current()) { dir.remove(it.current()->fileName()); ++it; diff --git a/knode/knaccountmanager.h b/knode/knaccountmanager.h index f871e2be..53f048b5 100644 --- a/knode/knaccountmanager.h +++ b/knode/knaccountmanager.h @@ -27,12 +27,13 @@ class KNNntpAccount; class KNServerInfo; -class KNAccountManager : public QObject +class KNAccountManager : public TQObject { Q_OBJECT + TQ_OBJECT public: - KNAccountManager(KNGroupManager *gm, TQObject * parent=0, const char * name=0); + KNAccountManager(KNGroupManager *gm, TQObject * tqparent=0, const char * name=0); ~KNAccountManager(); void prepareShutdown(); diff --git a/knode/knapplication.h b/knode/knapplication.h index 68c051e6..66751f9a 100644 --- a/knode/knapplication.h +++ b/knode/knapplication.h @@ -22,6 +22,7 @@ class KNApplication : public KUniqueApplication { Q_OBJECT + TQ_OBJECT public: KNApplication(): KUniqueApplication() { }; diff --git a/knode/knarticle.cpp b/knode/knarticle.cpp index 437639d1..a46b9838 100644 --- a/knode/knarticle.cpp +++ b/knode/knarticle.cpp @@ -435,7 +435,7 @@ KNAttachment::KNAttachment(Content *c) KNAttachment::KNAttachment(KNLoadHelper *helper) : c_ontent(0), l_oadHelper(helper), f_ile(helper->getFile()), i_sAttached(false), h_asChanged(true) { - setMimeType((KMimeMagic::self()->tqfindFileType(f_ile->name()))->mimeType()); + setMimeType((KMimeMagic::self()->findFileType(f_ile->name()))->mimeType()); n_ame=helper->getURL().fileName(); } @@ -453,7 +453,7 @@ void KNAttachment::setMimeType(const TQString &s) m_imeType=s.latin1(); h_asChanged=true; - if(m_imeType.find("text/", 0, false)==-1) { + if(m_imeType.tqfind("text/", 0, false)==-1) { f_b64=true; e_ncoding.setCte(Headers::CEbase64); } diff --git a/knode/knarticle.h b/knode/knarticle.h index e36bfdfe..798742e1 100644 --- a/knode/knarticle.h +++ b/knode/knarticle.h @@ -35,7 +35,7 @@ class KNHdrViewItem; class KNArticleCollection; /** This class encapsulates a generic article. It provides all the - usual headers of a RFC822-message. Further more it tqcontains an + usual headers of a RFC822-message. Further more it contains an unique id and can store a pointer to a @ref TQListViewItem. It is used as a base class for all visible articles. */ diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp index 493e2e22..1421b405 100644 --- a/knode/knarticlefactory.cpp +++ b/knode/knarticlefactory.cpp @@ -63,7 +63,7 @@ void KNArticleFactory::createPosting(KNNntpAccount *a) art->setDoPost(true); art->setDoMail(false); - KNComposer *c = new KNComposer( art, TQString::null, sig, TQString::null, true ); + KNComposer *c = new KNComposer( art, TQString(), sig, TQString(), true ); mCompList.append( c ); connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); c->show(); @@ -92,7 +92,7 @@ void KNArticleFactory::createPosting(KNGroup *g) art->setDoMail(false); art->newsgroups()->fromUnicodeString(g->groupname(), art->defaultCharset()); - KNComposer *c=new KNComposer(art, TQString::null, sig, TQString::null, true); + KNComposer *c=new KNComposer(art, TQString(), sig, TQString(), true); mCompList.append( c ); connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); c->show(); @@ -140,7 +140,7 @@ void KNArticleFactory::createReply(KNRemoteArticle *a, TQString selectedText, bo if( post && // user wanted to reply by public posting? // ask the user if she wants to ignore this F'up-To: poster ( KMessageBox::Yes != KMessageBox::questionYesNo(knGlobals.topWidget, - i18n("The author has requested a reply by email instead\nof a followup to the newsgroup. (Followup-To: poster)\nDo you want to reply in public anyway?"), TQString::null, i18n("Reply Public"), i18n("Reply by Email")) )) + i18n("The author has requested a reply by email instead\nof a followup to the newsgroup. (Followup-To: poster)\nDo you want to reply in public anyway?"), TQString(), i18n("Reply Public"), i18n("Reply by Email")) )) { art->setDoPost(false); art->setDoMail(true); @@ -192,7 +192,7 @@ void KNArticleFactory::createReply(KNRemoteArticle *a, TQString selectedText, bo authorWantsMailCopies = mailCopiesTo->alwaysCopy(); if (authorWantsMailCopies) // warn the user KMessageBox::information(knGlobals.topWidget,i18n("The author requested a mail copy of your reply. (Mail-Copies-To header)"), - TQString::null,"mailCopiesToWarning"); + TQString(),"mailCopiesToWarning"); if (authorWantsMailCopies && mailCopiesTo->hasEmail()) { address.setName(mailCopiesTo->name()); address.setEmail(mailCopiesTo->email()); @@ -219,7 +219,7 @@ void KNArticleFactory::createReply(KNRemoteArticle *a, TQString selectedText, bo attribution+="\n\n"; TQString quoted=attribution; - TQString notRewraped=TQString::null; + TQString notRewraped=TQString(); TQStringList text; TQStringList::Iterator line; bool incSig=knGlobals.configManager()->postNewsComposer()->includeSignature(); @@ -279,7 +279,7 @@ void KNArticleFactory::createForward(KNArticle *a) bool incAtt = ( !knGlobals.configManager()->postNewsTechnical()->useExternalMailer() && ct->isMultipart() && ct->isSubtype("mixed") && KMessageBox::Yes == KMessageBox::questionYesNo(knGlobals.topWidget, - i18n("This article tqcontains attachments. Do you want them to be forwarded as well?"), TQString::null, i18n("Forward"), i18n("Do Not Forward")) + i18n("This article contains attachments. Do you want them to be forwarded as well?"), TQString(), i18n("Forward"), i18n("Do Not Forward")) ); if (knGlobals.configManager()->postNewsTechnical()->useOwnCharset()) @@ -341,13 +341,13 @@ void KNArticleFactory::createForward(KNArticle *a) if (knGlobals.configManager()->postNewsTechnical()->useExternalMailer()) { - sendMailExternal(TQString::null, subject, fwd); + sendMailExternal(TQString(), subject, fwd); delete art; return; } //open composer - KNComposer *c=new KNComposer(art, fwd, sig, TQString::null, true); + KNComposer *c=new KNComposer(art, fwd, sig, TQString(), true); mCompList.append( c ); connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); c->show(); @@ -360,7 +360,7 @@ void KNArticleFactory::createCancel(KNArticle *a) return; if(KMessageBox::No==KMessageBox::questionYesNo(knGlobals.topWidget, - i18n("Do you really want to cancel this article?"), TQString::null, i18n("Cancel Article"), KStdGuiItem::cancel())) + i18n("Do you really want to cancel this article?"), TQString(), i18n("Cancel Article"), KStdGuiItem::cancel())) return; bool sendNow; @@ -440,7 +440,7 @@ void KNArticleFactory::createSupersede(KNArticle *a) return; if(KMessageBox::No==KMessageBox::questionYesNo(knGlobals.topWidget, - i18n("Do you really want to supersede this article?"), TQString::null, i18n("Supersede"), KStdGuiItem::cancel())) + i18n("Do you really want to supersede this article?"), TQString(), i18n("Supersede"), KStdGuiItem::cancel())) return; KNGroup *grp; @@ -523,7 +523,7 @@ void KNArticleFactory::createMail(KMime::Headers::AddressField *address) art->to()->addAddress((*address)); //open composer - KNComposer *c=new KNComposer(art, TQString::null, sig, TQString::null, true); + KNComposer *c=new KNComposer(art, TQString(), sig, TQString(), true); mCompList.append( c ); connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); c->show(); @@ -534,7 +534,7 @@ void KNArticleFactory::sendMailExternal(const TQString &address, const TQString { KURL mailtoURL; TQStringList queries; - TQString query=TQString::null; + TQString query=TQString(); mailtoURL.setProtocol("mailto"); if (!address.isEmpty()) @@ -596,7 +596,7 @@ void KNArticleFactory::edit(KNLocalArticle *a) knGlobals.articleManager()->loadArticle(a); //open composer - com=new KNComposer(a, TQString::null, id->getSignature()); + com=new KNComposer(a, TQString(), id->getSignature()); if(id->useSigGenerator() && !id->getSigGeneratorStdErr().isEmpty()) KMessageBox::information(knGlobals.topWidget, i18n("<qt>The signature generator program produced the " @@ -880,7 +880,7 @@ KNLocalArticle* KNArticleFactory::newArticle(KNCollection *col, TQString &sig, T value.tqreplace(TQRegExp("%EMAIL"), TQString::tqfromLatin1(origPost->from()->email())); } else - if(value.find("%NAME") != -1 || value.find("%EMAIL") != -1) + if(value.tqfind("%NAME") != -1 || value.tqfind("%EMAIL") != -1) continue; art->setHeader( new KMime::Headers::Generic( (TQCString("X-")+(*it).name()), art, value, pnt->charset() ) ); @@ -898,7 +898,7 @@ KNLocalArticle* KNArticleFactory::newArticle(KNCollection *col, TQString &sig, T .arg(id->getSigGeneratorStdErr())); } else - sig=TQString::null; + sig=TQString(); return art; } @@ -1073,7 +1073,7 @@ KNSendErrorDialog::KNSendErrorDialog() 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::null, page); + e_rror=new TQLabel(TQString(), page); connect(j_obs, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHighlighted(int))); diff --git a/knode/knarticlefactory.h b/knode/knarticlefactory.h index c37c781a..030ac9f3 100644 --- a/knode/knarticlefactory.h +++ b/knode/knarticlefactory.h @@ -39,6 +39,7 @@ namespace KNConfig { class KNArticleFactory : public TQObject , public KNJobConsumer { Q_OBJECT + TQ_OBJECT public: enum replyType { RTgroup, RTmail, RTboth }; @@ -49,14 +50,14 @@ class KNArticleFactory : public TQObject , public KNJobConsumer { //factory methods void createPosting(KNNntpAccount *a); void createPosting(KNGroup *g); - void createReply(KNRemoteArticle *a, TQString selectedText=TQString::null, bool post=true, bool mail=false); + void createReply(KNRemoteArticle *a, TQString selectedText=TQString(), bool post=true, bool mail=false); void createForward(KNArticle *a); void createCancel(KNArticle *a); void createSupersede(KNArticle *a); void createMail(KMime::Headers::AddressField *address); // send a mail via an external program... - void sendMailExternal(const TQString &address=TQString::null, const TQString &subject=TQString::null, const TQString &body=TQString::null); + void sendMailExternal(const TQString &address=TQString(), const TQString &subject=TQString(), const TQString &body=TQString()); //article handling void edit(KNLocalArticle *a); @@ -96,6 +97,7 @@ class KNArticleFactory : public TQObject , public KNJobConsumer { class KNSendErrorDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KNSendErrorDialog(); diff --git a/knode/knarticlefilter.cpp b/knode/knarticlefilter.cpp index bb2f2338..56460a34 100644 --- a/knode/knarticlefilter.cpp +++ b/knode/knarticlefilter.cpp @@ -189,7 +189,7 @@ void KNArticleFilter::doFilter(KNGroup *g) if(!l_oaded) load(); - subject.expand(g); // tqreplace placeholders + subject.expand(g); // replace placeholders from.expand(g); messageId.expand(g); references.expand(g); @@ -287,7 +287,7 @@ void KNArticleFilter::doFilter(KNFolder *f) if(!l_oaded) load(); - subject.expand(0); // tqreplace placeholders + subject.expand(0); // replace placeholders from.expand(0); messageId.expand(0); references.expand(0); @@ -311,7 +311,7 @@ TQString KNArticleFilter::translatedName() else return n_ame; } else - return TQString::null; + return TQString(); } else return n_ame; } diff --git a/knode/knarticlemanager.cpp b/knode/knarticlemanager.cpp index d1aec96a..4e97c2d2 100644 --- a/knode/knarticlemanager.cpp +++ b/knode/knarticlemanager.cpp @@ -74,21 +74,21 @@ void KNArticleManager::deleteTempFiles() } -void KNArticleManager::saveContentToFile(KMime::Content *c, TQWidget *parent) +void KNArticleManager::saveContentToFile(KMime::Content *c, TQWidget *tqparent) { - KNSaveHelper helper(c->contentType()->name(),parent); + KNSaveHelper helper(c->contentType()->name(),tqparent); TQFile *file = helper.getFile(i18n("Save Attachment")); if (file) { TQByteArray data=c->decodedContent(); if (file->writeBlock(data.data(), data.size()) == -1 ) - KNHelper::displayExternalFileError( parent ); + KNHelper::displayExternalFileError( tqparent ); } } -void KNArticleManager::saveArticleToFile(KNArticle *a, TQWidget *parent) +void KNArticleManager::saveArticleToFile(KNArticle *a, TQWidget *tqparent) { TQString fName = a->subject()->asUnicodeString(); TQString s = ""; @@ -101,13 +101,13 @@ void KNArticleManager::saveArticleToFile(KNArticle *a, TQWidget *parent) fName = s.simplifyWhiteSpace(); fName.tqreplace(TQRegExp("[\\s]"),"_"); - KNSaveHelper helper(fName,parent); + KNSaveHelper helper(fName,tqparent); TQFile *file = helper.getFile(i18n("Save Article")); if (file) { TQCString tmp=a->encodedContent(false); if ( file->writeBlock(tmp.data(), tmp.size()) == -1 ) - KNHelper::displayExternalFileError( parent ); + KNHelper::displayExternalFileError( tqparent ); } } @@ -140,7 +140,7 @@ TQString KNArticleManager::saveContentToTemp(KMime::Content *c) if (tmpFile->status()!=0) { KNHelper::displayTempFileError(); delete tmpFile; - return TQString::null; + return TQString(); } mTempFiles.append(tmpFile); @@ -272,7 +272,7 @@ void KNArticleManager::showHdrs(bool clear) } - if (current && !current->filterResult()) { // try to find a parent that is visible + if (current && !current->filterResult()) { // try to find a tqparent that is visible int idRef; while (current && !current->filterResult()) { idRef=current->idRef(); @@ -324,7 +324,7 @@ void KNArticleManager::showHdrs(bool clear) knGlobals.top->articleViewer()->setArticle( 0 ); } - knGlobals.seStatusMsg(TQString::null); + knGlobals.seStatusMsg(TQString()); updateStatusString(); knGlobals.top->setCursorBusy(false); } @@ -997,7 +997,7 @@ void KNArticleManager::updateStatusString() if(f_ilter) knGlobals.seStatusMsg(i18n(" Filter: %1").arg(f_ilter->translatedName()), SB_FILTER); else - knGlobals.seStatusMsg(TQString::null, SB_FILTER); + knGlobals.seStatusMsg(TQString(), SB_FILTER); } else if(f_older) { if(f_ilter) @@ -1006,10 +1006,10 @@ void KNArticleManager::updateStatusString() displCnt=f_older->count(); knGlobals.seStatusMsg(i18n(" %1: %2 displayed") .arg(f_older->name()).arg(displCnt), SB_GROUP); - knGlobals.seStatusMsg(TQString::null, SB_FILTER); + knGlobals.seStatusMsg(TQString(), SB_FILTER); } else { - knGlobals.seStatusMsg(TQString::null, SB_GROUP); - knGlobals.seStatusMsg(TQString::null, SB_FILTER); + knGlobals.seStatusMsg(TQString(), SB_GROUP); + knGlobals.seStatusMsg(TQString(), SB_FILTER); } } diff --git a/knode/knarticlemanager.h b/knode/knarticlemanager.h index 25d43179..08423cf8 100644 --- a/knode/knarticlemanager.h +++ b/knode/knarticlemanager.h @@ -39,6 +39,7 @@ class KNJobData; class KNArticleManager : public TQObject, public KNJobConsumer { Q_OBJECT + TQ_OBJECT public: KNArticleManager(); @@ -46,8 +47,8 @@ class KNArticleManager : public TQObject, public KNJobConsumer { //content handling void deleteTempFiles(); - void saveContentToFile(KMime::Content *c, TQWidget *parent); - void saveArticleToFile(KNArticle *a, TQWidget *parent); + void saveContentToFile(KMime::Content *c, TQWidget *tqparent); + void saveArticleToFile(KNArticle *a, TQWidget *tqparent); TQString saveContentToTemp(KMime::Content *c); void openContent(KMime::Content *c); diff --git a/knode/knarticlewindow.h b/knode/knarticlewindow.h index 1859e773..297790eb 100644 --- a/knode/knarticlewindow.h +++ b/knode/knarticlewindow.h @@ -27,6 +27,7 @@ namespace KNode { class KNArticleWindow : public KMainWindow { Q_OBJECT + TQ_OBJECT public: KNArticleWindow(KNArticle *art); diff --git a/knode/kncollection.h b/knode/kncollection.h index f6c4b915..697021c4 100644 --- a/knode/kncollection.h +++ b/knode/kncollection.h @@ -45,8 +45,8 @@ class KNCollection { virtual bool readInfo(const TQString &confPath)=0; virtual void saveInfo()=0; - // parent - KNCollection* parent()const { return p_arent; } + // tqparent + KNCollection* tqparent()const { return p_arent; } virtual void setParent(KNCollection *p) { p_arent=p; } // name diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp index 40cce774..ef97c653 100644 --- a/knode/kncollectionview.cpp +++ b/knode/kncollectionview.cpp @@ -32,8 +32,8 @@ #include "kncollectionview.h" #include "kncollectionviewitem.h" -KNCollectionView::KNCollectionView(TQWidget *parent, const char* name) : - KFolderTree(parent, name), +KNCollectionView::KNCollectionView(TQWidget *tqparent, const char* name) : + KFolderTree(tqparent, name), mActiveItem( 0 ), mPopup( 0 ) { @@ -221,13 +221,13 @@ void KNCollectionView::addFolder(KNFolder *f) { KNCollectionViewItem *it; - if (!f->parent()) { + if (!f->tqparent()) { // root folder it = new KNCollectionViewItem(this, KFolderTreeItem::Local); } else { - // make sure the parent folder has already been added - if (!f->parent()->listItem()) - addFolder( static_cast<KNFolder*>(f->parent()) ); + // make sure the tqparent folder has already been added + if (!f->tqparent()->listItem()) + addFolder( static_cast<KNFolder*>(f->tqparent()) ); // handle special folders KFolderTreeItem::Type type = KFolderTreeItem::Other; switch ( f->id() ) { @@ -238,7 +238,7 @@ void KNCollectionView::addFolder(KNFolder *f) case 3: type = KFolderTreeItem::SentMail; break; } - it = new KNCollectionViewItem( f->parent()->listItem(), KFolderTreeItem::Local, type ); + it = new KNCollectionViewItem( f->tqparent()->listItem(), KFolderTreeItem::Local, type ); } f->setListItem( it ); updateFolder( f ); diff --git a/knode/kncollectionview.h b/knode/kncollectionview.h index 000e1289..fe25618f 100644 --- a/knode/kncollectionview.h +++ b/knode/kncollectionview.h @@ -27,9 +27,10 @@ class KNCollectionViewItem; class KNCollectionView : public KFolderTree { Q_OBJECT + TQ_OBJECT public: - KNCollectionView(TQWidget *parent, const char *name = 0); + KNCollectionView(TQWidget *tqparent, const char *name = 0); ~KNCollectionView(); void setActive(TQListViewItem *item); diff --git a/knode/kncollectionviewitem.cpp b/knode/kncollectionviewitem.cpp index 35f2ae2c..0be47ddc 100644 --- a/knode/kncollectionviewitem.cpp +++ b/knode/kncollectionviewitem.cpp @@ -32,15 +32,15 @@ #include "knconfigmanager.h" -KNCollectionViewItem::KNCollectionViewItem( KFolderTree *parent, Protocol protocol, Type type) : - KFolderTreeItem(parent, TQString::null, protocol, type), coll(0) +KNCollectionViewItem::KNCollectionViewItem( KFolderTree *tqparent, Protocol protocol, Type type) : + KFolderTreeItem(tqparent, TQString(), protocol, type), coll(0) { setIcon(); } KNCollectionViewItem::KNCollectionViewItem( KFolderTreeItem *it, Protocol protocol, Type type, int unread, int total ) : - KFolderTreeItem(it, TQString::null, protocol, type, unread, total), coll(0) + KFolderTreeItem(it, TQString(), protocol, type, unread, total), coll(0) { setIcon(); } @@ -137,7 +137,7 @@ void KNCollectionViewItem::paintCell( TQPainter * p, const TQColorGroup & cg,int if (px) pxWidth += px->width(); - // temporary set the squeezed text and use the parent class to paint it + // temporary set the squeezed text and use the tqparent class to paint it TQString curText = text( column ); if ( p->fontMetrics().width( curText ) > width - pxWidth ) { setText( column, squeezeFolderName( curText, p->fontMetrics(), width - pxWidth ) ); @@ -157,7 +157,7 @@ TQString KNCollectionViewItem::squeezeFolderName( const TQString &text, int curPos = 0, nextPos = 0; TQString temp; while ( (uint)fm.width(t) > width && nextPos != -1 ) { - nextPos = t.find('.', curPos); + nextPos = t.tqfind('.', curPos); if ( nextPos != -1 ) { temp = t[curPos]; t.tqreplace( curPos, nextPos - curPos, temp ); diff --git a/knode/kncollectionviewitem.h b/knode/kncollectionviewitem.h index 4f343147..14381a29 100644 --- a/knode/kncollectionviewitem.h +++ b/knode/kncollectionviewitem.h @@ -28,8 +28,8 @@ class KNCollection; class KNCollectionViewItem : public KFolderTreeItem { public: - KNCollectionViewItem( KFolderTree *parent, Protocol protocol = NONE, Type type = Root); - KNCollectionViewItem( KFolderTreeItem *parent, Protocol protocol = NONE, + KNCollectionViewItem( KFolderTree *tqparent, Protocol protocol = NONE, Type type = Root); + KNCollectionViewItem( KFolderTreeItem *tqparent, Protocol protocol = NONE, Type type = Other, int unread = 0, int total = 0 ); ~KNCollectionViewItem(); diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index aabb8e66..4e928a49 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -63,8 +63,8 @@ using KRecentAddress::RecentAddresses; #include <kstdguiitem.h> KNLineEdit::KNLineEdit(KNComposer::ComposerView *_composerView, bool useCompletion, - TQWidget *parent, const char *name) - : KNLineEditInherited(parent,useCompletion,name) , composerView(_composerView) + TQWidget *tqparent, const char *name) + : KNLineEditInherited(tqparent,useCompletion,name) , composerView(_composerView) { } @@ -131,8 +131,8 @@ void KNLineEdit::keyPressEvent(TQKeyEvent *e) KNLineEditInherited::keyPressEvent(e); } -KNLineEditSpell::KNLineEditSpell( KNComposer::ComposerView *_composerView, bool useCompletion,TQWidget * parent, const char * name) - :KNLineEdit( _composerView, useCompletion, parent,name ) +KNLineEditSpell::KNLineEditSpell( KNComposer::ComposerView *_composerView, bool useCompletion,TQWidget * tqparent, const char * name) + :KNLineEdit( _composerView, useCompletion, tqparent,name ) { } @@ -189,15 +189,15 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString & //statusbar KStatusBar *sb=statusBar(); - sb->insertItem(TQString::null, 1,1); // type + sb->insertItem(TQString(), 1,1); // type sb->setItemAlignment (1,AlignLeft | AlignVCenter); - sb->insertItem(TQString::null, 2,1); // charset + sb->insertItem(TQString(), 2,1); // charset sb->setItemAlignment (2,AlignLeft | AlignVCenter); - sb->insertItem(TQString::null, 3,0); // column + sb->insertItem(TQString(), 3,0); // column sb->setItemAlignment (3,AlignCenter | AlignVCenter); - sb->insertItem(TQString::null, 4,0); // column + sb->insertItem(TQString(), 4,0); // column sb->setItemAlignment (4,AlignCenter | AlignVCenter); - sb->insertItem(TQString::null, 5,0); // line + sb->insertItem(TQString(), 5,0); // line sb->setItemAlignment (5,AlignCenter | AlignVCenter); connect(v_iew->e_dit, TQT_SIGNAL(CursorPositionChanged()), TQT_SLOT(slotUpdateCursorPos())); connect(v_iew->e_dit, TQT_SIGNAL(toggle_overwrite_signal()), TQT_SLOT(slotUpdateStatusBar())); @@ -235,8 +235,8 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString & KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), actionCollection()); - KStdAction::find(v_iew->e_dit, TQT_SLOT(slotFind()), actionCollection()); - KStdAction::tqfindNext(v_iew->e_dit, TQT_SLOT(slotSearchAgain()), actionCollection()); + KStdAction::tqfind(v_iew->e_dit, TQT_SLOT(slotFind()), actionCollection()); + KStdAction::findNext(v_iew->e_dit, TQT_SLOT(slotSearchAgain()), actionCollection()); KStdAction::tqreplace(v_iew->e_dit, TQT_SLOT(slotReplace()), actionCollection()); @@ -579,7 +579,7 @@ bool KNComposer::hasValidData() if (groupCount>5) if (!(KMessageBox::warningYesNo( this, i18n("You are crossposting to more than five newsgroups.\nPlease reconsider whether this is really useful\nand remove groups in which your article is off-topic.\nDo you want to re-edit the article or send it anyway?"), - TQString::null, i18n("&Send"),i18n("edit article","&Edit")) == KMessageBox::Yes)) + TQString(), i18n("&Send"),i18n("edit article","&Edit")) == KMessageBox::Yes)) return false; if ( !followUp && groupCount > 2 ) { @@ -588,7 +588,7 @@ bool KNComposer::hasValidData() "Please use the \"Followup-To\" header to direct the replies " "to your article into one group.\n" "Do you want to re-edit the article or send it anyway?"), - TQString::null, i18n("&Send"), i18n("edit article","&Edit"), "missingFollowUpTo" ) + TQString(), i18n("&Send"), i18n("edit article","&Edit"), "missingFollowUpTo" ) != KMessageBox::Yes ) return false; } @@ -600,7 +600,7 @@ bool KNComposer::hasValidData() if (fupCount>5) if (!(KMessageBox::warningYesNo( this, i18n("You are directing replies to more than five newsgroups.\nPlease reconsider whether this is really useful.\nDo you want to re-edit the article or send it anyway?"), - TQString::null, i18n("&Send"),i18n("edit article","&Edit")) == KMessageBox::Yes)) + TQString(), i18n("&Send"),i18n("edit article","&Edit")) == KMessageBox::Yes)) return false; } @@ -658,7 +658,7 @@ bool KNComposer::hasValidData() } if (n_eeds8Bit && (c_harset.lower()=="us-ascii")) { - KMessageBox::sorry(this, i18n("Your message tqcontains characters which are not included\nin the \"us-ascii\" character set; please choose\na suitable character set from the \"Options\" menu.")); + KMessageBox::sorry(this, i18n("Your message contains characters which are not included\nin the \"us-ascii\" character set; please choose\na suitable character set from the \"Options\" menu.")); return false; } @@ -670,7 +670,7 @@ bool KNComposer::hasValidData() if ((textLines>1)&&(notQuoted==1)) { if (hasAttributionLine) if (!(KMessageBox::warningYesNo( this, i18n("Your article seems to consist entirely of quoted text;\ndo you want to re-edit the article or send it anyway?"), - TQString::null, i18n("&Send"),i18n("edit article","&Edit")) == KMessageBox::Yes)) + TQString(), i18n("&Send"),i18n("edit article","&Edit")) == KMessageBox::Yes)) return false; } else { if (notQuoted==0) { @@ -682,20 +682,20 @@ bool KNComposer::hasValidData() if (longLine) if (!(KMessageBox::warningYesNo( this, - i18n("Your article tqcontains lines longer than 80 characters.\n" + i18n("Your article contains lines longer than 80 characters.\n" "Do you want to re-edit the article or send it anyway?"), - TQString::null, i18n("&Send"), + TQString(), i18n("&Send"), i18n("edit article","&Edit")) == KMessageBox::Yes)) return false; if (sigLength>8) { if (!(KMessageBox::warningYesNo( this, i18n("Your signature is more than 8 lines long.\nYou should shorten it to match the widely accepted limit of 4 lines.\nDo you want to re-edit the article or send it anyway?"), - TQString::null, i18n("&Send"),i18n("edit article","&Edit")) == KMessageBox::Yes)) + TQString(), i18n("&Send"),i18n("edit article","&Edit")) == KMessageBox::Yes)) return false; } else if (sigLength>4) KMessageBox::information(this, i18n("Your signature exceeds the widely-accepted limit of 4 lines:\nplease consider shortening your signature;\notherwise, you will probably annoy your readers."), - TQString::null,"longSignatureWarning"); + TQString(),"longSignatureWarning"); // check if article can be signed if ( a_ctPGPsign->isChecked() ) { @@ -721,7 +721,7 @@ bool KNComposer::hasValidData() "in the account properties or in the " "group properties.\n" "The article will be sent unsigned." ), - TQString::null, i18n( "Send Unsigned" ), + TQString(), i18n( "Send Unsigned" ), "sendUnsignedDialog" ) == KMessageBox::Cancel ) return false; @@ -876,7 +876,7 @@ void KNComposer::closeEvent(TQCloseEvent *e) } else { switch ( KMessageBox::warningYesNoCancel( this, i18n("Do you want to save this article in the draft folder?"), - TQString::null, KStdGuiItem::save(), KStdGuiItem::discard())) { + TQString(), KStdGuiItem::save(), KStdGuiItem::discard())) { case KMessageBox::Yes : r_esult=CRsave; break; @@ -900,7 +900,7 @@ void KNComposer::initData(const TQString &text) { //Subject if(a_rticle->subject()->isEmpty()) - slotSubjectChanged(TQString::null); + slotSubjectChanged(TQString()); else v_iew->s_ubject->setText(a_rticle->subject()->asUnicodeString()); @@ -957,7 +957,7 @@ void KNComposer::initData(const TQString &text) } -// inserts at cursor position if clear is false, tqreplaces content otherwise +// inserts at cursor position if clear is false, replaces content otherwise // puts the file content into a box if box==true // "file" is already open for reading void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitle) @@ -1165,7 +1165,7 @@ void KNComposer::slotToggleDoMail() if (a_ctDoMail->isChecked()) { if (a_uthorDislikesMailCopies) { if (!(KMessageBox::warningContinueCancel(this, i18n("The poster does not want a mail copy of your reply (Mail-Copies-To: nobody);\nplease respect their request."), - TQString::null, i18n("&Send Copy")) == KMessageBox::Continue)) { + TQString(), i18n("&Send Copy")) == KMessageBox::Continue)) { a_ctDoMail->setChecked(false); //revert return; } @@ -1231,7 +1231,7 @@ void KNComposer::slotToggleWordWrap() void KNComposer::slotUndoRewrap() { - if (KMessageBox::warningContinueCancel( this, i18n("This will tqreplace all text you have written.")) == KMessageBox::Continue) { + if (KMessageBox::warningContinueCancel( this, i18n("This will replace all text you have written.")) == KMessageBox::Continue) { v_iew->e_dit->setText(u_nwraped); slotAppendSig(); } @@ -1422,7 +1422,7 @@ void KNComposer::slotNewToolbarConfig() void KNComposer::slotSubjectChanged(const TQString &t) { - // tqreplace newlines + // replace newlines TQString subject = t; subject.tqreplace( '\n', ' ' ); subject.tqreplace( '\r', ' ' ); @@ -1438,7 +1438,7 @@ void KNComposer::slotSubjectChanged(const TQString &t) void KNComposer::slotGroupsChanged(const TQString &t) { - KQCStringSplitter split; + KTQCStringSplitter split; bool splitOk; TQString currText=v_iew->f_up2->currentText(); @@ -1744,7 +1744,7 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) hdrL->addWidget(l_to, 0,0); hdrL->addWidget(t_o, 0,1); hdrL->addWidget(t_oBtn, 0,2); - connect(t_oBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotToBtnClicked())); + connect(t_oBtn, TQT_SIGNAL(clicked()), tqparent(), TQT_SLOT(slotToBtnClicked())); //Newsgroups g_roups=new KNLineEdit(this, false, hdrFrame); @@ -1756,8 +1756,8 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) hdrL->addWidget(g_roups, 1,1); hdrL->addWidget(g_roupsBtn, 1,2); connect(g_roups, TQT_SIGNAL(textChanged(const TQString&)), - parent(), TQT_SLOT(slotGroupsChanged(const TQString&))); - connect(g_roupsBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotGroupsBtnClicked())); + tqparent(), TQT_SLOT(slotGroupsChanged(const TQString&))); + connect(g_roupsBtn, TQT_SIGNAL(clicked()), tqparent(), TQT_SLOT(slotGroupsBtnClicked())); //Followup-To f_up2=new KComboBox(true, hdrFrame); @@ -1773,7 +1773,7 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) hdrL->addWidget(l, 3,0); hdrL->addMultiCellWidget(s_ubject, 3,3, 1,2); connect(s_ubject, TQT_SIGNAL(textChanged(const TQString&)), - parent(), TQT_SLOT(slotSubjectChanged(const TQString&))); + tqparent(), TQT_SLOT(slotSubjectChanged(const TQString&))); //Editor e_dit=new Editor(this, composer, main); @@ -1798,13 +1798,13 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) TQVBoxLayout *notL=new TQVBoxLayout(e_dit); notL->addStretch(1); - n_otification=new TQGroupBox(2, Qt::Horizontal, e_dit); + n_otification=new TQGroupBox(2, TQt::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); n_otification->setLineWidth(2); n_otification->hide(); - notL->addWidget(n_otification, 0, Qt::AlignHCenter); + notL->addWidget(n_otification, 0, TQt::AlignHCenter); notL->addStretch(1); //finish GUI @@ -1907,33 +1907,33 @@ void KNComposer::ComposerView::showAttachmentView() //connections connect(a_ttView, TQT_SIGNAL(currentChanged(TQListViewItem*)), - parent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*))); + tqparent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*))); connect(a_ttView, TQT_SIGNAL(clicked ( TQListViewItem * )), - parent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*))); + tqparent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*))); connect(a_ttView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - parent(), TQT_SLOT(slotAttachmentPopup(KListView*, TQListViewItem*, const TQPoint&))); + tqparent(), TQT_SLOT(slotAttachmentPopup(KListView*, TQListViewItem*, const TQPoint&))); connect(a_ttView, TQT_SIGNAL(delPressed(TQListViewItem*)), - parent(), TQT_SLOT(slotAttachmentRemove(TQListViewItem*))); + tqparent(), TQT_SLOT(slotAttachmentRemove(TQListViewItem*))); connect(a_ttView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - parent(), TQT_SLOT(slotAttachmentEdit(TQListViewItem*))); + tqparent(), TQT_SLOT(slotAttachmentEdit(TQListViewItem*))); connect(a_ttView, TQT_SIGNAL(returnPressed(TQListViewItem*)), - parent(), TQT_SLOT(slotAttachmentEdit(TQListViewItem*))); + tqparent(), TQT_SLOT(slotAttachmentEdit(TQListViewItem*))); //buttons a_ttAddBtn=new TQPushButton(i18n("A&dd..."),a_ttWidget); - connect(a_ttAddBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotAttachFile())); + connect(a_ttAddBtn, TQT_SIGNAL(clicked()), tqparent(), TQT_SLOT(slotAttachFile())); topL->addWidget(a_ttAddBtn, 0,1); a_ttRemoveBtn=new TQPushButton(i18n("&Remove"), a_ttWidget); a_ttRemoveBtn->setEnabled(false); - connect(a_ttRemoveBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotRemoveAttachment())); + connect(a_ttRemoveBtn, TQT_SIGNAL(clicked()), tqparent(), TQT_SLOT(slotRemoveAttachment())); topL->addWidget(a_ttRemoveBtn, 1,1); a_ttEditBtn=new TQPushButton(i18n("&Properties"), a_ttWidget); a_ttEditBtn->setEnabled(false); - connect(a_ttEditBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotAttachmentProperties())); - topL->addWidget(a_ttEditBtn, 2,1, Qt::AlignTop); + connect(a_ttEditBtn, TQT_SIGNAL(clicked()), tqparent(), TQT_SLOT(slotAttachmentProperties())); + topL->addWidget(a_ttEditBtn, 2,1, TQt::AlignTop); topL->setRowStretch(2,1); topL->setColStretch(0,1); @@ -1991,8 +1991,8 @@ void KNComposer::ComposerView::hideExternalNotification() //===================================================================================== #include <kcursor.h> -KNComposer::Editor::Editor(KNComposer::ComposerView *_composerView, KNComposer *_composer, TQWidget *parent, char *name) - : KEdit(parent, name), m_composer( _composer ), m_composerView(_composerView) +KNComposer::Editor::Editor(KNComposer::ComposerView *_composerView, KNComposer *_composer, TQWidget *tqparent, char *name) + : KEdit(tqparent, name), m_composer( _composer ), m_composerView(_composerView) { setOverwriteEnabled(true); spell = 0L; @@ -2047,18 +2047,18 @@ bool KNComposer::Editor::eventFilter(TQObject*o, TQEvent* e) { //Get word right clicked on firstSpace = paraText.findRev( m_bound, charPos ) + 1; - lastSpace = paraText.find( m_bound, charPos ); + lastSpace = paraText.tqfind( m_bound, charPos ); if( lastSpace == -1 ) lastSpace = paraText.length(); TQString word = paraText.mid( firstSpace, lastSpace - firstSpace ); //Continue if this word was misspelled - if( !word.isEmpty() && m_tqreplacements.tqcontains( word ) ) + if( !word.isEmpty() && m_replacements.tqcontains( word ) ) { KPopupMenu p; p.insertTitle( i18n("Suggestions") ); //Add the suggestions to the popup menu - TQStringList reps = m_tqreplacements[word]; + TQStringList reps = m_replacements[word]; if( reps.count() > 0 ) { int listPos = 0; @@ -2081,11 +2081,11 @@ bool KNComposer::Editor::eventFilter(TQObject*o, TQEvent* e) int parIdx = 1, txtIdx = 1; getCursorPosition(&parIdx, &txtIdx); setSelection(para, firstSpace, para, lastSpace); - insert(m_tqreplacements[word][id]); + insert(m_replacements[word][id]); // Restore the cursor position; if the cursor was behind the // misspelled word then adjust the cursor position if ( para == parIdx && txtIdx >= lastSpace ) - txtIdx += m_tqreplacements[word][id].length() - word.length(); + txtIdx += m_replacements[word][id].length() - word.length(); setCursorPosition(parIdx, txtIdx); } //Cancel original event @@ -2099,7 +2099,7 @@ bool KNComposer::Editor::eventFilter(TQObject*o, TQEvent* e) void KNComposer::Editor::slotAddSuggestion( const TQString &text, const TQStringList &lst, unsigned int ) { - m_tqreplacements[text] = lst; + m_replacements[text] = lst; } // expand tabs to avoid the "tab-damage", @@ -2137,12 +2137,12 @@ TQStringList KNComposer::Editor::processedText() } } - TQString tqreplacement; + TQString replacement; int tabPos; for (TQStringList::Iterator it = ret.begin(); it != ret.end(); ++it ) { - while ((tabPos=(*it).find('\t'))!=-1) { - tqreplacement.fill(TQChar(' '), 8-(tabPos%8)); - (*it).tqreplace(tabPos, 1, tqreplacement); + while ((tabPos=(*it).tqfind('\t'))!=-1) { + replacement.fill(TQChar(' '), 8-(tabPos%8)); + (*it).tqreplace(tabPos, 1, replacement); } } @@ -2261,7 +2261,7 @@ void KNComposer::Editor::slotRemoveBox() setAutoUpdate(false); - // find & remove box begin + // tqfind & remove box begin int x = l; while ((x>=0)&&(textLine(x).left(5)!=",----")) x--; @@ -2278,7 +2278,7 @@ void KNComposer::Editor::slotRemoveBox() } } - // find & remove box end + // tqfind & remove box end x = l; while ((x<numLines())&&(textLine(x).left(5)!="`----")) x++; @@ -2332,7 +2332,7 @@ void KNComposer::Editor::keyPressEvent ( TQKeyEvent *e) int line, col; getCursorPosition( &line, &col ); TQString lineText = text( line ); - // returns line with additional trailing space (bug in Qt?), cut it off + // returns line with additional trailing space (bug in TQt?), cut it off lineText.truncate( lineText.length() - 1 ); // special treatment of quoted lines only if the cursor is neither at // the begin nor at the end of the line @@ -2490,8 +2490,8 @@ void KNComposer::Editor::slotCorrectWord() //===================================================================================== -KNComposer::AttachmentView::AttachmentView(TQWidget *parent, char *name) - : KListView(parent, name) +KNComposer::AttachmentView::AttachmentView(TQWidget *tqparent, char *name) + : KListView(tqparent, name) { setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); // match the TQMultiLineEdit style addColumn(i18n("File"), 115); @@ -2560,9 +2560,9 @@ 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, Qt::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, Qt::AlignLeft); + fileL->addWidget(new TQLabel(a->contentSize(), fileGB), 2,1, TQt::AlignLeft); fileL->setColStretch(1,1); topL->addWidget(fileGB); @@ -2626,11 +2626,11 @@ void KNComposer::AttachmentPropertiesDlg::apply() void KNComposer::AttachmentPropertiesDlg::accept() { - if(m_imeType->text().find('/')==-1) { + if(m_imeType->text().tqfind('/')==-1) { KMessageBox::sorry(this, i18n("You have set an invalid mime-type.\nPlease change it.")); return; } - else if(n_onTextAsText && m_imeType->text().find("text/", 0, false)!=-1 && + else if(n_onTextAsText && m_imeType->text().tqfind("text/", 0, false)!=-1 && KMessageBox::warningContinueCancel(this, i18n("You have changed the mime-type of this non-textual attachment\nto text. This might cause an error while loading or encoding the file.\nProceed?") ) == KMessageBox::Cancel) return; diff --git a/knode/kncomposer.h b/knode/kncomposer.h index 05d6de0a..83b406be 100644 --- a/knode/kncomposer.h +++ b/knode/kncomposer.h @@ -44,6 +44,7 @@ class SpellingFilter; class KNComposer : public KMainWindow , virtual public KNodeComposerIface { Q_OBJECT + TQ_OBJECT public: enum composerResult { CRsendNow, CRsendLater, CRdelAsk, @@ -52,7 +53,7 @@ class KNComposer : public KMainWindow , virtual public KNodeComposerIface { // unwraped == original, not rewraped text // firstEdit==true: place the cursor at the end of the article - KNComposer(KNLocalArticle *a, const TQString &text=TQString::null, const TQString &sig=TQString::null, const TQString &unwraped=TQString::null, bool firstEdit=false, bool dislikesCopies=false, bool createCopy=false); + KNComposer(KNLocalArticle *a, const TQString &text=TQString(), const TQString &sig=TQString(), const TQString &unwraped=TQString(), bool firstEdit=false, bool dislikesCopies=false, bool createCopy=false); ~KNComposer(); void setConfig(bool onlyFonts); void setMessageMode(MessageMode mode); @@ -68,10 +69,10 @@ class KNComposer : public KMainWindow , virtual public KNodeComposerIface { //set data from the given article void initData(const TQString &text); - // inserts at cursor position if clear is false, tqreplaces content otherwise + // inserts at cursor position if clear is false, replaces content otherwise // puts the file content into a box if box==true // "file" is already open for reading - void insertFile(TQFile *file, bool clear=false, bool box=false, TQString boxTitle=TQString::null); + void insertFile(TQFile *file, bool clear=false, bool box=false, TQString boxTitle=TQString()); // ask for a filename, handle network urls void insertFile(bool clear=false, bool box=false); @@ -251,9 +252,10 @@ class KNComposer::ComposerView : public TQSplitter { class KNComposer::Editor : public KEdit { Q_OBJECT + TQ_OBJECT public: - Editor(KNComposer::ComposerView *_composerView, KNComposer *_composer, TQWidget *parent=0, char *name=0); + Editor(KNComposer::ComposerView *_composerView, KNComposer *_composer, TQWidget *tqparent=0, char *name=0); ~Editor(); TQStringList processedText(); @@ -295,7 +297,7 @@ private: KNComposer *m_composer; KNComposer::ComposerView *m_composerView; KSpell *spell; - TQMap<TQString,TQStringList> m_tqreplacements; + TQMap<TQString,TQStringList> m_replacements; TQRegExp m_bound; }; @@ -303,9 +305,10 @@ private: class KNComposer::AttachmentView : public KListView { Q_OBJECT + TQ_OBJECT public: - AttachmentView(TQWidget *parent, char *name=0); + AttachmentView(TQWidget *tqparent, char *name=0); ~AttachmentView(); protected: @@ -330,6 +333,7 @@ class KNComposer::AttachmentViewItem : public KListViewItem { class KNComposer::AttachmentPropertiesDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: AttachmentPropertiesDlg( KNAttachment *a, TQWidget *p=0, const char *n=0); @@ -354,13 +358,14 @@ class KNComposer::AttachmentPropertiesDlg : public KDialogBase { class KNLineEdit : public KABC::AddressLineEdit { Q_OBJECT + TQ_OBJECT typedef KABC::AddressLineEdit KNLineEditInherited; public: - KNLineEdit(KNComposer::ComposerView *_composerView, bool useCompletion, TQWidget *parent = 0, + KNLineEdit(KNComposer::ComposerView *_composerView, bool useCompletion, TQWidget *tqparent = 0, const char *name = 0); protected: - // Inherited. Always called by the parent when this widget is created. + // Inherited. Always called by the tqparent when this widget is created. virtual void loadAddresses(); void keyPressEvent(TQKeyEvent *e); virtual TQPopupMenu *createPopupMenu(); @@ -373,8 +378,9 @@ private: class KNLineEditSpell : public KNLineEdit { Q_OBJECT + TQ_OBJECT public: - KNLineEditSpell(KNComposer::ComposerView *_composerView, bool useCompletion,TQWidget * parent, const char * name = 0); + KNLineEditSpell(KNComposer::ComposerView *_composerView, bool useCompletion,TQWidget * tqparent, const char * name = 0); void highLightWord( unsigned int length, unsigned int pos ); void spellCheckDone( const TQString &s ); void spellCheckerMisspelling( const TQString &text, const TQStringList &, unsigned int pos); diff --git a/knode/kncomposerui.rc b/knode/kncomposerui.rc index 0a203d26..4e0ec378 100644 --- a/knode/kncomposerui.rc +++ b/knode/kncomposerui.rc @@ -20,9 +20,9 @@ <Action name="paste_quoted"/> <Action name="edit_select_all"/> <Separator/> - <Action name="edit_find"/> + <Action name="edit_tqfind"/> <Action name="edit_find_next"/> - <Action name="edit_replace"/> + <Action name="edit_tqreplace"/> </Menu> <Menu name="attach"><text>&Attach</text> <Action name="append_signature"/> @@ -91,8 +91,8 @@ <Action name="paste_quoted"/> <Action name="edit_select_all"/> <Separator/> - <Action name="edit_find"/> - <Action name="edit_replace"/> + <Action name="edit_tqfind"/> + <Action name="edit_tqreplace"/> <Separator/> <Menu name="spell"><text>Spell Result</text> <ActionList name="spell_result"/> diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp index cfeb8f00..a7534386 100644 --- a/knode/knconfig.cpp +++ b/knode/knconfig.cpp @@ -112,8 +112,8 @@ bool KNConfig::Identity::emailIsValid() TQString KNConfig::Identity::getSignature() { - s_igContents = TQString::null; // don't cache file contents - s_igStdErr = TQString::null; + s_igContents = TQString(); // don't cache file contents + s_igStdErr = TQString(); if (u_seSigFile) { if(!s_igPath.isEmpty()) { @@ -486,7 +486,7 @@ TQColor KNConfig::Appearance::defaultColor(int i) const case signWarn: return TQColor( 0xFF, 0xFF, 0x40 ); case signErr: - return Qt::red; + return TQt::red; case htmlWarning: return TQColor( 0xFF, 0x40, 0x40 ); @@ -862,7 +862,7 @@ void KNConfig::Scoring::save() KNConfig::XHeader::XHeader(const TQString &s) { if(s.left(2)=="X-") { - int pos=s.find(": "); + int pos=s.tqfind(": "); if(pos!=-1) { n_ame=s.mid(2, pos-2).latin1(); pos+=2; @@ -999,7 +999,7 @@ int KNConfig::PostNewsTechnical::indexForCharset(const TQCString &str) TQCString KNConfig::PostNewsTechnical::findComposerCharset(TQCString cs) { - TQCString *ret=findComposerCSCache.find(cs); + TQCString *ret=findComposerCSCache.tqfind(cs); if (ret) return *ret; diff --git a/knode/knconfig.h b/knode/knconfig.h index 6bca3ab1..f2fd7d11 100644 --- a/knode/knconfig.h +++ b/knode/knconfig.h @@ -66,6 +66,7 @@ class Base { class KDE_EXPORT Identity : public TQObject, public Base { Q_OBJECT + TQ_OBJECT friend class IdentityWidget; diff --git a/knode/knconfigmanager.h b/knode/knconfigmanager.h index 5a002a93..4ec08c41 100644 --- a/knode/knconfigmanager.h +++ b/knode/knconfigmanager.h @@ -27,6 +27,7 @@ class KNConfigDialog; class KNConfigManager : TQObject { Q_OBJECT + TQ_OBJECT public: KNConfigManager(TQObject *p=0, const char *n=0); @@ -71,6 +72,7 @@ class KNConfigManager : TQObject { class KNConfigDialog : public KCMultiDialog { Q_OBJECT + TQ_OBJECT public: KNConfigDialog(TQWidget *p=0, const char *n=0); diff --git a/knode/knconfigpages.cpp b/knode/knconfigpages.cpp index 030838ac..fa0593c2 100644 --- a/knode/knconfigpages.cpp +++ b/knode/knconfigpages.cpp @@ -28,8 +28,8 @@ // // common config page with tabs (code mostly taken from kmail) // -KNConfig::BasePageWithTabs::BasePageWithTabs( TQWidget * parent, const char * name ) - : KCModule( parent, name ) +KNConfig::BasePageWithTabs::BasePageWithTabs( TQWidget * tqparent, const char * name ) + : KCModule( tqparent, name ) { TQVBoxLayout *vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); mTabWidget = new TQTabWidget( this ); @@ -72,11 +72,11 @@ void KNConfig::BasePageWithTabs::defaults() { // extern "C" { - KDE_EXPORT KCModule *create_knode_config_identity( TQWidget *parent, const char * ) + KDE_EXPORT KCModule *create_knode_config_identity( TQWidget *tqparent, const char * ) { KNConfig::IdentityWidget *page = new KNConfig::IdentityWidget( knGlobals.configManager()->identity(), - parent, + tqparent, "kcmknode_config_identity" ); return page; } @@ -89,15 +89,15 @@ extern "C" // extern "C" { - KCModule *create_knode_config_accounts( TQWidget *parent, const char * ) + KCModule *create_knode_config_accounts( TQWidget *tqparent, const char * ) { - KNConfig::AccountsPage *page = new KNConfig::AccountsPage( parent, "kcmknode_config_accounts" ); + KNConfig::AccountsPage *page = new KNConfig::AccountsPage( tqparent, "kcmknode_config_accounts" ); return page; } } -KNConfig::AccountsPage::AccountsPage(TQWidget *parent, const char *name) - : BasePageWithTabs(parent, name) { +KNConfig::AccountsPage::AccountsPage(TQWidget *tqparent, const char *name) + : BasePageWithTabs(tqparent, name) { addTab(new KNConfig::NntpAccountListWidget(this), i18n("Newsgroup Servers")); addTab(new KNConfig::SmtpAccountWidget(this), i18n("Mail Server (SMTP)")); @@ -110,9 +110,9 @@ KNConfig::AccountsPage::AccountsPage(TQWidget *parent, const char *name) // extern "C" { - KCModule *create_knode_config_appearance( TQWidget *parent, const char * ) + KCModule *create_knode_config_appearance( TQWidget *tqparent, const char * ) { - KNConfig::AppearanceWidget *page = new KNConfig::AppearanceWidget( parent, "kcmknode_config_appearance" ); + KNConfig::AppearanceWidget *page = new KNConfig::AppearanceWidget( tqparent, "kcmknode_config_appearance" ); return page; } } @@ -124,15 +124,15 @@ extern "C" // extern "C" { - KCModule *create_knode_config_read_news( TQWidget *parent, const char * ) + KCModule *create_knode_config_read_news( TQWidget *tqparent, const char * ) { - KNConfig::ReadNewsPage *page = new KNConfig::ReadNewsPage( parent, "kcmknode_config_read_news" ); + KNConfig::ReadNewsPage *page = new KNConfig::ReadNewsPage( tqparent, "kcmknode_config_read_news" ); return page; } } -KNConfig::ReadNewsPage::ReadNewsPage(TQWidget *parent, const char *name) - : BasePageWithTabs(parent, name) { +KNConfig::ReadNewsPage::ReadNewsPage(TQWidget *tqparent, const char *name) + : BasePageWithTabs(tqparent, name) { KNConfigManager *cfgMgr = knGlobals.configManager(); addTab(new KNConfig::ReadNewsGeneralWidget(cfgMgr->readNewsGeneral(), this), i18n("General")); @@ -150,15 +150,15 @@ KNConfig::ReadNewsPage::ReadNewsPage(TQWidget *parent, const char *name) // extern "C" { - KCModule *create_knode_config_post_news( TQWidget *parent, const char * ) + KCModule *create_knode_config_post_news( TQWidget *tqparent, const char * ) { - KNConfig::PostNewsPage *page = new KNConfig::PostNewsPage( parent, "kcmknode_config_post_news" ); + KNConfig::PostNewsPage *page = new KNConfig::PostNewsPage( tqparent, "kcmknode_config_post_news" ); return page; } } -KNConfig::PostNewsPage::PostNewsPage(TQWidget *parent, const char *name) - : BasePageWithTabs(parent, name) { +KNConfig::PostNewsPage::PostNewsPage(TQWidget *tqparent, const char *name) + : BasePageWithTabs(tqparent, name) { KNConfigManager *cfgMgr = knGlobals.configManager(); addTab(new KNConfig::PostNewsTechnicalWidget(cfgMgr->postNewsTechnical(), this), i18n("Technical")); @@ -173,9 +173,9 @@ KNConfig::PostNewsPage::PostNewsPage(TQWidget *parent, const char *name) // extern "C" { - KCModule *create_knode_config_privacy( TQWidget *parent, const char * ) + KCModule *create_knode_config_privacy( TQWidget *tqparent, const char * ) { - KNConfig::PrivacyWidget *page = new KNConfig::PrivacyWidget( parent, "kcmknode_config_privacy" ); + KNConfig::PrivacyWidget *page = new KNConfig::PrivacyWidget( tqparent, "kcmknode_config_privacy" ); return page; } } @@ -187,9 +187,9 @@ extern "C" // extern "C" { - KCModule *create_knode_config_cleanup( TQWidget *parent, const char * ) + KCModule *create_knode_config_cleanup( TQWidget *tqparent, const char * ) { - KNConfig::CleanupWidget *page = new KNConfig::CleanupWidget( parent, "kcmknode_config_cleanup" ); + KNConfig::CleanupWidget *page = new KNConfig::CleanupWidget( tqparent, "kcmknode_config_cleanup" ); return page; } } diff --git a/knode/knconfigpages.h b/knode/knconfigpages.h index c1426fbc..3f009c1d 100644 --- a/knode/knconfigpages.h +++ b/knode/knconfigpages.h @@ -31,8 +31,9 @@ namespace KNConfig { */ class KDE_EXPORT BasePageWithTabs : public KCModule { Q_OBJECT + TQ_OBJECT public: - BasePageWithTabs( TQWidget * parent=0, const char * name=0 ); + BasePageWithTabs( TQWidget * tqparent=0, const char * name=0 ); ~BasePageWithTabs() {}; virtual void load(); @@ -51,26 +52,29 @@ class KDE_EXPORT BasePageWithTabs : public KCModule { // accounts page class AccountsPage : public BasePageWithTabs { Q_OBJECT + TQ_OBJECT public: - AccountsPage(TQWidget *parent = 0, const char *name = 0); + AccountsPage(TQWidget *tqparent = 0, const char *name = 0); }; // read news page class KDE_EXPORT ReadNewsPage : public BasePageWithTabs { Q_OBJECT + TQ_OBJECT public: - ReadNewsPage(TQWidget *parent = 0, const char *name = 0); + ReadNewsPage(TQWidget *tqparent = 0, const char *name = 0); }; // post news page class KDE_EXPORT PostNewsPage : public BasePageWithTabs { Q_OBJECT + TQ_OBJECT public: - PostNewsPage(TQWidget *parent = 0, const char *name = 0); + PostNewsPage(TQWidget *tqparent = 0, const char *name = 0); }; diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp index d70ebfa4..e02338fa 100644 --- a/knode/knconfigwidgets.cpp +++ b/knode/knconfigwidgets.cpp @@ -163,7 +163,7 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * topL->addMultiCellWidget(s_igEdit, 9, 9, 0, 2); s_igEditor = new TQTextEdit(this); - s_igEditor->setTextFormat(Qt::PlainText); + s_igEditor->setTextFormat(TQt::PlainText); topL->addMultiCellWidget(s_igEditor, 10, 10, 0, 2); connect( s_igEditor, TQT_SIGNAL(textChanged()), TQT_SLOT(changed()) ); @@ -213,7 +213,7 @@ void KNConfig::IdentityWidget::save() d_ata->s_igningKey = s_igningKey->keyIDs().first(); d_ata->u_seSigFile=s_igFile->isChecked(); d_ata->u_seSigGenerator=s_igGenerator->isChecked(); - d_ata->s_igPath=c_ompletion->tqreplacedPath(s_ig->text()); + d_ata->s_igPath=c_ompletion->replacedPath(s_ig->text()); d_ata->s_igText=s_igEditor->text(); if(d_ata->isGlobal()) @@ -242,7 +242,7 @@ void KNConfig::IdentityWidget::slotSignatureType(int type) void KNConfig::IdentityWidget::slotSignatureChoose() { - TQString tmp=KFileDialog::getOpenFileName(c_ompletion->tqreplacedPath(s_ig->text()),TQString::null,this,i18n("Choose Signature")); + TQString tmp=KFileDialog::getOpenFileName(c_ompletion->replacedPath(s_ig->text()),TQString(),this,i18n("Choose Signature")); if(!tmp.isEmpty()) s_ig->setText(tmp); emit changed( true ); } @@ -250,7 +250,7 @@ void KNConfig::IdentityWidget::slotSignatureChoose() void KNConfig::IdentityWidget::slotSignatureEdit() { - TQString fileName = c_ompletion->tqreplacedPath(s_ig->text()).stripWhiteSpace(); + TQString fileName = c_ompletion->replacedPath(s_ig->text()).stripWhiteSpace(); if (fileName.isEmpty()) { KMessageBox::sorry(this, i18n("You must specify a filename.")); @@ -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,Qt::Vertical,TQString::null,this); + TQGroupBox *gb = new TQGroupBox(2,TQt::Vertical,TQString(),this); topL->addWidget(gb,5,0); s_erverInfo = new TQLabel(gb); @@ -749,7 +749,7 @@ void KNConfig::AppearanceWidget::ColorListItem::paint( TQPainter *p ) p->drawText( 30+3*2, fm.ascent() + fm.leading()/2, text() ); - p->setPen( Qt::black ); + p->setPen( TQt::black ); p->drawRect( 3, 1, 30, h-1 ); p->fillRect( 4, 2, 28, h-3, mColor ); } @@ -2074,7 +2074,7 @@ void KNConfig::PostNewsTechnicalWidget::slotItemSelected(int) void KNConfig::PostNewsTechnicalWidget::slotAddBtnClicked() { - XHeaderConfDialog *dlg=new XHeaderConfDialog(TQString::null, this); + XHeaderConfDialog *dlg=new XHeaderConfDialog(TQString(), this); if (dlg->exec()) l_box->insertItem(dlg->result()); @@ -2131,7 +2131,7 @@ KNConfig::XHeaderConfDialog::XHeaderConfDialog(const TQString &h, TQWidget *p, c new TQLabel(":", page); v_alue=new KLineEdit(page); - int pos=h.find(": ", 2); + int pos=h.tqfind(": ", 2); if(pos!=-1) { n_ame->setText(h.mid(2, pos-2)); pos+=2; @@ -2237,7 +2237,7 @@ KNConfig::PostNewsComposerWidget::PostNewsComposerWidget( PostNewsComposer *d, T connect(e_ditor, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed())); editorL->addWidget(btn,1,2); - editorL->addMultiCellWidget(new TQLabel(i18n("%f will be tqreplaced with the filename to edit."), editorB),2,2,0,2); + editorL->addMultiCellWidget(new TQLabel(i18n("%f will be replaced with the filename to edit."), editorB),2,2,0,2); e_xternCB=new TQCheckBox(i18n("Start exte&rnal editor automatically"), editorB); editorL->addMultiCellWidget(e_xternCB, 3,3,0,2); @@ -2293,7 +2293,7 @@ void KNConfig::PostNewsComposerWidget::slotChooseEditor() if (path.right(3) == " %f") path.truncate(path.length()-3); - path=KFileDialog::getOpenFileName(path, TQString::null, this, i18n("Choose Editor")); + path=KFileDialog::getOpenFileName(path, TQString(), this, i18n("Choose Editor")); if (!path.isEmpty()) e_ditor->setText(path+" %f"); @@ -2360,8 +2360,8 @@ void KNConfig::PrivacyWidget::save() //BEGIN: Cleanup configuration widgets --------------------------------------- -KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *parent, const char *name ) - : TQWidget( parent, name ), mData( data ) +KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), mData( data ) { TQVBoxLayout *top = new TQVBoxLayout( this ); @@ -2372,7 +2372,7 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *paren } mExpGroup = new TQGroupBox( i18n("Newsgroup Cleanup Settings"), this ); - mExpGroup->setColumnLayout(0, Qt::Vertical ); + mExpGroup->setColumnLayout(0, TQt::Vertical ); mExpGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); mExpGroup->tqlayout()->setMargin( KDialog::marginHint() ); top->addWidget( mExpGroup ); @@ -2387,7 +2387,7 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *paren mExpDays = new KIntSpinBox( 0, 99999, 1, 0, 10, mExpGroup ); TQLabel *label = new TQLabel( mExpDays, i18n("&Purge groups every:"), mExpGroup ); grid->addWidget( label, 2, 0 ); - grid->addWidget( mExpDays, 2, 1, Qt::AlignRight ); + grid->addWidget( mExpDays, 2, 1, TQt::AlignRight ); connect( mExpDays, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()) ); connect( mExpDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(expDaysChanged(int)) ); connect( mExpEnabled, TQT_SIGNAL(toggled(bool)), label, TQT_SLOT(setEnabled(bool)) ); @@ -2396,14 +2396,14 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *paren mExpReadDays = new KIntSpinBox( 0, 99999, 1, 0, 10, mExpGroup ); label = new TQLabel( mExpReadDays, i18n("&Keep read articles:"), mExpGroup ); grid->addWidget( label, 3, 0 ); - grid->addWidget( mExpReadDays, 3, 1, Qt::AlignRight ); + grid->addWidget( mExpReadDays, 3, 1, TQt::AlignRight ); connect( mExpReadDays, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()) ); connect( mExpReadDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(expReadDaysChanged(int)) ); mExpUnreadDays = new KIntSpinBox( 0, 99999, 1, 0, 10, mExpGroup ); label = new TQLabel( mExpUnreadDays, i18n("Keep u&nread articles:"), mExpGroup ); grid->addWidget( label, 4, 0 ); - grid->addWidget( mExpUnreadDays, 4, 1, Qt::AlignRight ); + grid->addWidget( mExpUnreadDays, 4, 1, TQt::AlignRight ); connect( mExpUnreadDays, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()) ); connect( mExpUnreadDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(expUnreadDaysChanged(int)) ); @@ -2481,7 +2481,7 @@ KNConfig::CleanupWidget::CleanupWidget( TQWidget *p, const char *n ) : // === folders ========================================================= TQGroupBox *foldersB=new TQGroupBox(i18n("Folders"), this); - foldersB->setColumnLayout(0, Qt::Vertical ); + foldersB->setColumnLayout(0, TQt::Vertical ); foldersB->tqlayout()->setSpacing( KDialog::spacingHint() ); foldersB->tqlayout()->setMargin( KDialog::marginHint() ); @@ -2497,7 +2497,7 @@ KNConfig::CleanupWidget::CleanupWidget( TQWidget *p, const char *n ) : f_olderDays=new KIntSpinBox(0, 99999, 1, 0, 10, foldersB); f_olderDaysL=new TQLabel(f_olderDays,i18n("P&urge folders every:"), foldersB); foldersL->addWidget(f_olderDaysL,2,0); - foldersL->addWidget(f_olderDays,2,1,Qt::AlignRight); + foldersL->addWidget(f_olderDays,2,1,TQt::AlignRight); connect(f_olderDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); connect(f_olderDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotFolderDaysChanged(int))); diff --git a/knode/knconfigwidgets.h b/knode/knconfigwidgets.h index da6af2dd..806f6b82 100644 --- a/knode/knconfigwidgets.h +++ b/knode/knconfigwidgets.h @@ -66,6 +66,7 @@ namespace KNConfig { class KDE_EXPORT IdentityWidget : public KCModule { Q_OBJECT + TQ_OBJECT public: IdentityWidget(Identity *d, TQWidget *p=0, const char *n=0); @@ -107,6 +108,7 @@ class KDE_EXPORT IdentityWidget : public KCModule { class KDE_EXPORT NntpAccountListWidget : public KCModule { Q_OBJECT + TQ_OBJECT public: NntpAccountListWidget(TQWidget *p=0, const char *n=0); @@ -154,6 +156,7 @@ class KDE_EXPORT NntpAccountListWidget : public KCModule { class KDE_EXPORT NntpAccountConfDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: NntpAccountConfDialog(KNNntpAccount* acc, TQWidget *p=0, const char *n=0); @@ -195,6 +198,7 @@ class KDE_EXPORT NntpAccountConfDialog : public KDialogBase { class KDE_EXPORT SmtpAccountWidget : public SmtpAccountWidgetBase { Q_OBJECT + TQ_OBJECT public: SmtpAccountWidget(TQWidget *p=0, const char *n=0); @@ -216,6 +220,7 @@ Q_OBJECT class KDE_EXPORT AppearanceWidget : public KCModule { Q_OBJECT + TQ_OBJECT public: AppearanceWidget(TQWidget *p=0, const char *n=0); @@ -231,7 +236,7 @@ class KDE_EXPORT AppearanceWidget : public KCModule { class KDE_EXPORT ColorListItem : public TQListBoxText { public: - ColorListItem( const TQString &text, const TQColor &color=Qt::black ); + ColorListItem( const TQString &text, const TQColor &color=TQt::black ); ~ColorListItem(); const TQColor& color() { return mColor; } void setColor( const TQColor &color ) { mColor = color; } @@ -344,6 +349,7 @@ class KDE_EXPORT ReadNewsNavigationWidget : public KCModule { class KDE_EXPORT ReadNewsViewerWidget : public KCModule { Q_OBJECT + TQ_OBJECT public: ReadNewsViewerWidget(ReadNewsViewer *d, TQWidget *p=0, const char *n=0); @@ -370,6 +376,7 @@ class KDE_EXPORT ReadNewsViewerWidget : public KCModule { class KDE_EXPORT DisplayedHeadersWidget : public KCModule { Q_OBJECT + TQ_OBJECT public: DisplayedHeadersWidget(DisplayedHeaders *d, TQWidget *p=0, const char *n=0); @@ -416,6 +423,7 @@ class KDE_EXPORT DisplayedHeadersWidget : public KCModule { class KDE_EXPORT DisplayedHeaderConfDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: DisplayedHeaderConfDialog(KNDisplayedHeader *h, TQWidget *p=0, char *n=0); @@ -440,6 +448,7 @@ class KDE_EXPORT DisplayedHeaderConfDialog : public KDialogBase { class KDE_EXPORT ScoringWidget : public KCModule { Q_OBJECT + TQ_OBJECT public: ScoringWidget(Scoring *d, TQWidget *p=0, const char *n=0); @@ -460,6 +469,7 @@ class KDE_EXPORT ScoringWidget : public KCModule { class KDE_EXPORT FilterListWidget : public KCModule { Q_OBJECT + TQ_OBJECT public: FilterListWidget(TQWidget *p=0, const char *n=0); @@ -525,6 +535,7 @@ class KDE_EXPORT FilterListWidget : public KCModule { class KDE_EXPORT PostNewsTechnicalWidget : public KCModule { Q_OBJECT + TQ_OBJECT public: PostNewsTechnicalWidget(PostNewsTechnical *d, TQWidget *p=0, const char *n=0); @@ -562,7 +573,7 @@ class KDE_EXPORT PostNewsTechnicalWidget : public KCModule { class KDE_EXPORT XHeaderConfDialog : public KDialogBase { public: - XHeaderConfDialog(const TQString &h=TQString::null, TQWidget *p=0, const char *n=0); + XHeaderConfDialog(const TQString &h=TQString(), TQWidget *p=0, const char *n=0); ~XHeaderConfDialog(); TQString result(); @@ -578,6 +589,7 @@ class KDE_EXPORT XHeaderConfDialog : public KDialogBase { class KDE_EXPORT PostNewsComposerWidget : public KCModule { Q_OBJECT + TQ_OBJECT public: PostNewsComposerWidget(PostNewsComposer *d, TQWidget *p=0, const char *n=0); @@ -623,6 +635,7 @@ class KDE_EXPORT PostNewsSpellingWidget : public KCModule { class KDE_EXPORT PrivacyWidget : public KCModule { Q_OBJECT + TQ_OBJECT public: PrivacyWidget(TQWidget *p=0, const char *n=0); @@ -642,9 +655,10 @@ class KDE_EXPORT PrivacyWidget : public KCModule { class KDE_EXPORT GroupCleanupWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - GroupCleanupWidget( Cleanup *data, TQWidget *parent = 0, const char *name = 0 ); + GroupCleanupWidget( Cleanup *data, TQWidget *tqparent = 0, const char *name = 0 ); void load(); void save(); @@ -670,6 +684,7 @@ class KDE_EXPORT GroupCleanupWidget : public TQWidget { class KDE_EXPORT CleanupWidget : public KCModule { Q_OBJECT + TQ_OBJECT public: CleanupWidget(TQWidget *p=0, const char *n=0); @@ -702,6 +717,7 @@ class KDE_EXPORT CleanupWidget : public KCModule { Q_OBJECT + TQ_OBJECT public: CacheWidget(Cache *d, TQWidget *p=0, const char *n=0); diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp index ce25167e..e925c26d 100644 --- a/knode/knconvert.cpp +++ b/knode/knconvert.cpp @@ -405,7 +405,7 @@ int KNConvert::Converter04::convertFolder(TQString srcPrefix, TQString dstPrefix buff.at(readBytes)='\0'; //terminate string; //remove "X-KNode-Overview" - int pos=buff.find('\n'); + int pos=buff.tqfind('\n'); if(pos>-1) buff.remove(0, pos+1); diff --git a/knode/knconvert.h b/knode/knconvert.h index 49d3d7c5..4db14718 100644 --- a/knode/knconvert.h +++ b/knode/knconvert.h @@ -35,6 +35,7 @@ class KProcess; class KDE_EXPORT KNConvert : public TQDialog { Q_OBJECT + TQ_OBJECT public: static bool needToConvert(const TQString &oldVersion); diff --git a/knode/kndisplayedheader.cpp b/knode/kndisplayedheader.cpp index da8b1a2c..1f6952f4 100644 --- a/knode/kndisplayedheader.cpp +++ b/knode/kndisplayedheader.cpp @@ -95,7 +95,7 @@ TQString KNDisplayedHeader::translatedName() else return n_ame; } else - return TQString::null; + return TQString(); } else return n_ame; } @@ -135,7 +135,7 @@ void KNDisplayedHeader::createTags() const char *tokens[] = { "<big>","</big>","<b>","</b>", "<i>","</i>","<u>","</u>" }; - for(int i=0; i<4; i++) t_ags[i]=TQString::null; + for(int i=0; i<4; i++) t_ags[i]=TQString(); if(f_lags.at(0)) { // <big> t_ags[0]=tokens[0]; diff --git a/knode/knfilterconfigwidget.cpp b/knode/knfilterconfigwidget.cpp index 3c7daee1..f3870c1b 100644 --- a/knode/knfilterconfigwidget.cpp +++ b/knode/knfilterconfigwidget.cpp @@ -25,8 +25,8 @@ #include "knfilterconfigwidget.h" -KNFilterConfigWidget::KNFilterConfigWidget(TQWidget *parent, const char *name ) : - TQTabWidget(parent,name) +KNFilterConfigWidget::KNFilterConfigWidget(TQWidget *tqparent, const char *name ) : + TQTabWidget(tqparent,name) { TQWidget *sf, *idW, *add; sf=new TQWidget(this); @@ -50,7 +50,7 @@ KNFilterConfigWidget::KNFilterConfigWidget(TQWidget *parent, const char *name ) addTab(idW, i18n("M&essage-IDs")); status=new KNStatusFilterWidget(this); - addTab(status, i18n("&Status")); + addTab(status, i18n("&tqStatus")); add=new TQWidget(this); TQVBoxLayout *addL=new TQVBoxLayout(add, 8,5); diff --git a/knode/knfilterconfigwidget.h b/knode/knfilterconfigwidget.h index 8d87d53f..94a100d7 100644 --- a/knode/knfilterconfigwidget.h +++ b/knode/knfilterconfigwidget.h @@ -27,12 +27,13 @@ class KNRangeFilterWidget; class KNFilterConfigWidget : public TQTabWidget { Q_OBJECT + TQ_OBJECT friend class KNFilterDialog; friend class KNSearchDialog; public: - KNFilterConfigWidget(TQWidget *parent=0, const char *name=0); + KNFilterConfigWidget(TQWidget *tqparent=0, const char *name=0); ~KNFilterConfigWidget(); void reset(); diff --git a/knode/knfilterdialog.cpp b/knode/knfilterdialog.cpp index f0151766..0cd0b2ad 100644 --- a/knode/knfilterdialog.cpp +++ b/knode/knfilterdialog.cpp @@ -30,9 +30,9 @@ #include "knfilterdialog.h" -KNFilterDialog::KNFilterDialog(KNArticleFilter *f, TQWidget *parent, const char *name) +KNFilterDialog::KNFilterDialog(KNArticleFilter *f, TQWidget *tqparent, const char *name) : KDialogBase(Plain, (f->id()==-1)? i18n("New Filter"):i18n("Properties of %1").arg(f->name()), - Ok|Cancel|Help, Ok, parent, name), + Ok|Cancel|Help, Ok, tqparent, name), fltr(f) { TQFrame* page=plainPage(); diff --git a/knode/knfilterdialog.h b/knode/knfilterdialog.h index 3dc7ee64..69e5c45d 100644 --- a/knode/knfilterdialog.h +++ b/knode/knfilterdialog.h @@ -29,11 +29,12 @@ class TQCheckBox; class KNFilterDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT friend class KNFilterManager; public: - KNFilterDialog(KNArticleFilter *f=0, TQWidget *parent=0, const char *name=0); + KNFilterDialog(KNArticleFilter *f=0, TQWidget *tqparent=0, const char *name=0); ~KNFilterDialog(); KNArticleFilter* filter() { return fltr; } diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp index 9ea8d7ac..0d01698e 100644 --- a/knode/knfiltermanager.cpp +++ b/knode/knfiltermanager.cpp @@ -30,8 +30,8 @@ KNFilterSelectAction::KNFilterSelectAction( const TQString& text, const TQString& pix, - TQObject* parent, const char *name ) - : KActionMenu(text,pix,parent,name), currentItem(-42) + TQObject* tqparent, const char *name ) + : KActionMenu(text,pix,tqparent,name), currentItem(-42) { popupMenu()->setCheckable(true); connect(popupMenu(),TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotMenuActivated(int))); @@ -61,8 +61,8 @@ void KNFilterSelectAction::slotMenuActivated(int id) //============================================================================== -KNFilterManager::KNFilterManager(TQObject * parent, const char * name) - : TQObject(parent,name), fset(0), currFilter(0), a_ctFilter(0) +KNFilterManager::KNFilterManager(TQObject * tqparent, const char * name) + : TQObject(tqparent,name), fset(0), currFilter(0), a_ctFilter(0) { loadFilters(); @@ -262,7 +262,7 @@ void KNFilterManager::copyFilter(KNArticleFilter *f) void KNFilterManager::deleteFilter(KNArticleFilter *f) { if ( KMessageBox::warningContinueCancel( fset ? fset : knGlobals.topWidget, - i18n("Do you really want to delete this filter?"), TQString::null, KGuiItem( i18n("&Delete"), "editdelete" ) ) + i18n("Do you really want to delete this filter?"), TQString(), KGuiItem( i18n("&Delete"), "editdelete" ) ) == KMessageBox::Continue ) { if ( mFilterList.remove( f ) ) { // does not delete surplus config files if ( fset ) { // we reuse ids to reduce the number of dead files diff --git a/knode/knfiltermanager.h b/knode/knfiltermanager.h index 2dc431f3..c5c1f974 100644 --- a/knode/knfiltermanager.h +++ b/knode/knfiltermanager.h @@ -31,10 +31,11 @@ class KNFilterDialog; class KNFilterSelectAction : public KActionMenu { Q_OBJECT + TQ_OBJECT public: KNFilterSelectAction( const TQString& text, const TQString& pix, - TQObject* parent, const char *name ); + TQObject* tqparent, const char *name ); ~KNFilterSelectAction(); void setCurrentItem(int id); @@ -50,12 +51,13 @@ class KNFilterSelectAction : public KActionMenu }; -class KNFilterManager : public QObject +class KNFilterManager : public TQObject { Q_OBJECT + TQ_OBJECT public: - KNFilterManager(TQObject * parent = 0, const char * name = 0); + KNFilterManager(TQObject * tqparent = 0, const char * name = 0); ~KNFilterManager(); void readOptions(); diff --git a/knode/knfolder.cpp b/knode/knfolder.cpp index 81f4f01a..0044abc8 100644 --- a/knode/knfolder.cpp +++ b/knode/knfolder.cpp @@ -41,8 +41,8 @@ KNFolder::KNFolder() } -KNFolder::KNFolder(int id, const TQString &name, KNFolder *parent) - : KNArticleCollection(parent), i_d(id), i_ndexDirty(false), w_asOpen(true) +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); @@ -51,7 +51,7 @@ KNFolder::KNFolder(int id, const TQString &name, KNFolder *parent) i_ndexFile.setName(fname+".idx"); i_nfoPath=fname+".info"; - p_arentId=parent?parent->id():-1; + p_arentId=tqparent?tqparent->id():-1; if(i_ndexFile.exists()) c_ount=i_ndexFile.size()/sizeof(DynData); @@ -60,8 +60,8 @@ 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) +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); @@ -70,7 +70,7 @@ KNFolder::KNFolder(int id, const TQString &name, const TQString &prefix, KNFolde i_ndexFile.setName(fname+".idx"); i_nfoPath=fname+".info"; - p_arentId=parent?parent->id():-1; + p_arentId=tqparent?tqparent->id():-1; if(i_ndexFile.exists()) c_ount=i_ndexFile.size()/sizeof(DynData); @@ -115,7 +115,7 @@ bool KNFolder::readInfo(const TQString &infoPath) if (!isRootFolder() && !isStandardFolder()) { n_ame=info.readEntry("name"); i_d=info.readNumEntry("id", -1); - p_arentId=info.readNumEntry("parentId", -1); + p_arentId=info.readNumEntry("tqparentId", -1); } w_asOpen=info.readBoolEntry("wasOpen", true); @@ -147,7 +147,7 @@ void KNFolder::saveInfo() if (!isRootFolder() && !isStandardFolder()) { info.writeEntry("name", n_ame); info.writeEntry("id", i_d); - info.writeEntry("parentId", p_arentId); + info.writeEntry("tqparentId", p_arentId); } if(l_istItem) info.writeEntry("wasOpen", l_istItem->isOpen()); @@ -187,7 +187,7 @@ bool KNFolder::loadHdrs() } TQCString tmp; - KQCStringSplitter split; + KTQCStringSplitter split; KNLocalArticle *art; DynData dynamic; int pos1=0, pos2=0, cnt=0, byteCount; @@ -244,8 +244,8 @@ bool KNFolder::loadHdrs() //set overview bool end=false; - pos1=tmp.find(' ')+1; - pos2=tmp.find('\t', pos1); + pos1=tmp.tqfind(' ')+1; + pos2=tmp.tqfind('\t', pos1); if (pos2 == -1) { pos2=tmp.length(); end=true; @@ -254,7 +254,7 @@ bool KNFolder::loadHdrs() if (!end) { pos1=pos2+1; - pos2=tmp.find('\t', pos1); + pos2=tmp.tqfind('\t', pos1); if (pos2 == -1) { pos2=tmp.length(); end=true; @@ -264,7 +264,7 @@ bool KNFolder::loadHdrs() if (!end) { pos1=pos2+1; - pos2=tmp.find('\t', pos1); + pos2=tmp.tqfind('\t', pos1); if (pos2 == -1) { pos2=tmp.length(); end=true; @@ -284,7 +284,7 @@ bool KNFolder::loadHdrs() clear(); closeFiles(); - knGlobals.seStatusMsg(TQString::null); + knGlobals.seStatusMsg(TQString()); knGlobals.top->setCursorBusy(false); return false; } @@ -297,7 +297,7 @@ bool KNFolder::loadHdrs() c_ount=cnt; updateListItem(); - knGlobals.seStatusMsg(TQString::null); + knGlobals.seStatusMsg(TQString()); knGlobals.top->setCursorBusy(false); return true; diff --git a/knode/knfolder.h b/knode/knfolder.h index 0be6dafd..692e02a6 100644 --- a/knode/knfolder.h +++ b/knode/knfolder.h @@ -28,8 +28,8 @@ class KNFolder : public KNArticleCollection { public: KNFolder(); - KNFolder(int id, const TQString &name, KNFolder *parent=0); - KNFolder(int id, const TQString &name, const TQString &prefix, KNFolder *parent=0); + KNFolder(int id, const TQString &name, KNFolder *tqparent=0); + KNFolder(int id, const TQString &name, const TQString &prefix, KNFolder *tqparent=0); ~KNFolder(); //type @@ -38,7 +38,7 @@ class KNFolder : public KNArticleCollection { //id int id() const { return i_d; } void setId(int i) { i_d=i; } - int parentId() const { return p_arentId; } + int tqparentId() const { return p_arentId; } bool isStandardFolder() { return (i_d > 0) && (i_d <=3); } bool isRootFolder() { return i_d==0; } @@ -58,7 +58,7 @@ class KNFolder : public KNArticleCollection { KNLocalArticle* byMessageId(const TQCString &mid) { return static_cast<KNLocalArticle*>(KNArticleCollection::byMessageId(mid)); } - //parent + //tqparent void setParent(KNCollection *p); //load, save and delete diff --git a/knode/knfoldermanager.cpp b/knode/knfoldermanager.cpp index e857f4bb..bdcbed4a 100644 --- a/knode/knfoldermanager.cpp +++ b/knode/knfoldermanager.cpp @@ -156,7 +156,7 @@ bool KNFolderManager::deleteFolder(KNFolder *f) // find all subfolders of the folder we want to delete for ( TQValueList<KNFolder*>::Iterator it = mFolderList.begin(); it != mFolderList.end(); ++it ) { - p = (*it)->parent(); + p = (*it)->tqparent(); while ( p ) { if ( p == f ) { if ( (*it)->lockedArticles() > 0 ) @@ -164,7 +164,7 @@ bool KNFolderManager::deleteFolder(KNFolder *f) del.append( (*it) ); break; } - p = p->parent(); + p = p->tqparent(); } } @@ -198,15 +198,15 @@ void KNFolderManager::emptyFolder(KNFolder *f) bool KNFolderManager::moveFolder(KNFolder *f, KNFolder *p) { - if(!f || p==f->parent()) // nothing to be done + if(!f || p==f->tqparent()) // nothing to be done return true; // is "p" a child of "f" ? - KNCollection *p2=p?p->parent():0; + KNCollection *p2=p?p->tqparent():0; while(p2) { if(p2==f) break; - p2=p2->parent(); + p2=p2->tqparent(); } if( (p2 && p2==f) || f==p || f->isStandardFolder() || f->isRootFolder()) // no way ;-) @@ -366,7 +366,7 @@ void KNFolderManager::importFromMBox(KNFolder *f) if (!list.isEmpty()) knGlobals.articleManager()->moveIntoFolder(list, f); - knGlobals.seStatusMsg(TQString::null); + knGlobals.seStatusMsg(TQString()); knGlobals.top->setCursorBusy(false); } @@ -415,7 +415,7 @@ void KNFolderManager::exportToMBox(KNFolder *f) knGlobals.top->secureProcessEvents(); } - knGlobals.seStatusMsg(TQString::null); + knGlobals.seStatusMsg(TQString()); knGlobals.top->setCursorBusy(false); } } @@ -463,11 +463,11 @@ int KNFolderManager::loadCustomFolders() delete f; } - // set parents + // set tqparents if(cnt>0) { for ( TQValueList<KNFolder*>::Iterator it = mFolderList.begin(); it != mFolderList.end(); ++it ) { - if ( !(*it)->isRootFolder() ) { // the root folder has no parent - KNFolder *par = folder( (*it)->parentId() ); + if ( !(*it)->isRootFolder() ) { // the root folder has no tqparent + KNFolder *par = folder( (*it)->tqparentId() ); if ( !par ) par = root(); (*it)->setParent( par ); diff --git a/knode/knfoldermanager.h b/knode/knfoldermanager.h index a6337d80..0920a675 100644 --- a/knode/knfoldermanager.h +++ b/knode/knfoldermanager.h @@ -23,9 +23,10 @@ class KNArticleManager; class KNCleanUp; -class KNFolderManager : public QObject +class KNFolderManager : public TQObject { Q_OBJECT + TQ_OBJECT public: KNFolderManager(KNArticleManager *a); diff --git a/knode/knglobals.h b/knode/knglobals.h index 72ffa1f0..2cb801e8 100644 --- a/knode/knglobals.h +++ b/knode/knglobals.h @@ -76,7 +76,7 @@ class KDE_EXPORT KNGlobals { KNMemoryManager *memoryManager(); /** forwarded to top->seStatusMsg() if available */ - void seStatusMsg(const TQString& text = TQString::null, int id = SB_MAIN); + void seStatusMsg(const TQString& text = TQString(), int id = SB_MAIN); private: KSharedConfig::Ptr c_onfig; diff --git a/knode/kngroup.cpp b/knode/kngroup.cpp index 3584e744..1815027c 100644 --- a/knode/kngroup.cpp +++ b/knode/kngroup.cpp @@ -167,8 +167,8 @@ void KNGroup::saveInfo() KNNntpAccount* KNGroup::account() { - KNCollection *p=parent(); - while(p->type()!=KNCollection::CTnntpAccount) p=p->parent(); + KNCollection *p=tqparent(); + while(p->type()!=KNCollection::CTnntpAccount) p=p->tqparent(); return (KNNntpAccount*)p_arent; } @@ -184,7 +184,7 @@ bool KNGroup::loadHdrs() kdDebug(5003) << "KNGroup::loadHdrs() : loading headers" << endl; TQCString buff, hdrValue; KNFile f; - KQCStringSplitter split; + KTQCStringSplitter split; int cnt=0, id, lines, fileFormatVersion, artNumber; unsigned int timeT; KNRemoteArticle *art; @@ -254,7 +254,7 @@ bool KNGroup::loadHdrs() // following lines contain one header per line for (uint i = buff.toUInt(); i > 0; --i) { buff = f.readLine(); - int pos = buff.find(':'); + int pos = buff.tqfind(':'); TQCString hdrName = buff.left( pos ); // skip headers we already set above and which we actually never should // find here, but however it still happens... (eg. #101355) @@ -388,7 +388,7 @@ void KNGroup::insortNewHeaders(TQStrList *hdrs, TQStrList *hdrfmt, KNProtocolCli { KNRemoteArticle *art=0, *art2=0; TQCString data, hdr, hdrName; - KQCStringSplitter split; + KTQCStringSplitter split; split.setIncludeSep(false); int new_cnt=0, added_cnt=0, todo=hdrs->count(); TQTime timer; @@ -457,7 +457,7 @@ void KNGroup::insortNewHeaders(TQStrList *hdrs, TQStrList *hdrfmt, KNProtocolCli if (!split.next()) break; data = split.string(); - int pos = hdr.find(':'); + 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)) @@ -492,7 +492,7 @@ void KNGroup::insortNewHeaders(TQStrList *hdrs, TQStrList *hdrfmt, KNProtocolCli } // now we build the threads - syncSearchIndex(); // recreate the msgId-index so it tqcontains the appended headers + syncSearchIndex(); // recreate the msgId-index so it contains the appended headers buildThreads(added_cnt, client); updateThreadInfo(); @@ -558,7 +558,7 @@ int KNGroup::saveStaticData(int cnt,bool ovr) // optional headers ts << mOptionalHeaders.count() << '\n'; for (TQCString hdrName = mOptionalHeaders.first(); hdrName; hdrName = mOptionalHeaders.next()) { - hdrName = hdrName.left( hdrName.find(':') ); + hdrName = hdrName.left( hdrName.tqfind(':') ); KMime::Headers::Base *hdr = art->getHeaderByType( hdrName ); if ( hdr ) ts << hdrName << ": " << hdr->asUnicodeString() << '\n'; @@ -936,7 +936,7 @@ void KNGroup::scoreArticles(bool onlynew) incReadCount(); } - knGlobals.seStatusMsg(TQString::null); + knGlobals.seStatusMsg(TQString()); knGlobals.top->setCursorBusy(false); //kdDebug(5003) << KNScorableArticle::notifyC->collection() << endl; @@ -965,7 +965,7 @@ void KNGroup::reorganize() saveStaticData(length(), true); saveDynamicData(length(), true); knGlobals.top->headerView()->tqrepaint(); - knGlobals.seStatusMsg(TQString::null); + knGlobals.seStatusMsg(TQString()); knGlobals.top->setCursorBusy(false); } @@ -1050,7 +1050,7 @@ int KNGroup::statThrWithUnread() TQString KNGroup::prepareForExecution() { if (knGlobals.groupManager()->loadHeaders(this)) - return TQString::null; + return TQString(); else return i18n("Cannot load saved headers: %1").arg(groupname()); } diff --git a/knode/kngroup.h b/knode/kngroup.h index 76a9d0dd..387ff0f6 100644 --- a/knode/kngroup.h +++ b/knode/kngroup.h @@ -35,7 +35,7 @@ namespace KNConfig { class KNGroup : public KNArticleCollection , public KNJobItem { public: - enum Status { unknown=0, readOnly=1, postingAllowed=2, moderated=3 }; + enum tqStatus { 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; } - Status status()const { return s_tatus; } - void seStatus(Status s) { s_tatus=s; } + tqStatus status()const { return s_tatus; } + void setqStatus(tqStatus s) { s_tatus=s; } void showProperties(); // cleanup configuration @@ -153,7 +153,7 @@ class KNGroup : public KNArticleCollection , public KNJobItem { bool l_ocked, u_seCharset; - Status s_tatus; + tqStatus s_tatus; TQStringList c_rosspostIDBuffer; diff --git a/knode/kngroupbrowser.cpp b/knode/kngroupbrowser.cpp index d8e3f835..d28e9ed9 100644 --- a/knode/kngroupbrowser.cpp +++ b/knode/kngroupbrowser.cpp @@ -34,9 +34,9 @@ #include <tqpushbutton.h> -KNGroupBrowser::KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntpAccount *a, +KNGroupBrowser::KNGroupBrowser(TQWidget *tqparent, const TQString &caption, KNNntpAccount *a, int buttons, bool newCBact, const TQString &user1, const TQString &user2) : - KDialogBase( parent, 0L, true, caption, buttons | Help | Ok | Cancel, Ok, true, user1, user2 ), + KDialogBase( tqparent, 0L, true, caption, buttons | Help | Ok | Cancel, Ok, true, user1, user2 ), incrementalFilter(false), a_ccount(a) { refilterTimer = new TQTimer(); @@ -190,7 +190,7 @@ bool KNGroupBrowser::itemInListView(TQListView *view, const KNGroupInfo &gi) } -void KNGroupBrowser::createListItems(TQListViewItem *parent) +void KNGroupBrowser::createListItems(TQListViewItem *tqparent) { TQString prefix, tlgn, compare; TQListViewItem *it; @@ -198,11 +198,11 @@ void KNGroupBrowser::createListItems(TQListViewItem *parent) int colon; bool expandit=false; - if(parent) { - TQListViewItem *p=parent; + if(tqparent) { + TQListViewItem *p=tqparent; while(p) { prefix.prepend(p->text(0)); - p=p->parent(); + p=p->tqparent(); } } @@ -217,7 +217,7 @@ void KNGroupBrowser::createListItems(TQListViewItem *parent) compare=gn->name.mid(prefix.length()); if(!expandit || !compare.startsWith(tlgn)) { - if((colon=compare.find('.'))!=-1) { + if((colon=compare.tqfind('.'))!=-1) { colon++; expandit=true; } else { @@ -228,8 +228,8 @@ void KNGroupBrowser::createListItems(TQListViewItem *parent) tlgn = compare.left(colon); if(expandit) { - if(parent) - it=new TQListViewItem(parent, tlgn); + if(tqparent) + it=new TQListViewItem(tqparent, tlgn); else it=new TQListViewItem(groupView, tlgn); @@ -237,8 +237,8 @@ void KNGroupBrowser::createListItems(TQListViewItem *parent) it->setExpandable(true); } else { - if(parent) - cit=new CheckItem(parent, *gn, this); + if(tqparent) + cit=new CheckItem(tqparent, *gn, this); else cit=new CheckItem(groupView, *gn, this); updateItemState(cit); @@ -327,7 +327,7 @@ void KNGroupBrowser::slotFilter(const TQString &txt) for(KNGroupInfo *g=matchList->first(); g; g=matchList->next()) { if ((notCheckSub||g->subscribed)&& (notCheckNew||g->newGroup)&& - (notCheckStr||(g->name.find(filtertxt)!=-1))) + (notCheckStr||(g->name.tqfind(filtertxt)!=-1))) tempList->append(g); } @@ -339,7 +339,7 @@ void KNGroupBrowser::slotFilter(const TQString &txt) for(KNGroupInfo *g=allList->first(); g; g=allList->next()) { if ((notCheckSub||g->subscribed)&& (notCheckNew||g->newGroup)&& - (notCheckStr||(isRegexp? (reg.search(g->name,0) != -1):(g->name.find(filtertxt)!=-1)))) + (notCheckStr||(isRegexp? (reg.search(g->name,0) != -1):(g->name.tqfind(filtertxt)!=-1)))) matchList->append(g); } } diff --git a/knode/kngroupbrowser.h b/knode/kngroupbrowser.h index 5178fc57..4a32d627 100644 --- a/knode/kngroupbrowser.h +++ b/knode/kngroupbrowser.h @@ -35,6 +35,7 @@ class KNNntpAccount; class KNGroupBrowser : public KDialogBase { Q_OBJECT + TQ_OBJECT public: class CheckItem : public TQCheckListItem { @@ -62,8 +63,8 @@ class KNGroupBrowser : public KDialogBase { KNGroupInfo info; }; - KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntpAccount *a, int buttons=0, - bool newCBact=false, const TQString &user1=TQString::null, const TQString &user2=TQString::null); + KNGroupBrowser(TQWidget *tqparent, const TQString &caption, KNNntpAccount *a, int buttons=0, + bool newCBact=false, const TQString &user1=TQString(), const TQString &user2=TQString()); ~KNGroupBrowser(); KNNntpAccount* account()const { return a_ccount; } @@ -80,7 +81,7 @@ class KNGroupBrowser : public KDialogBase { void changeItemState(const KNGroupInfo &gi, bool s); bool itemInListView(TQListView *view, const KNGroupInfo &gi); void removeListItem(TQListView *view, const KNGroupInfo &gi); - void createListItems(TQListViewItem *parent=0); + void createListItems(TQListViewItem *tqparent=0); TQWidget *page; TQListView *groupView; diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp index bff6dfd5..eadaf06b 100644 --- a/knode/kngroupdialog.cpp +++ b/knode/kngroupdialog.cpp @@ -34,8 +34,8 @@ #include <tqpushbutton.h> -KNGroupDialog::KNGroupDialog(TQWidget *parent, KNNntpAccount *a) : - KNGroupBrowser(parent, i18n("Subscribe to Newsgroups"),a, User1 | User2, true, i18n("New &List"), i18n("New &Groups...") ) +KNGroupDialog::KNGroupDialog(TQWidget *tqparent, KNNntpAccount *a) : + KNGroupBrowser(tqparent, i18n("Subscribe to Newsgroups"),a, User1 | User2, true, i18n("New &List"), i18n("New &Groups...") ) { rightLabel->setText(i18n("Current changes:")); subView=new TQListView(page); @@ -138,7 +138,7 @@ void KNGroupDialog::toSubscribe(TQSortedList<KNGroupInfo> *l) } if (moderated) // warn the user KMessageBox::information(knGlobals.topWidget,i18n("You have subscribed to a moderated newsgroup.\nYour articles will not appear in the group immediately.\nThey have to go through a moderation process."), - TQString::null,"subscribeModeratedWarning"); + TQString(),"subscribeModeratedWarning"); } @@ -292,7 +292,7 @@ void KNGroupDialog::slotUser2() topL->addMultiCellWidget(takeLast, 0, 0, 0, 1); TQLabel *l = new TQLabel(KGlobal::locale()->formatDate(lastDate, false),btnGrp); - topL->addWidget(l, 1, 1, Qt::AlignLeft); + topL->addWidget(l, 1, 1, TQt::AlignLeft); connect(takeLast, TQT_SIGNAL(toggled(bool)), l, TQT_SLOT(setEnabled(bool))); @@ -301,7 +301,7 @@ void KNGroupDialog::slotUser2() KDatePicker *dateSel = new KDatePicker(btnGrp, lastDate); dateSel->setMinimumSize(dateSel->tqsizeHint()); - topL->addWidget(dateSel, 3, 1, Qt::AlignLeft); + topL->addWidget(dateSel, 3, 1, TQt::AlignLeft); connect(takeCustom, TQT_SIGNAL(toggled(bool)), dateSel, TQT_SLOT(setEnabled(bool))); diff --git a/knode/kngroupdialog.h b/knode/kngroupdialog.h index a2d74798..024e6707 100644 --- a/knode/kngroupdialog.h +++ b/knode/kngroupdialog.h @@ -23,9 +23,10 @@ class KNGroupDialog : public KNGroupBrowser { Q_OBJECT + TQ_OBJECT public: - KNGroupDialog(TQWidget *parent, KNNntpAccount *a); + KNGroupDialog(TQWidget *tqparent, KNNntpAccount *a); ~KNGroupDialog(); void toSubscribe(TQSortedList<KNGroupInfo> *l); diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp index 2bece357..48cfc117 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::Status s_tatus) +KNGroupInfo::KNGroupInfo(const TQString &n_ame, const TQString &d_escription, bool n_ewGroup, bool s_ubscribed, KNGroup::tqStatus 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::Status status=KNGroup::unknown; + KNGroup::tqStatus status=KNGroup::unknown; TQTime timer; uint size=f.size()+2; @@ -111,16 +111,16 @@ bool KNGroupListData::readIn(KNProtocolClient *client) if(f.open(IO_ReadOnly)) { while(!f.atEnd()) { line = f.readLine(); - sepPos1 = line.find(' '); + sepPos1 = line.tqfind(' '); if (sepPos1==-1) { // no description name = TQString::fromUtf8(line); - description = TQString::null; + description = TQString(); status = KNGroup::unknown; } else { name = TQString::fromUtf8(line.left(sepPos1)); - sepPos2 = line.find(' ',sepPos1+1); + sepPos2 = line.tqfind(' ',sepPos1+1); if (sepPos2==-1) { // no status description = TQString::fromUtf8(line.right(line.length()-sepPos1-1)); status = KNGroup::unknown; @@ -201,7 +201,7 @@ void KNGroupListData::merge(TQSortedList<KNGroupInfo>* newGroups) bool subscribed; for (KNGroupInfo *i=newGroups->first(); i; i=newGroups->next()) { - if (groups->find(i)>=0) { + if (groups->tqfind(i)>=0) { subscribed = groups->current()->subscribed; groups->remove(); // avoid duplicates } else @@ -224,8 +224,8 @@ TQSortedList<KNGroupInfo>* KNGroupListData::extractList() //=============================================================================== -KNGroupManager::KNGroupManager(TQObject * parent, const char * name) - : TQObject(parent,name) +KNGroupManager::KNGroupManager(TQObject * tqparent, const char * name) + : TQObject(tqparent,name) { c_urrentGroup=0; a_rticleMgr = knGlobals.articleManager(); @@ -393,9 +393,9 @@ void KNGroupManager::expireAll(KNNntpAccount *a) } -void KNGroupManager::showGroupDialog(KNNntpAccount *a, TQWidget *parent) +void KNGroupManager::showGroupDialog(KNNntpAccount *a, TQWidget *tqparent) { - KNGroupDialog* gDialog=new KNGroupDialog((parent!=0)? parent:knGlobals.topWidget, a); + KNGroupDialog* gDialog=new KNGroupDialog((tqparent!=0)? tqparent:knGlobals.topWidget, a); connect(gDialog, TQT_SIGNAL(loadList(KNNntpAccount*)), this, TQT_SLOT(slotLoadGroupList(KNNntpAccount*))); connect(gDialog, TQT_SIGNAL(fetchList(KNNntpAccount*)), this, TQT_SLOT(slotFetchGroupList(KNNntpAccount*))); @@ -408,8 +408,8 @@ void KNGroupManager::showGroupDialog(KNNntpAccount *a, TQWidget *parent) TQStringList lst; gDialog->toUnsubscribe(&lst); if (lst.count()>0) { - if (KMessageBox::Yes == KMessageBox::questionYesNoList((parent!=0)? parent:knGlobals.topWidget,i18n("Do you really want to unsubscribe\nfrom these groups?"), - lst, TQString::null, i18n("Unsubscribe"), KStdGuiItem::cancel())) { + if (KMessageBox::Yes == KMessageBox::questionYesNoList((tqparent!=0)? tqparent:knGlobals.topWidget,i18n("Do you really want to unsubscribe\nfrom these groups?"), + lst, TQString(), i18n("Unsubscribe"), KStdGuiItem::cancel())) { for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { if((g=group(*it, a))) unsubscribeGroup(g); @@ -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->seStatus(gi->status); + grp->setqStatus(gi->status); grp->saveInfo(); mGroupList.append( grp ); emit groupAdded(grp); @@ -466,9 +466,9 @@ bool KNGroupManager::unsubscribeGroup(KNGroup *g) a_rticleMgr->updateStatusString(); } - const QFileInfoList *list = dir.entryInfoList(); // get list of matching files and delete all + const TQFileInfoList *list = dir.entryInfoList(); // get list of matching files and delete all if (list) { - QFileInfoListIterator it( *list ); + TQFileInfoListIterator it( *list ); while (it.current()) { if (it.current()->fileName() == g->groupname()+".dynamic" || it.current()->fileName() == g->groupname()+".static" || @@ -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)->seStatus( inf->status ); + (*it)->setqStatus( inf->status ); break; } } @@ -652,7 +652,7 @@ void KNGroupManager::slotLoadGroupList(KNNntpAccount *a) d->path = a->path(); if(!TQFileInfo(d->path+"groups").exists()) { - if (KMessageBox::Yes==KMessageBox::questionYesNo(knGlobals.topWidget,i18n("You do not have any groups for this account;\ndo you want to fetch a current list?"), TQString::null, i18n("Fetch List"), i18n("Do Not Fetch"))) { + if (KMessageBox::Yes==KMessageBox::questionYesNo(knGlobals.topWidget,i18n("You do not have any groups for this account;\ndo you want to fetch a current list?"), TQString(), i18n("Fetch List"), i18n("Do Not Fetch"))) { delete d; slotFetchGroupList(a); return; diff --git a/knode/kngroupmanager.h b/knode/kngroupmanager.h index f93b5704..4105e7cd 100644 --- a/knode/kngroupmanager.h +++ b/knode/kngroupmanager.h @@ -31,20 +31,20 @@ class KNCleanUp; //================================================================================= /** helper classes for the group selection dialog - tqcontains info about a newsgroup (name, description) */ + contains info about a newsgroup (name, description) */ class KNGroupInfo { public: KNGroupInfo(); - KNGroupInfo(const TQString &n_ame, const TQString &d_escription, bool n_ewGroup=false, bool s_ubscribed=false, KNGroup::Status s_tatus=KNGroup::unknown ); + KNGroupInfo(const TQString &n_ame, const TQString &d_escription, bool n_ewGroup=false, bool s_ubscribed=false, KNGroup::tqStatus s_tatus=KNGroup::unknown ); ~KNGroupInfo(); /** group names will be utf-8 encoded in the future... */ TQString name,description; bool newGroup, subscribed; - KNGroup::Status status; + KNGroup::tqStatus status; bool operator== (const KNGroupInfo &gi2); bool operator< (const KNGroupInfo &gi2); @@ -78,10 +78,11 @@ class KNGroupListData : public KNJobItem { class KNGroupManager : public TQObject , public KNJobConsumer { Q_OBJECT + TQ_OBJECT public: - KNGroupManager(TQObject * parent=0, const char * name=0); + KNGroupManager(TQObject * tqparent=0, const char * name=0); ~KNGroupManager(); // group access @@ -99,7 +100,7 @@ class KNGroupManager : public TQObject , public KNJobConsumer { void setCurrentGroup(KNGroup *g); // group handling - void showGroupDialog(KNNntpAccount *a, TQWidget *parent=0); + void showGroupDialog(KNNntpAccount *a, TQWidget *tqparent=0); void subscribeGroup(const KNGroupInfo *gi, KNNntpAccount *a); bool unsubscribeGroup(KNGroup *g=0); void showGroupProperties(KNGroup *g=0); diff --git a/knode/kngrouppropdlg.cpp b/knode/kngrouppropdlg.cpp index 4983b428..ef8e2870 100644 --- a/knode/kngrouppropdlg.cpp +++ b/knode/kngrouppropdlg.cpp @@ -29,9 +29,9 @@ #include <tqlabel.h> -KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *parent, const char *name ) +KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *tqparent, const char *name ) : KDialogBase(Tabbed, i18n("Properties of %1").arg(group->groupname()), - Ok|Cancel|Help, Ok, parent, name), + Ok|Cancel|Help, Ok, tqparent, name), g_rp(group), n_ickChanged(false) { @@ -85,7 +85,7 @@ KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *parent, const char *nam l=new TQLabel(g_rp->description(),gb); grpL->addWidget(l,2,2); - l=new TQLabel(i18n("Status:"), gb); + l=new TQLabel(i18n("tqStatus:"), gb); grpL->addWidget(l,3,0); TQString status; switch (g_rp->status()) { diff --git a/knode/kngrouppropdlg.h b/knode/kngrouppropdlg.h index 0c640bea..eb087dd4 100644 --- a/knode/kngrouppropdlg.h +++ b/knode/kngrouppropdlg.h @@ -35,7 +35,7 @@ namespace KNConfig { class KNGroupPropDlg : public KDialogBase { public: - KNGroupPropDlg(KNGroup *group, TQWidget *parent=0, const char *name=0); + KNGroupPropDlg(KNGroup *group, TQWidget *tqparent=0, const char *name=0); ~KNGroupPropDlg(); bool nickHasChanged()const { return n_ickChanged; } diff --git a/knode/kngroupselectdialog.cpp b/knode/kngroupselectdialog.cpp index 199abce8..d5188ad1 100644 --- a/knode/kngroupselectdialog.cpp +++ b/knode/kngroupselectdialog.cpp @@ -27,11 +27,11 @@ #include <tqpushbutton.h> -KNGroupSelectDialog::KNGroupSelectDialog(TQWidget *parent, KNNntpAccount *a, const TQString &act) : - KNGroupBrowser(parent, i18n("Select Destinations"), a) +KNGroupSelectDialog::KNGroupSelectDialog(TQWidget *tqparent, KNNntpAccount *a, const TQString &act) : + KNGroupBrowser(tqparent, i18n("Select Destinations"), a) { selView=new TQListView(page); - selView->addColumn(TQString::null); + selView->addColumn(TQString()); selView->header()->hide(); listL->addWidget(selView, 1,2); rightLabel->setText(i18n("Groups for this article:")); @@ -105,7 +105,7 @@ TQString KNGroupSelectDialog::selectedGroups()const if (moderated && (count>=2)) // warn the user KMessageBox::information(tqparentWidget(),i18n("You are crossposting to a moderated newsgroup.\nPlease be aware that your article will not appear in any group\nuntil it has been approved by the moderators of the moderated group."), - TQString::null,"crosspostModeratedWarning"); + TQString(),"crosspostModeratedWarning"); return ret; } diff --git a/knode/kngroupselectdialog.h b/knode/kngroupselectdialog.h index 11c6fd39..05b21970 100644 --- a/knode/kngroupselectdialog.h +++ b/knode/kngroupselectdialog.h @@ -23,9 +23,10 @@ class KNGroupSelectDialog : public KNGroupBrowser { Q_OBJECT + TQ_OBJECT public: - KNGroupSelectDialog(TQWidget *parent, KNNntpAccount *a, const TQString &act); + KNGroupSelectDialog(TQWidget *tqparent, KNNntpAccount *a, const TQString &act); ~KNGroupSelectDialog(); TQString selectedGroups()const; diff --git a/knode/knhdrviewitem.cpp b/knode/knhdrviewitem.cpp index c7f500a0..748bcb4f 100644 --- a/knode/knhdrviewitem.cpp +++ b/knode/knhdrviewitem.cpp @@ -211,7 +211,7 @@ int KNHdrViewItem::width( const TQFontMetrics &fm, const TQListView *, int colum TQString KNHdrViewItem::text( int col ) const { if ( !art ) - return TQString::null; + return TQString(); KNHeaderView *hv = static_cast<KNHeaderView*>( listView() ); if ( col == hv->paintInfo()->subCol ) { @@ -222,14 +222,14 @@ TQString KNHdrViewItem::text( int col ) const if ( art->lines()->numberOfLines() != -1 ) return TQString::number( art->lines()->numberOfLines() ); else - return TQString::null; + return TQString(); } if ( col == hv->paintInfo()->scoreCol ) { if ( art->type() == KMime::Base::ATremote ) return TQString::number( static_cast<KNRemoteArticle*>( art )->score() ); else - return TQString::null; + return TQString(); } if ( col == hv->paintInfo()->dateCol ) { diff --git a/knode/knjobdata.cpp b/knode/knjobdata.cpp index a0def5d1..5d92ca82 100644 --- a/knode/knjobdata.cpp +++ b/knode/knjobdata.cpp @@ -95,7 +95,7 @@ void KNJobData::cancel() mJob = 0; } if ( mProgressItem ) { - mProgressItem->seStatus( "Canceled" ); + mProgressItem->setqStatus( "Canceled" ); mProgressItem->setComplete(); mProgressItem = 0; } @@ -139,8 +139,8 @@ void KNJobData::slotJobPercent( KIO::Job*, unsigned long percent ) void KNJobData::slotJobInfoMessage( KIO::Job*, const TQString &msg ) { - kdDebug(5003) << k_funcinfo << "Status: " << msg << endl; - seStatus( msg ); + kdDebug(5003) << k_funcinfo << "tqStatus: " << msg << endl; + setqStatus( msg ); } diff --git a/knode/knjobdata.h b/knode/knjobdata.h index 14b1bca7..3c98ef94 100644 --- a/knode/knjobdata.h +++ b/knode/knjobdata.h @@ -63,14 +63,15 @@ class KNJobItem { virtual bool isLocked() { return false; } virtual void setLocked(bool) { } - virtual TQString prepareForExecution() { return TQString::null; } + virtual TQString prepareForExecution() { return TQString(); } }; -class KNJobData : public QObject +class KNJobData : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -114,7 +115,7 @@ class KNJobData : public QObject void createProgressItem(); // safe forwards to the progress item - void seStatus( const TQString &msg ) { if ( mProgressItem ) mProgressItem->seStatus( msg ); } + void setqStatus( const TQString &msg ) { if ( mProgressItem ) mProgressItem->setqStatus( 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 6686d3f0..8da3b97e 100644 --- a/knode/knmainwidget.cpp +++ b/knode/knmainwidget.cpp @@ -34,7 +34,7 @@ #include "broadcaststatus.h" #include "krsqueezedtextlabel.h" #include "recentaddresses.h" -using KPIM::BroadcasStatus; +using KPIM::BroadcastqStatus; using KRecentAddress::RecentAddresses; //GUI @@ -70,9 +70,9 @@ using namespace KNode; KNGlobals knGlobals; -KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* parent, +KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* tqparent, const char* name ) - : DCOPObject("KNodeIface"), KDockArea( parent, name ), + : DCOPObject("KNodeIface"), KDockArea( tqparent, name ), b_lockui( false ), m_GUIClient( client ) { knGlobals.top=this; @@ -307,9 +307,9 @@ void KNMainWidget::iniStatusBar() //statusbar KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget()); KStatusBar *sb = mainWin ? mainWin->statusBar() : 0; - s_tatusFilter = new KRSqueezedTextLabel( TQString::null, sb ); + s_tatusFilter = new KRSqueezedTextLabel( TQString(), sb ); s_tatusFilter->tqsetAlignment( AlignLeft | AlignVCenter ); - s_tatusGroup = new KRSqueezedTextLabel( TQString::null, sb ); + s_tatusGroup = new KRSqueezedTextLabel( TQString(), sb ); s_tatusGroup->tqsetAlignment( AlignLeft | AlignVCenter ); } @@ -324,13 +324,13 @@ void KNMainWidget::seStatusMsg(const TQString& text, int id) bar->clear(); if (text.isEmpty() && (id==SB_MAIN)) { if (knGlobals.netAccess()->currentMsg().isEmpty()) - BroadcasStatus::instance()->seStatusMsg(i18n(" Ready")); + BroadcastqStatus::instance()->seStatusMsg(i18n(" Ready")); else - BroadcasStatus::instance()->seStatusMsg(knGlobals.netAccess()->currentMsg()); + BroadcastqStatus::instance()->seStatusMsg(knGlobals.netAccess()->currentMsg()); } else { switch(id) { case SB_MAIN: - BroadcasStatus::instance()->seStatusMsg(text); break; + BroadcastqStatus::instance()->seStatusMsg(text); break; case SB_GROUP: s_tatusGroup->setText(text); break; case SB_FILTER: @@ -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::null, Key_F7 , this, + a_ctArtSortHeadersKeyb = new KAction(i18n("Sort"), TQString(), Key_F7 , this, TQT_SLOT(slotArtSortHeadersKeyb()), actionCollection(), "view_Sort_Keyb"); a_ctArtSortHeadersKeyb->plugAccel(a_ccel); a_ctArtFilter = new KNFilterSelectAction(i18n("&Filter"), "filter", @@ -678,7 +678,7 @@ 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_find" , Key_F4 , this, + a_ctArtSearch = new KAction(i18n("&Search Articles..."),"mail_tqfind" , Key_F4 , this, TQT_SLOT(slotArtSearch()), actionCollection(), "article_search"); a_ctArtRefreshList = new KAction(i18n("&Refresh List"),"reload", KStdAccel::shortcut(KStdAccel::Reload), this, TQT_SLOT(slotArtRefreshList()), actionCollection(), "view_Refresh"); @@ -748,7 +748,7 @@ void KNMainWidget::initActions() a_ctToggleArticleViewer = new KToggleAction(i18n("Show &Article Viewer"), CTRL+Key_J, this, TQT_SLOT(slotToggleArticleViewer()), actionCollection(), "settings_show_articleViewer"); a_ctToggleArticleViewer->setCheckedState(i18n("Hide &Article Viewer")); - a_ctToggleQuickSearch = new KToggleAction(i18n("Show Quick Search"), TQString::null, this, + a_ctToggleQuickSearch = new KToggleAction(i18n("Show Quick Search"), TQString(), 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, @@ -841,7 +841,7 @@ bool KNMainWidget::requestShutdown() if( a_rtFactory->jobsPending() && KMessageBox::No==KMessageBox::warningYesNo(this, i18n( "KNode is currently sending articles. If you quit now you might lose these \ -articles.\nDo you want to quit anyway?"), TQString::null, KStdGuiItem::quit(), KStdGuiItem::cancel()) +articles.\nDo you want to quit anyway?"), TQString(), KStdGuiItem::quit(), KStdGuiItem::cancel()) ) return false; @@ -903,7 +903,7 @@ bool KNMainWidget::queryClose() void KNMainWidget::showEvent(TQShowEvent *) { - slotCheckDockWidgeStatus(); + slotCheckDockWidgetqStatus(); } @@ -963,7 +963,7 @@ void KNMainWidget::getSelectedThreads(KNRemoteArticle::List &l) art=static_cast<KNRemoteArticle*> ((static_cast<KNHdrViewItem*>(i))->art); // ignore the article if it is already in the list // (multiple aritcles are selected in one thread) - if ( l.find(art) == l.end() ) + if ( l.tqfind(art) == l.end() ) art->thread(l); } } @@ -983,8 +983,8 @@ void KNMainWidget::closeCurrentThread() { TQListViewItem *item = h_drView->currentItem(); if (item) { - while (item->parent()) - item = item->parent(); + while (item->tqparent()) + item = item->tqparent(); h_drView->setCurrentItem(item); item->setOpen(false); h_drView->ensureItemVisible(item); @@ -1301,7 +1301,7 @@ void KNMainWidget::slotNetworkActive(bool b) } -void KNMainWidget::slotCheckDockWidgeStatus() +void KNMainWidget::slotCheckDockWidgetqStatus() { 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?").arg(g_rpManager->currentGroup()->groupname()), TQString::null, 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 children?"),"",KGuiItem(i18n("&Delete"),"editdelete")) ) { + i18n("Do you really want to delete this folder and all its tqchildren?"),"",KGuiItem(i18n("&Delete"),"editdelete")) ) { if(!f_olManager->deleteFolder(f_olManager->currentFolder())) KMessageBox::sorry(knGlobals.topWidget, @@ -1946,8 +1946,8 @@ void KNMainWidget::slotFetchArticleWithID() if (dlg->exec()) { TQString id = dlg->messageId().simplifyWhiteSpace(); - if (id.find(TQRegExp("*@*",false,true))!=-1) { - if (id.find(TQRegExp("<*>",false,true))==-1) // add "<>" when necessary + if (id.tqfind(TQRegExp("*@*",false,true))!=-1) { + if (id.tqfind(TQRegExp("<*>",false,true))==-1) // add "<>" when necessary id = TQString("<%1>").arg(id); if(!KNArticleWindow::raiseWindowForArticle(id.latin1())) { //article not yet opened @@ -1966,7 +1966,7 @@ void KNMainWidget::slotFetchArticleWithID() void KNMainWidget::slotToggleGroupView() { c_olDock->changeHideShowState(); - slotCheckDockWidgeStatus(); + slotCheckDockWidgetqStatus(); } @@ -1977,19 +1977,19 @@ void KNMainWidget::slotToggleHeaderView() if ( !h_drDock->isDockBackPossible() ) { h_drDock->manualDock( a_rtDock, KDockWidget::DockTop ); h_drDock->makeDockVisible(); - slotCheckDockWidgeStatus(); + slotCheckDockWidgetqStatus(); return; } h_drDock->changeHideShowState(); - slotCheckDockWidgeStatus(); + slotCheckDockWidgetqStatus(); } void KNMainWidget::slotToggleArticleViewer() { a_rtDock->changeHideShowState(); - slotCheckDockWidgeStatus(); + slotCheckDockWidgetqStatus(); } void KNMainWidget::slotToggleQuickSearch() @@ -2043,8 +2043,8 @@ KXMLGUIFactory* KNMainWidget::factory() const //-------------------------------- -FetchArticleIdDlg::FetchArticleIdDlg(TQWidget *parent, const char */*name*/ ) - :KDialogBase(parent, 0, true, i18n("Fetch Article with ID"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok) +FetchArticleIdDlg::FetchArticleIdDlg(TQWidget *tqparent, const char */*name*/ ) + :KDialogBase(tqparent, 0, true, i18n("Fetch Article with ID"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok) { TQHBox *page = makeHBoxMainWidget(); diff --git a/knode/knmainwidget.h b/knode/knmainwidget.h index 4717e333..1ddba490 100644 --- a/knode/knmainwidget.h +++ b/knode/knmainwidget.h @@ -63,8 +63,9 @@ class KActionCollection; class KDE_EXPORT KNMainWidget : public KDockArea, virtual public KNodeIface { Q_OBJECT + TQ_OBJECT public: - KNMainWidget( KXMLGUIClient *client, bool detachable, TQWidget* parent, const char* name ); + KNMainWidget( KXMLGUIClient *client, bool detachable, TQWidget* tqparent, const char* name ); ~KNMainWidget(); /** exit */ @@ -72,7 +73,7 @@ public: void prepareShutdown(); //GUI - void seStatusMsg(const TQString& = TQString::null, int id=SB_MAIN); + void seStatusMsg(const TQString& = TQString(), int id=SB_MAIN); void seStatusHelpMsg(const TQString& text); void updateCaption(); void setCursorBusy(bool b=true); @@ -229,7 +230,7 @@ protected slots: void slotNetworkActive(bool b); //dock widget slots - void slotCheckDockWidgeStatus(); + void slotCheckDockWidgetqStatus(); void slotGroupDockHidden(); void slotHeaderDockHidden(); void slotArticleDockHidden(); @@ -413,8 +414,9 @@ private: class FetchArticleIdDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - FetchArticleIdDlg(TQWidget *parent, const char */*name*/ ); + FetchArticleIdDlg(TQWidget *tqparent, const char */*name*/ ); TQString messageId() const; protected slots: diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp index 016a39ee..bb32c04f 100644 --- a/knode/knnetaccess.cpp +++ b/knode/knnetaccess.cpp @@ -37,8 +37,8 @@ using KPIM::ProgressManager; -KNNetAccess::KNNetAccess(TQObject *parent, const char *name ) - : TQObject(parent,name), currentNntpJob(0), currentSmtpJob(0) +KNNetAccess::KNNetAccess(TQObject *tqparent, const char *name ) + : TQObject(tqparent,name), currentNntpJob(0), currentSmtpJob(0) { if ( pipe(nntpInPipe) == -1 || pipe(nntpOutPipe) == -1 ) { KMessageBox::error(knGlobals.topWidget, i18n("Internal error:\nFailed to open pipes for internal communication.")); @@ -102,7 +102,7 @@ void KNNetAccess::addJob(KNJobData *job) if ( !job->account()->readyForLogin() ) { mWalletQueue.append( job ); knGlobals.accountManager()->loadPasswordsAsync(); - job->seStatus( i18n( "Waiting for KWallet..." ) ); + job->setqStatus( i18n( "Waiting for KWallet..." ) ); return; } @@ -142,7 +142,7 @@ void KNNetAccess::addJob(KNJobData *job) startJobNntp(); } } - updateStatus(); + updatetqStatus(); } @@ -178,7 +178,7 @@ void KNNetAccess::stopJobsNntp( int type ) } else ++it; } - updateStatus(); + updatetqStatus(); } @@ -207,7 +207,7 @@ void KNNetAccess::stopJobsSmtp( int type ) } else ++it; } - updateStatus(); + updatetqStatus(); } @@ -317,7 +317,7 @@ void KNNetAccess::threadDoneNntp() info->setUser(user); info->setPass(pass); tmp->setAuthError(false); - tmp->setErrorString(TQString::null); + tmp->setErrorString(TQString()); kdDebug(5003) << "KNNetAccess::threadDoneNntp(): trying again with authentication data" << endl; @@ -331,7 +331,7 @@ void KNNetAccess::threadDoneNntp() nntpClient->removeJob(); currentNntpJob = 0L; - currMsg = TQString::null; + currMsg = TQString(); knGlobals.seStatusMsg(); tmp->setComplete(); @@ -340,7 +340,7 @@ void KNNetAccess::threadDoneNntp() if (!nntpJobQueue.isEmpty()) startJobNntp(); - updateStatus(); + updatetqStatus(); } @@ -358,7 +358,7 @@ void KNNetAccess::threadDoneSmtp() tmp = currentSmtpJob; currentSmtpJob = 0L; if (!currentNntpJob) { - currMsg = TQString::null; + currMsg = TQString(); knGlobals.seStatusMsg(); } tmp->setComplete(); @@ -368,7 +368,7 @@ void KNNetAccess::threadDoneSmtp() if (!smtpJobQueue.isEmpty()) startJobSmtp(); - updateStatus(); + updatetqStatus(); } @@ -399,52 +399,52 @@ void KNNetAccess::slotThreadSignal(int i) case KNProtocolClient::TSconnect: currMsg = i18n(" Connecting to server..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->seStatus(currMsg); + currentNntpJob->setqStatus(currMsg); break; case KNProtocolClient::TSloadGrouplist: currMsg = i18n(" Loading group list from disk..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->seStatus(currMsg); + currentNntpJob->setqStatus(currMsg); break; case KNProtocolClient::TSwriteGrouplist: currMsg = i18n(" Writing group list to disk..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->seStatus(currMsg); + currentNntpJob->setqStatus(currMsg); break; case KNProtocolClient::TSdownloadGrouplist: currMsg = i18n(" Downloading group list..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->seStatus(currMsg); + currentNntpJob->setqStatus(currMsg); break; case KNProtocolClient::TSdownloadNewGroups: currMsg = i18n(" Looking for new groups..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->seStatus(currMsg); + currentNntpJob->setqStatus(currMsg); break; case KNProtocolClient::TSdownloadDesc: currMsg = i18n(" Downloading group descriptions..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->seStatus(currMsg); + currentNntpJob->setqStatus(currMsg); break; case KNProtocolClient::TSdownloadNew: currMsg = i18n(" Downloading new headers..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->seStatus(currMsg); + currentNntpJob->setqStatus(currMsg); break; case KNProtocolClient::TSsortNew: currMsg = i18n(" Sorting..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->seStatus(currMsg); + currentNntpJob->setqStatus(currMsg); break; case KNProtocolClient::TSdownloadArticle: currMsg = i18n(" Downloading article..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->seStatus(currMsg); + currentNntpJob->setqStatus(currMsg); break; case KNProtocolClient::TSsendArticle: currMsg = i18n(" Sending article..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->seStatus(currMsg); + currentNntpJob->setqStatus(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)->seStatus( i18n("Waiting...") ); + (*it)->setqStatus( 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(); - updateStatus(); + updatetqStatus(); } -void KNNetAccess::updateStatus( ) +void KNNetAccess::updatetqStatus( ) { if ( nntpJobQueue.isEmpty() && smtpJobQueue.isEmpty() && !currentNntpJob && !currentSmtpJob && mWalletQueue.isEmpty() ) diff --git a/knode/knnetaccess.h b/knode/knnetaccess.h index 0ad9498f..e7ad1fb7 100644 --- a/knode/knnetaccess.h +++ b/knode/knnetaccess.h @@ -37,10 +37,11 @@ class KNNntpClient; class KNNetAccess : public TQObject { Q_OBJECT + TQ_OBJECT public: - KNNetAccess(TQObject *parent=0, const char *name=0); + KNNetAccess(TQObject *tqparent=0, const char *name=0); ~KNNetAccess(); void addJob(KNJobData *job); @@ -84,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 updateStatus(); + void updatetqStatus(); private slots: void slotJobResult( KIO::Job *job ); diff --git a/knode/knnntpaccount.cpp b/knode/knnntpaccount.cpp index 1887baae..0e685531 100644 --- a/knode/knnntpaccount.cpp +++ b/knode/knnntpaccount.cpp @@ -181,10 +181,10 @@ TQString KNNntpAccount::path() } -bool KNNntpAccount::editProperties(TQWidget *parent) +bool KNNntpAccount::editProperties(TQWidget *tqparent) { if(!i_dentity) i_dentity=new KNConfig::Identity(false); - KNConfig::NntpAccountConfDialog *d = new KNConfig::NntpAccountConfDialog(this, parent); + KNConfig::NntpAccountConfDialog *d = new KNConfig::NntpAccountConfDialog(this, tqparent); bool ret=false; if (d->exec()) { diff --git a/knode/knnntpaccount.h b/knode/knnntpaccount.h index 61133919..a84d7a28 100644 --- a/knode/knnntpaccount.h +++ b/knode/knnntpaccount.h @@ -35,6 +35,7 @@ namespace KNConfig { class KNNntpAccountIntervalChecking : public TQObject { Q_OBJECT + TQ_OBJECT public: KNNntpAccountIntervalChecking(KNNntpAccount *account); @@ -65,7 +66,7 @@ class KNNntpAccount : public KNCollection , public KNServerInfo { //void syncInfo(); TQString path(); /** returns true when the user accepted */ - bool editProperties(TQWidget *parent); + bool editProperties(TQWidget *tqparent); // news interval checking void startTimer(); diff --git a/knode/knnntpclient.cpp b/knode/knnntpclient.cpp index dd4f28fe..a6b1e566 100644 --- a/knode/knnntpclient.cpp +++ b/knode/knnntpclient.cpp @@ -93,7 +93,7 @@ void KNNntpClient::doFetchGroups() char *s, *line; TQString name; - KNGroup::Status status; + KNGroup::tqStatus status; bool subscribed; while (getNextLine()) { @@ -132,7 +132,7 @@ void KNNntpClient::doFetchGroups() default : status = KNGroup::unknown; } - target->groups->append(new KNGroupInfo(name,TQString::null,false,subscribed,status)); + target->groups->append(new KNGroupInfo(name,TQString(),false,subscribed,status)); } doneLines++; } @@ -140,7 +140,7 @@ void KNNntpClient::doFetchGroups() if (!job->success() || job->canceled()) return; // stopped... - QSortedVector<KNGroupInfo> tempVector; + TQSortedVector<KNGroupInfo> tempVector; target->groups->toVector(&tempVector); tempVector.sort(); @@ -228,7 +228,7 @@ void KNNntpClient::doCheckNewGroups() char *s, *line; TQString name; - KNGroup::Status status; + KNGroup::tqStatus status; TQSortedList<KNGroupInfo> tmpList; tmpList.setAutoDelete(true); @@ -261,7 +261,7 @@ void KNNntpClient::doCheckNewGroups() default : status = KNGroup::unknown; } - tmpList.append(new KNGroupInfo(name,TQString::null,true,false,status)); + tmpList.append(new KNGroupInfo(name,TQString(),true,false,status)); } doneLines++; } @@ -525,7 +525,7 @@ void KNNntpClient::doPostArticle() TQCString s = getCurrentLine(); int start = s.findRev(TQRegExp("<[^\\s]*@[^\\s]*>")); if (start != -1) { // post response includes a recommended id - int end = s.find('>',start); + int end = s.tqfind('>',start); art->messageID()->from7BitString(s.mid(start,end-start+1)); art->assemble(); #ifndef NDEBUG @@ -569,7 +569,7 @@ void KNNntpClient::doFetchSource() bool KNNntpClient::openConnection() { - currentGroup = TQString::null; + currentGroup = TQString(); TQString oldPrefix = errorPrefix; errorPrefix=i18n("Unable to connect.\nThe following error occurred:\n"); diff --git a/knode/knode.cpp b/knode/knode.cpp index d3df5b74..188851cf 100644 --- a/knode/knode.cpp +++ b/knode/knode.cpp @@ -55,7 +55,7 @@ KNMainWindow::KNMainWindow( TQWidget* pWidget ) TQT_SLOT( setCaption(const TQString&)) ); setCentralWidget( m_mainWidget ); setupStatusBar(); - connect( KPIM::BroadcasStatus::instance(), TQT_SIGNAL(statusMsg(const TQString&)), + connect( KPIM::BroadcastqStatus::instance(), TQT_SIGNAL(statusMsg(const TQString&)), this, TQT_SLOT(slotShowStatusMsg(const TQString& )) ); createGUI( "knodeui.rc" ); knGlobals.instance = 0; @@ -108,7 +108,7 @@ void KNMainWindow::setupStatusBar() statusBar()->addWidget( mLittleProgress, 0 , true ); - mStatusMsgLabel = new KRSqueezedTextLabel( TQString::null, statusBar() ); + mStatusMsgLabel = new KRSqueezedTextLabel( TQString(), statusBar() ); mStatusMsgLabel->tqsetAlignment( AlignLeft | AlignVCenter ); statusBar()->addWidget( mStatusMsgLabel, 2 ); statusBar()->addWidget(m_mainWidget->statusBarLabelFilter(), 2); diff --git a/knode/knode.h b/knode/knode.h index 2c350c62..8d82defe 100644 --- a/knode/knode.h +++ b/knode/knode.h @@ -44,6 +44,7 @@ class KNHeaderView; class KNMainWindow : public KMainWindow { Q_OBJECT + TQ_OBJECT public: KNMainWindow( TQWidget* tqparentWidget=0 ); diff --git a/knode/knode_config_privacy.desktop b/knode/knode_config_privacy.desktop index e2ab8fcf..5fd3ee45 100644 --- a/knode/knode_config_privacy.desktop +++ b/knode/knode_config_privacy.desktop @@ -64,7 +64,7 @@ Comment[af]=Beskerm you privaatheid deur pos stukke te onderteken en te bevestig Comment[bg]=Защита на личната кореспонденция чрез подписване и проверка на съобщенията Comment[bs]=Zaštitite vašu privatnost potpisivanjem i provjerom postinga Comment[ca]=Protegiu la vostra privadesa signant i verificant els missatges -Comment[cs]=Chraňte své soukromí pomocí podepisování a ověřování podpisů +Comment[cs]=Chraňte své soukromí potqmocí podepisování a ověřování podpisů Comment[da]=Beskyt dine private oplysninger ved at underskrive og verificere indsendelser Comment[de]=Schutz der Privatsphäre durch Signieren und Verifizieren von Beiträgen. Comment[el]=Προστατεύστε το απόρρητό σας υπογράφοντας και επαληθεύοντας τα μηνύματα diff --git a/knode/knode_part.cpp b/knode/knode_part.cpp index 3e54361a..0dc09d46 100644 --- a/knode/knode_part.cpp +++ b/knode/knode_part.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "knode_part.h" @@ -48,8 +48,8 @@ typedef KParts::GenericFactory< KNodePart > KNodeFactory; K_EXPORT_COMPONENT_FACTORY( libknodepart, KNodeFactory ) KNodePart::KNodePart(TQWidget *tqparentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList &) - : KParts::ReadOnlyPart(parent, name), + TQObject *tqparent, const char *name, const TQStringList &) + : KParts::ReadOnlyPart(tqparent, name), mParentWidget( tqparentWidget ) { kdDebug(5003) << "KNodePart()" << endl; diff --git a/knode/knode_part.h b/knode/knode_part.h index 1e9a4904..b98b8d6f 100644 --- a/knode/knode_part.h +++ b/knode/knode_part.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KNODE_PART_H #define KNODE_PART_H @@ -42,9 +42,10 @@ class KNMainWidget; class KNodePart: public KParts::ReadOnlyPart { Q_OBJECT + TQ_OBJECT public: KNodePart(TQWidget *tqparentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList &); + TQObject *tqparent, const char *name, const TQStringList &); virtual ~KNodePart(); TQWidget* tqparentWidget() const; diff --git a/knode/knprotocolclient.cpp b/knode/knprotocolclient.cpp index 4831087c..4b9137a5 100644 --- a/knode/knprotocolclient.cpp +++ b/knode/knprotocolclient.cpp @@ -166,7 +166,7 @@ void KNProtocolClient::waitForWork() if (isConnected()) // connection is ready processJob(); } - errorPrefix = TQString::null; + errorPrefix = TQString(); clearPipe(); } @@ -218,7 +218,7 @@ bool KNProtocolClient::openConnection() } -// sends QUIT-command and closes the socket +// sends TQUIT-command and closes the socket void KNProtocolClient::closeConnection() { fd_set fdsW; @@ -235,7 +235,7 @@ void KNProtocolClient::closeConnection() int ret = KSocks::self()->select(FD_SETSIZE, NULL, &fdsW, NULL, &tv); if (ret > 0) { // we can write... - TQCString cmd = "QUIT\r\n"; + TQCString cmd = "TQUIT\r\n"; int todo = cmd.length(); KSocks::self()->write(tcpSocket,&cmd.data()[0],todo); } diff --git a/knode/knprotocolclient.h b/knode/knprotocolclient.h index fa4d28d5..4957e133 100644 --- a/knode/knprotocolclient.h +++ b/knode/knprotocolclient.h @@ -62,7 +62,7 @@ class KNProtocolClient : public TQThread { /** connect, handshake and authorization */ virtual bool openConnection(); bool isConnected() { return (tcpSocket!=-1); }; - /** sends QUIT-command and closes the socket */ + /** sends TQUIT-command and closes the socket */ virtual void closeConnection(); /** sends a command (one line), return code is written to rep */ diff --git a/knode/knrangefilter.cpp b/knode/knrangefilter.cpp index a0f01856..23b5753e 100644 --- a/knode/knrangefilter.cpp +++ b/knode/knrangefilter.cpp @@ -96,8 +96,8 @@ void KNRangeFilter::save(KSimpleConfig *conf) //===================================================================================== //===================================================================================== -KNRangeFilterWidget::KNRangeFilterWidget(const TQString& value, int min, int max, TQWidget* parent, const TQString &unit) - : TQGroupBox(value, parent) +KNRangeFilterWidget::KNRangeFilterWidget(const TQString& value, int min, int max, TQWidget* tqparent, const TQString &unit) + : TQGroupBox(value, tqparent) { enabled=new TQCheckBox(this); @@ -123,7 +123,7 @@ KNRangeFilterWidget::KNRangeFilterWidget(const TQString& value, int min, int max TQGridLayout *topL=new TQGridLayout(this, 2,6, 8,5 ); topL->addRowSpacing(0, fontMetrics().lineSpacing()-4); - topL->addWidget(enabled,1,0, Qt::AlignHCenter); + topL->addWidget(enabled,1,0, TQt::AlignHCenter); topL->addColSpacing(0, 30); topL->addWidget(val1,1,1); topL->addWidget(op1,1,2); diff --git a/knode/knrangefilter.h b/knode/knrangefilter.h index 346257f2..5c05d4e7 100644 --- a/knode/knrangefilter.h +++ b/knode/knrangefilter.h @@ -63,9 +63,10 @@ class KNRangeFilter { class KNRangeFilterWidget : public TQGroupBox { Q_OBJECT + TQ_OBJECT public: - KNRangeFilterWidget(const TQString& value, int min, int max, TQWidget* parent, const TQString &unit=TQString::null); + KNRangeFilterWidget(const TQString& value, int min, int max, TQWidget* tqparent, const TQString &unit=TQString()); ~KNRangeFilterWidget(); KNRangeFilter filter(); diff --git a/knode/knscoring.h b/knode/knscoring.h index 68b23c58..00db3ee0 100644 --- a/knode/knscoring.h +++ b/knode/knscoring.h @@ -61,6 +61,7 @@ public: class KNScoringManager : public KScoringManager { Q_OBJECT + TQ_OBJECT public: KNScoringManager(); diff --git a/knode/knsearchdialog.cpp b/knode/knsearchdialog.cpp index 4344cbba..5f8ff1ad 100644 --- a/knode/knsearchdialog.cpp +++ b/knode/knsearchdialog.cpp @@ -29,14 +29,14 @@ #include "knsearchdialog.h" -KNSearchDialog::KNSearchDialog(searchType /*t*/, TQWidget *parent) - : TQDialog(parent) +KNSearchDialog::KNSearchDialog(searchType /*t*/, TQWidget *tqparent) + : TQDialog(tqparent) { setCaption(kapp->makeStdCaption( i18n("Search for Articles") )); setIcon(SmallIcon("knode")); TQGroupBox *bg=new TQGroupBox(this); - startBtn=new TQPushButton(SmallIcon("mail_find"),i18n("Sea&rch"), bg); + startBtn=new TQPushButton(SmallIcon("mail_tqfind"),i18n("Sea&rch"), bg); startBtn->setDefault(true); newBtn=new TQPushButton(SmallIcon("editclear"),i18n("C&lear"), bg); closeBtn=new KPushButton(KStdGuiItem::close(), bg); diff --git a/knode/knsearchdialog.h b/knode/knsearchdialog.h index b056735b..784a855e 100644 --- a/knode/knsearchdialog.h +++ b/knode/knsearchdialog.h @@ -28,10 +28,11 @@ class KNArticleFilter; class KNSearchDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: enum searchType { STfolderSearch, STgroupSearch }; - KNSearchDialog(searchType t=STgroupSearch, TQWidget *parent=0); + KNSearchDialog(searchType t=STgroupSearch, TQWidget *tqparent=0); ~KNSearchDialog(); KNArticleFilter* filter() const { return f_ilter; } diff --git a/knode/knsourceviewwindow.cpp b/knode/knsourceviewwindow.cpp index f0b2b75d..607e4c39 100644 --- a/knode/knsourceviewwindow.cpp +++ b/knode/knsourceviewwindow.cpp @@ -27,7 +27,7 @@ KNSourceViewWindow::KNSourceViewWindow( const TQString &text ) { setWFlags(WType_TopLevel | WDestructiveClose); TQAccel *accel = new TQAccel( this, "browser close-accel" ); - accel->connectItem( accel->insertItem( Qt::Key_Escape ), this , TQT_SLOT( close() )); + accel->connectItem( accel->insertItem( TQt::Key_Escape ), this , TQT_SLOT( close() )); KNConfig::Appearance *app=knGlobals.configManager()->appearance(); setTextFormat( PlainText ); diff --git a/knode/knsourceviewwindow.h b/knode/knsourceviewwindow.h index aabe14b5..6f720ea6 100644 --- a/knode/knsourceviewwindow.h +++ b/knode/knsourceviewwindow.h @@ -21,6 +21,7 @@ class KNSourceViewWindow : public KTextBrowser { Q_OBJECT + TQ_OBJECT public: KNSourceViewWindow( const TQString &text ); diff --git a/knode/knstatusfilter.cpp b/knode/knstatusfilter.cpp index a1379a26..aa92dca5 100644 --- a/knode/knstatusfilter.cpp +++ b/knode/knstatusfilter.cpp @@ -94,8 +94,8 @@ bool KNStatusFilter::doFilter(KNRemoteArticle *a) //============================================================================== -KNStatusFilterWidget::KNStatusFilterWidget(TQWidget *parent) : - TQButtonGroup(0, parent) +KNStatusFilterWidget::KNStatusFilterWidget(TQWidget *tqparent) : + TQButtonGroup(0, tqparent) { setFrameStyle(NoFrame); enR=new TQCheckBox(i18n("Is read:"), this); @@ -197,7 +197,7 @@ void KNStatusFilterWidget::slotEnabled(int c) //============================================================================== -KNStatusFilterWidget::TFCombo::TFCombo(TQWidget *parent) : TQComboBox(parent) +KNStatusFilterWidget::TFCombo::TFCombo(TQWidget *tqparent) : TQComboBox(tqparent) { insertItem(i18n("True")); insertItem(i18n("False")); diff --git a/knode/knstatusfilter.h b/knode/knstatusfilter.h index a408a96c..f4ec92cd 100644 --- a/knode/knstatusfilter.h +++ b/knode/knstatusfilter.h @@ -54,9 +54,10 @@ class KNStatusFilter { class KNStatusFilterWidget : public TQButtonGroup { Q_OBJECT + TQ_OBJECT public: - KNStatusFilterWidget(TQWidget *parent); + KNStatusFilterWidget(TQWidget *tqparent); ~KNStatusFilterWidget(); KNStatusFilter filter(); @@ -69,7 +70,7 @@ class KNStatusFilterWidget : public TQButtonGroup { class TFCombo : public TQComboBox { public: - TFCombo(TQWidget *parent); + TFCombo(TQWidget *tqparent); ~TFCombo(); void setValue(bool b) { if(b) setCurrentItem(0); else setCurrentItem(1); } bool value() const { return (currentItem()==0); } diff --git a/knode/knstringfilter.cpp b/knode/knstringfilter.cpp index 3f866902..1570da04 100644 --- a/knode/knstringfilter.cpp +++ b/knode/knstringfilter.cpp @@ -47,7 +47,7 @@ bool KNStringFilter::doFilter(const TQString &s) TQRegExp matcher(expanded); ret = ( matcher.search(s) >= 0 ); } else - ret=(s.find(expanded,0,false)!=-1); + ret=(s.tqfind(expanded,0,false)!=-1); if(!con) ret=!ret; } @@ -57,7 +57,7 @@ bool KNStringFilter::doFilter(const TQString &s) -// tqreplace placeholders +// replace placeholders void KNStringFilter::expand(KNGroup *g) { KNConfig::Identity *id = (g) ? g->identity() : 0; @@ -94,8 +94,8 @@ void KNStringFilter::save(KSimpleConfig *conf) //=============================================================================== -KNStringFilterWidget::KNStringFilterWidget(const TQString& title, TQWidget *parent) - : TQGroupBox(title, parent) +KNStringFilterWidget::KNStringFilterWidget(const TQString& title, TQWidget *tqparent) + : TQGroupBox(title, tqparent) { fType=new TQComboBox(this); fType->insertItem(i18n("Does Contain")); diff --git a/knode/knstringfilter.h b/knode/knstringfilter.h index 5720c6a8..44647641 100644 --- a/knode/knstringfilter.h +++ b/knode/knstringfilter.h @@ -37,7 +37,7 @@ class KNStringFilter { ~KNStringFilter() {} KNStringFilter& operator=(const KNStringFilter &sf); - /** tqreplace placeholders */ + /** replace placeholders */ void expand(KNGroup *g); void load(KSimpleConfig *conf); @@ -58,9 +58,10 @@ class KNStringFilter { class KNStringFilterWidget : public TQGroupBox { Q_OBJECT + TQ_OBJECT public: - KNStringFilterWidget(const TQString& title, TQWidget *parent); + KNStringFilterWidget(const TQString& title, TQWidget *tqparent); ~KNStringFilterWidget(); KNStringFilter filter(); diff --git a/knode/knwidgets.cpp b/knode/knwidgets.cpp index d3f1d7b5..0bf4fcc2 100644 --- a/knode/knwidgets.cpp +++ b/knode/knwidgets.cpp @@ -65,7 +65,7 @@ void KNListBoxItem::paint(TQPainter *p) int KNListBoxItem::height(const TQListBox *lb) const { if(p_m) - return QMAX( p_m->height(), lb->fontMetrics().lineSpacing() + 1 ); + return TQMAX( p_m->height(), lb->fontMetrics().lineSpacing() + 1 ); else return (lb->fontMetrics().lineSpacing() + 1); } @@ -84,8 +84,8 @@ int KNListBoxItem::width(const TQListBox *lb) const // **** listbox for dialogs ************************************************** -KNDialogListBox::KNDialogListBox(bool alwaysIgnore, TQWidget * parent, const char * name) - : TQListBox(parent, name), a_lwaysIgnore(alwaysIgnore) +KNDialogListBox::KNDialogListBox(bool alwaysIgnore, TQWidget * tqparent, const char * name) + : TQListBox(tqparent, name), a_lwaysIgnore(alwaysIgnore) { } @@ -107,8 +107,8 @@ void KNDialogListBox::keyPressEvent(TQKeyEvent *e) //==================================================================================== -KNDockWidgetHeaderDrag::KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name ) - : KDockWidgetHeaderDrag(parent, dock, name), f_ocus(false) +KNDockWidgetHeaderDrag::KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* tqparent, KDockWidget* dock, const char* name ) + : KDockWidgetHeaderDrag(tqparent, dock, name), f_ocus(false) { connect(tqfocusWidget, TQT_SIGNAL(focusChanged(TQFocusEvent*)), TQT_SLOT(slotFocusChanged(TQFocusEvent*))); } diff --git a/knode/knwidgets.h b/knode/knwidgets.h index d1a19e36..ce13cb8d 100644 --- a/knode/knwidgets.h +++ b/knode/knwidgets.h @@ -49,11 +49,11 @@ class KNListBoxItem : public TQListBoxItem { /** a list box which ignores Enter, useful for dialogs */ -class KNDialogListBox : public QListBox +class KNDialogListBox : public TQListBox { public: // alwaysIgnore==false: enter is ignored when the widget isn't visible/out of focus - KNDialogListBox(bool alwaysIgnore=false, TQWidget * parent=0, const char * name=0); + KNDialogListBox(bool alwaysIgnore=false, TQWidget * tqparent=0, const char * name=0); ~KNDialogListBox(); protected: @@ -69,9 +69,10 @@ class KNDialogListBox : public QListBox class KNDockWidgetHeaderDrag : public KDockWidgetHeaderDrag { Q_OBJECT + TQ_OBJECT public: - KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, + KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* tqparent, KDockWidget* dock, const char* name = 0); virtual ~KNDockWidgetHeaderDrag(); diff --git a/knode/smtpaccountwidget_base.ui b/knode/smtpaccountwidget_base.ui index 16433111..d8309b29 100644 --- a/knode/smtpaccountwidget_base.ui +++ b/knode/smtpaccountwidget_base.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SmtpAccountWidgetBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>mUseExternalMailer</cstring> </property> @@ -24,7 +24,7 @@ <string>&Use external mailer</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>mServerLabel</cstring> </property> @@ -35,7 +35,7 @@ <cstring>mServer</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>mPortLabel</cstring> </property> @@ -46,7 +46,7 @@ <cstring>mPort</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>mUserLabel</cstring> </property> @@ -57,7 +57,7 @@ <cstring>mUser</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>mPasswordLabel</cstring> </property> @@ -68,7 +68,7 @@ <cstring>mPassword</cstring> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>mLogin</cstring> </property> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -125,7 +125,7 @@ <cstring>mServer</cstring> </property> </widget> - <widget class="QButtonGroup" row="6" column="0" rowspan="1" colspan="3"> + <widget class="TQButtonGroup" row="6" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>mEncGroup</cstring> </property> @@ -136,7 +136,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>mEncNone</cstring> </property> @@ -147,7 +147,7 @@ <string></string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>mEncSSL</cstring> </property> @@ -158,7 +158,7 @@ <string></string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>mEncTLS</cstring> </property> @@ -219,11 +219,11 @@ <slot>changed()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">useExternalMailerToggled(bool)</slot> <slot access="protected">loginToggled(bool)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in declaration">kcmodule.h</include> </includes> diff --git a/knode/utilities.cpp b/knode/utilities.cpp index 1e7dcba9..d634b7df 100644 --- a/knode/utilities.cpp +++ b/knode/utilities.cpp @@ -134,8 +134,8 @@ bool KNFile::increaseBuffer() TQString KNSaveHelper::lastPath; -KNSaveHelper::KNSaveHelper(TQString saveName, TQWidget *parent) - : p_arent(parent), s_aveName(saveName), file(0), tmpFile(0) +KNSaveHelper::KNSaveHelper(TQString saveName, TQWidget *tqparent) + : p_arent(tqparent), s_aveName(saveName), file(0), tmpFile(0) { } @@ -157,7 +157,7 @@ KNSaveHelper::~KNSaveHelper() TQFile* KNSaveHelper::getFile(const TQString &dialogTitle) { - url = KFileDialog::getSaveURL(lastPath + s_aveName, TQString::null, p_arent, dialogTitle); + url = KFileDialog::getSaveURL(lastPath + s_aveName, TQString(), p_arent, dialogTitle); if (url.isEmpty()) return 0; @@ -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 tqreplace it?</qt>").arg(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; } @@ -196,8 +196,8 @@ TQFile* KNSaveHelper::getFile(const TQString &dialogTitle) TQString KNLoadHelper::l_astPath; -KNLoadHelper::KNLoadHelper(TQWidget *parent) - : p_arent(parent), f_ile(0) +KNLoadHelper::KNLoadHelper(TQWidget *tqparent) + : p_arent(tqparent), f_ile(0) { } @@ -215,7 +215,7 @@ KNFile* KNLoadHelper::getFile( const TQString &dialogTitle ) if (f_ile) return f_ile; - KURL url = KFileDialog::getOpenURL(l_astPath,TQString::null,p_arent,dialogTitle); + KURL url = KFileDialog::getOpenURL(l_astPath,TQString(),p_arent,dialogTitle); if (url.isEmpty()) return 0; @@ -261,10 +261,10 @@ KNFile* KNLoadHelper::setURL(KURL url) // **** keyboard selection dialog ********************************************* -int KNHelper::selectDialog(TQWidget *parent, const TQString &caption, const TQStringList &options, int initialValue) +int KNHelper::selectDialog(TQWidget *tqparent, const TQString &caption, const TQStringList &options, int initialValue) { KDialogBase *dlg=new KDialogBase(KDialogBase::Plain, caption, KDialogBase::Ok|KDialogBase::Cancel, - KDialogBase::Ok, parent); + KDialogBase::Ok, tqparent); TQFrame *page = dlg->plainPage(); TQHBoxLayout *pageL = new TQHBoxLayout(page,8,5); @@ -390,7 +390,7 @@ void appendTextWPrefix(TQString &result, const TQString &text, int wrapAt, const txt.remove(0,breakPos+1); } else { result+=(prefix+txt+"\n"); - txt=TQString::null; + txt=TQString(); } } } @@ -412,7 +412,7 @@ TQString KNHelper::rewrapStringList(TQStringList text, int wrapAt, TQChar quoteC else thisLine.prepend(quoteChar+' '); - thisPrefix=TQString::null; + thisPrefix=TQString(); TQChar c; for(int idx=0; idx<(int)(thisLine.length()); idx++) { c=thisLine.at(idx); @@ -431,7 +431,7 @@ TQString KNHelper::rewrapStringList(TQStringList text, int wrapAt, TQChar quoteC appendTextWPrefix(quoted, leftover, wrapAt, lastPrefix); else thisLine.prepend(leftover+" "); - leftover=TQString::null; + leftover=TQString(); } if((int)(thisPrefix.length()+thisLine.length()) > wrapAt) { diff --git a/knode/utilities.h b/knode/utilities.h index 58dda6d8..936665a9 100644 --- a/knode/utilities.h +++ b/knode/utilities.h @@ -37,15 +37,15 @@ class KTempFile; //***************************************************************************** /** clone of TQSortedList... */ -template<class type> class Q_EXPORT QSortedVector : public TQPtrVector<type> +template<class type> class TQ_EXPORT TQSortedVector : public TQPtrVector<type> { public: - QSortedVector() {} - QSortedVector ( uint size ) : TQPtrVector<type>(size) {} - QSortedVector( const QSortedVector<type> &l ) : TQPtrVector<type>(l) {} - ~QSortedVector() { TQPtrVector<type>::clear(); } - QSortedVector<type> &operator=(const QSortedVector<type> &l) - { return (QSortedVector<type>&)TQPtrList<type>::operator=(l); } + TQSortedVector() {} + TQSortedVector ( uint size ) : TQPtrVector<type>(size) {} + TQSortedVector( const TQSortedVector<type> &l ) : TQPtrVector<type>(l) {} + ~TQSortedVector() { TQPtrVector<type>::clear(); } + TQSortedVector<type> &operator=(const TQSortedVector<type> &l) + { return (TQSortedVector<type>&)TQPtrList<type>::operator=(l); } virtual int compareItems( TQPtrCollection::Item s1, TQPtrCollection::Item s2 ) { if ( *((type*)s1) == *((type*)s2) ) return 0; return ( *((type*)s1) < *((type*)s2) ? -1 : 1 ); } @@ -58,7 +58,7 @@ public: class KNFile : public TQFile { public: - KNFile(const TQString& fname=TQString::null); + KNFile(const TQString& fname=TQString()); ~KNFile(); const TQCString& readLine(); const TQCString& readLineWnewLine(); @@ -82,7 +82,7 @@ class KNSaveHelper { public: - KNSaveHelper(TQString saveName, TQWidget *parent); + KNSaveHelper(TQString saveName, TQWidget *tqparent); ~KNSaveHelper(); /** returns a file open for writing */ @@ -107,7 +107,7 @@ class KNLoadHelper { public: - KNLoadHelper(TQWidget *parent); + KNLoadHelper(TQWidget *tqparent); ~KNLoadHelper(); /** opens a file dialog and returns a file open for reading */ @@ -140,7 +140,7 @@ public: /** list selection dialog, used instead of a popup menu when a select action is called via the keyboard. returns -1 when the user canceled the dialog. */ - static int selectDialog(TQWidget *parent, const TQString &caption, const TQStringList &options, int initialValue); + static int selectDialog(TQWidget *tqparent, const TQString &caption, const TQStringList &options, int initialValue); static void saveWindowSize(const TQString &name, const TQSize &s); static void restoreWindowSize(const TQString &name, TQWidget *d, const TQSize &defaultSize); |