From ea5301cc81fdeef296a89879b7851376f8e1f171 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 9 May 2007 10:13:31 +0000 Subject: [PATCH] Port to qtextedit svn path=/trunk/KDE/kdepim/; revision=662836 --- filterlogdlg.cpp | 16 +++++++++------- filterlogdlg.h | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/filterlogdlg.cpp b/filterlogdlg.cpp index 6bbe23d81..2509ff722 100644 --- a/filterlogdlg.cpp +++ b/filterlogdlg.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include @@ -68,17 +68,19 @@ FilterLogDialog::FilterLogDialog( QWidget * parent ) QFrame *page = new KVBox( this ); setMainWidget( page ); - mTextEdit = new Q3TextEdit( page ); + mTextEdit = new QTextEdit( page ); mTextEdit->setReadOnly( true ); - mTextEdit->setWordWrap( Q3TextEdit::NoWrap ); - mTextEdit->setTextFormat( Qt::LogText ); + mTextEdit->setLineWrapMode ( QTextEdit::NoWrap ); + mTextEdit->setAcceptRichText( false ); + QString text; QStringList logEntries = FilterLog::instance()->getLogEntries(); for ( QStringList::Iterator it = logEntries.begin(); it != logEntries.end(); ++it ) { - mTextEdit->append( *it ); + text+=*it; } + mTextEdit->setText(text); mLogActiveBox = new QCheckBox( i18n("&Log filter activities"), page ); mLogActiveBox->setChecked( FilterLog::instance()->isLogging() ); @@ -179,8 +181,8 @@ void FilterLogDialog::slotLogShrinked() { // limit the size of the shown log lines as soon as // the log has reached it's memory limit - if ( mTextEdit->maxLogLines() == -1 ) - mTextEdit->setMaxLogLines( mTextEdit->lines() ); + if ( mTextEdit->document()->maximumBlockCount () <= 0 ) + mTextEdit->document()->setMaximumBlockCount( mTextEdit->document()->blockCount() ); } diff --git a/filterlogdlg.h b/filterlogdlg.h index 29b8d9264..6a4f1d4c3 100644 --- a/filterlogdlg.h +++ b/filterlogdlg.h @@ -31,7 +31,7 @@ #include -class Q3TextEdit; +class QTextEdit; class QCheckBox; class QSpinBox; class Q3GroupBox; @@ -65,7 +65,7 @@ namespace KMail { void slotUser2(); protected: - Q3TextEdit * mTextEdit; + QTextEdit * mTextEdit; QCheckBox * mLogActiveBox; Q3GroupBox * mLogDetailsBox; QCheckBox * mLogPatternDescBox;