From 934c74cf947ab3deb6ce9e12a03716ecdb96ea21 Mon Sep 17 00:00:00 2001 From: Don Sanders Date: Thu, 13 Jul 2000 23:11:20 +0000 Subject: [PATCH] More code tidy ups, my mother would be pleased. svn path=/trunk/kdenetwork/kmail/; revision=56710 --- kmfldsearch.cpp | 3 +-- kmheaders.cpp | 58 +++++++++---------------------------------------- kmmessage.cpp | 2 +- kmreaderwin.cpp | 34 ++++++----------------------- 4 files changed, 19 insertions(+), 78 deletions(-) diff --git a/kmfldsearch.cpp b/kmfldsearch.cpp index 24cfba377..12c1bbbf3 100644 --- a/kmfldsearch.cpp +++ b/kmfldsearch.cpp @@ -132,8 +132,7 @@ KMFldSearch::KMFldSearch(KMMainWin* w, const char* name, //----------------------------------------------------------------------------- KMFldSearch::~KMFldSearch() { -#warning Save QListView layout - // mLbxMatches->writeConfig(); + //TODO Save QListView layout } diff --git a/kmheaders.cpp b/kmheaders.cpp index b2b8fd12b..11c257417 100644 --- a/kmheaders.cpp +++ b/kmheaders.cpp @@ -58,7 +58,8 @@ bool KMHeaders::mFalse = false; //----------------------------------------------------------------------------- // KMHeaderToFolderDrag method definitions -KMHeaderToFolderDrag::KMHeaderToFolderDrag( QWidget * parent, const char * name ) +KMHeaderToFolderDrag::KMHeaderToFolderDrag( QWidget * parent, + const char * name ) : QStoredDrag( "KMHeaderToFolderDrag/magic", parent, name ) { } @@ -182,13 +183,13 @@ public: mSortDate = cDate + mSortArrival; } - // Retrun the msgId of the message associated with this item + // Return the msgId of the message associated with this item int msgId() { return mMsgId; } - // Updte this item to summarise a new folder and message + // Update this item to summarise a new folder and message void reset( KMFolder *aFolder, int aMsgId ) { mFolder = aFolder; @@ -203,7 +204,7 @@ public: repaint(); } -// Begin this code may be relicensed by Troll Tech + // Begin this code may be relicensed by Troll Tech void paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int align ) { @@ -491,10 +492,6 @@ void KMHeaders::setFolder (KMFolder *aFolder) { int id; QString str; - // bool autoUpd = isUpdatesEnabled(); - // setUpdatesEnabled(FALSE); - // header()->setUpdatesEnabled(FALSE); - // viewport()->setUpdatesEnabled(FALSE); setColumnText( mSortCol, QIconSet( QPixmap()), columnText( mSortCol )); if (mFolder && mFolder==aFolder) @@ -644,12 +641,6 @@ void KMHeaders::setFolder (KMFolder *aFolder) } } - // setUpdatesEnabled(autoUpd); - // viewport()->setUpdatesEnabled(autoUpd); - // header()->setUpdatesEnabled(autoUpd); - // if (autoUpd) repaint(); - // if (autoUpd) viewport()->repaint(); - // if (autoUpd) header()->repaint(); } // QListView::setContentsPos doesn't seem to work @@ -870,6 +861,7 @@ void KMHeaders::deleteMsg (int msgId) triggerUpdate(); } + //----------------------------------------------------------------------------- void KMHeaders::saveMsg (int msgId) { @@ -1183,7 +1175,6 @@ void KMHeaders::moveMsgToFolder (KMFolder* destFolder, int msgId) KMMessage *msg; KMMsgBase *msgBase, *curMsg = 0; int top, rc; -// bool doUpd; disconnect(this,SIGNAL(currentChanged(QListViewItem*)), this,SLOT(highlightMessage(QListViewItem*))); @@ -1619,10 +1610,6 @@ void KMHeaders::updateMessageList(void) // reuse list view items when possibly. // - // kernel->kbp()->busy(); - //x autoUpd = isUpdatesEnabled(); - //x setUpdatesEnabled(FALSE); - disconnect(this,SIGNAL(currentChanged(QListViewItem*)), this,SLOT(highlightMessage(QListViewItem*))); @@ -1762,35 +1749,6 @@ void KMHeaders::updateMessageList(void) connect(this,SIGNAL(currentChanged(QListViewItem*)), this,SLOT(highlightMessage(QListViewItem*))); - - // Reggie: This is comment especially for you. - // - // Unless QListView::updateGeometries is called first my calls to - // setContentsPos (which calls QScrollView::setContentsPos) - // doesn't work. (The vertical scroll bar hasn't been updated - // I guess). - // - // I think you need to reimplement setContentsPos in QListView - // and make sure that updateGeometries has been called if necessary. - // - // I was calling QListView::updateContents in order for updateGeometries - // to be called (since the latter is private). But this was causing - // flicker as it forces an update even if I have setUpdatesEnabled(FALSE) - // (Things were ok in QT 2.0.2 but 2.1 forces an update). - // - // Now I call ensureItemVisible, because this will call updateGeometries - // if the maybeHeight of the Root QListViewItem is -1, which it seems - // to be (I guess it is marked as invalid after items are deleted/inserted). - - // if (firstChild()) - // ensureItemVisible(firstChild()); - // updateContents(); // -sanders Started causing flicker in QT 2.1cvs :-( - - //x setUpdatesEnabled(autoUpd); - //x if (autoUpd) repaint(); - // WABA: The following line is somehow necassery - // SANDERS: It shouldn't be necessary in a recent QT snapshot (Nov-26+) - // highlightMessage(currentItem()); } //----------------------------------------------------------------------------- @@ -1898,6 +1856,7 @@ void KMHeaders::contentsMousePressEvent(QMouseEvent* e) } } +//----------------------------------------------------------------------------- void KMHeaders::contentsMouseReleaseEvent(QMouseEvent* e) { QListViewItem *endSelection = itemAt( contentsToViewport( e->pos() )); @@ -1916,6 +1875,7 @@ void KMHeaders::contentsMouseReleaseEvent(QMouseEvent* e) mousePressed = FALSE; } +//----------------------------------------------------------------------------- void KMHeaders::contentsMouseMoveEvent( QMouseEvent* e ) { if ( mousePressed && (e->pos() - presspos).manhattanLength() > 4 ) { @@ -1928,6 +1888,7 @@ void KMHeaders::contentsMouseMoveEvent( QMouseEvent* e ) } } +//----------------------------------------------------------------------------- void KMHeaders::clearSelectionExcept( QListViewItem *exception ) { QListViewItem *item; @@ -1936,6 +1897,7 @@ void KMHeaders::clearSelectionExcept( QListViewItem *exception ) setSelected( item, FALSE ); } +//----------------------------------------------------------------------------- bool KMHeaders::shiftSelection( QListViewItem *begin, QListViewItem *end ) { QListViewItem *search = begin; diff --git a/kmmessage.cpp b/kmmessage.cpp index 1bd0646f1..7cca86d25 100644 --- a/kmmessage.cpp +++ b/kmmessage.cpp @@ -839,7 +839,7 @@ KMMessage* KMMessage::createRedirect(void) } } -//#warning TODO: insert sender here +//TODO: insert sender here msg->setHeaderField("X-KMail-Redirect-From", from()); msg->setSubject(subject()); msg->setFrom(from()); diff --git a/kmreaderwin.cpp b/kmreaderwin.cpp index b8e396658..69d053924 100644 --- a/kmreaderwin.cpp +++ b/kmreaderwin.cpp @@ -136,7 +136,6 @@ void KMReaderWin::makeAttachDir(void) } - //----------------------------------------------------------------------------- void KMReaderWin::readConfig(void) { @@ -167,14 +166,8 @@ void KMReaderWin::readConfig(void) c2 = config->readColorEntry("LinkColor",&c2); c3 = config->readColorEntry("FollowedColor",&c3); c4 = config->readColorEntry("BackgroundColor",&c4); - // ### FIXME: stylesheet - // mViewer->setDefaultBGColor(c4); - // mViewer->setDefaultTextColors(c1,c2,c3); } else { - // ### FIXME: stylesheet - // mViewer->setDefaultBGColor(c4); - // mViewer->setDefaultTextColors(c1,c2,c3); } mRecyleQouteColors = config->readBoolEntry( "RecycleQuoteColors", false ); @@ -226,7 +219,6 @@ void KMReaderWin::readConfig(void) } - //----------------------------------------------------------------------------- void KMReaderWin::writeConfig(bool aWithSync) { @@ -241,8 +233,7 @@ void KMReaderWin::writeConfig(bool aWithSync) } - - +//----------------------------------------------------------------------------- QString KMReaderWin::quoteFontTag( int quoteLevel ) { KConfig &config = *kapp->config(); @@ -296,8 +287,6 @@ QString KMReaderWin::quoteFontTag( int quoteLevel ) } - - //----------------------------------------------------------------------------- void KMReaderWin::initHtmlWidget(void) { @@ -305,26 +294,16 @@ void KMReaderWin::initHtmlWidget(void) mViewer->widget()->resize(width()-16, height()-110); mViewer->setURLCursor(KCursor::handCursor()); - // mViewer->setDefaultBGColor(QColor("#ffffff")); - // mViewer->setFollowsLinks( FALSE ); - // Espen 2000-05-14: Getting rid of thick ugly frames mViewer->view()->setLineWidth(0); - // ### FIXME - connect(mViewer->browserExtension(),SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),this, + connect(mViewer->browserExtension(), + SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),this, SLOT(slotUrlOpen(const KURL &, const KParts::URLArgs &))); connect(mViewer,SIGNAL(onURL(const QString &)),this, SLOT(slotUrlOn(const QString &))); connect(mViewer,SIGNAL(popupMenu(const QString &, const QPoint &)), SLOT(slotUrlPopup(const QString &, const QPoint &))); - // ### FIXME - // connect(mViewer,SIGNAL(textSelected(bool)), - // SLOT(slotTextSelected(bool))); - - // ### FIXME - //connect(mViewer, SIGNAL(documentChanged()), SLOT(slotDocumentChanged())); - //connect(mViewer, SIGNAL(documentDone()), SLOT(slotDocumentDone())); } @@ -422,6 +401,8 @@ void KMReaderWin::updateReaderWin() } + +//----------------------------------------------------------------------------- QString KMReaderWin::colorToString(const QColor& c) { return QString::number(0x1000000 + @@ -1152,15 +1133,13 @@ void KMReaderWin::resizeEvent(QResizeEvent *) } +//----------------------------------------------------------------------------- void KMReaderWin::slotDelayedResize() { mViewer->widget()->setGeometry(0, 0, width(), height()); } - - - //----------------------------------------------------------------------------- void KMReaderWin::closeEvent(QCloseEvent *e) { @@ -1515,6 +1494,7 @@ void KMReaderWin::slotAtmProperties() dlg.exec(); } + //----------------------------------------------------------------------------- void KMReaderWin::slotScrollUp() {