wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Coding style fixes.

Browse Source 
SVN_SILENT

svn path=/trunk/KDE/kdepim/kmail/; revision=1111089
wilder-work
Thomas McGuire 16 years ago
parent d25fba9e57
commit 8811d48b28
4 changed files with 29 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      folderselectiontreeview.cpp
  2. 10
      folderselectiontreeview.h
  3. 29
      kmmainwidget.cpp
  4. 13
      kmmainwidget.h

12
folderselectiontreeview.cpp
Unescape View File

@ -30,7 +30,6 @@
#include <akonadi/changerecorder.h>
#include <akonadi/session.h>
#include <akonadi/entitytreemodel.h>
#include <akonadi/favoritecollectionsmodel.h>
#include <akonadi/itemfetchscope.h>
#include <akonadi/entitymimetypefiltermodel.h>
#include <akonadi/collection.h>
@ -111,7 +110,8 @@ FolderSelectionTreeView::FolderSelectionTreeView( QWidget *parent, KXMLGUIClient
d->readableproxy = new ReadableCollectionProxyModel( this );
d->readableproxy->setSourceModel( d->quotaModel );
connect( d->collectionFolderView, SIGNAL(changeTooltipsPolicy( FolderSelectionTreeView::ToolTipDisplayPolicy ) ), this, SLOT( slotChangeTooltipsPolicy( FolderSelectionTreeView::ToolTipDisplayPolicy ) ) );
connect( d->collectionFolderView, SIGNAL(changeTooltipsPolicy( FolderSelectionTreeView::ToolTipDisplayPolicy ) ),
this, SLOT( slotChangeTooltipsPolicy( FolderSelectionTreeView::ToolTipDisplayPolicy ) ) );
d->collectionFolderView->setSelectionMode( QAbstractItemView::SingleSelection );
// Use the model
@ -125,7 +125,8 @@ FolderSelectionTreeView::FolderSelectionTreeView( QWidget *parent, KXMLGUIClient
lay->addWidget( d->collectionFolderView );
if ( ( options & UseLineEditForFiltering ) ) {
connect( d->filterFolderLineEdit, SIGNAL( textChanged(QString) ), d->filterTreeViewModel, SLOT( setFilterFixedString(QString) ) );
connect( d->filterFolderLineEdit, SIGNAL( textChanged(QString) ),
d->filterTreeViewModel, SLOT( setFilterFixedString(QString) ) );
d->label->hide();
} else {
d->filterFolderLineEdit->hide();
@ -148,7 +149,9 @@ void FolderSelectionTreeView::disableContextMenuAndExtraColumn()
void FolderSelectionTreeView::selectCollectionFolder( const Akonadi::Collection & col )
{
const QModelIndex idx = d->collectionFolderView->model()->index( 0, 0, QModelIndex() );
const QModelIndexList rows = d->collectionFolderView->model()->match( idx, Akonadi::EntityTreeModel::CollectionIdRole, col.id(), -1, Qt::MatchRecursive | Qt::MatchExactly );
const QModelIndexList rows = d->collectionFolderView->model()->match( idx,
Akonadi::EntityTreeModel::CollectionIdRole, col.id(), -1,
Qt::MatchRecursive | Qt::MatchExactly );
if ( rows.size() < 1 )
return;
@ -240,7 +243,6 @@ void FolderSelectionTreeView::slotChangeTooltipsPolicy( FolderSelectionTreeView:
changeToolTipsPolicyConfig( policy );
}
void FolderSelectionTreeView::changeToolTipsPolicyConfig( ToolTipDisplayPolicy policy )
{
switch( policy ){

10
folderselectiontreeview.h
Unescape View File

@ -24,6 +24,7 @@
#include <QAbstractItemView>
#include <akonadi/collection.h>
class KXMLGUIClient;
class QItemSelectionModel;
class FolderTreeView;
@ -46,9 +47,8 @@ public:
};
Q_DECLARE_FLAGS( TreeViewOptions, TreeViewOption )
FolderSelectionTreeView( QWidget *parent = 0, KXMLGUIClient *xmlGuiClient = 0, TreeViewOptions option = ShowUnreadCount );
FolderSelectionTreeView( QWidget *parent = 0, KXMLGUIClient *xmlGuiClient = 0,
TreeViewOptions option = ShowUnreadCount );
~FolderSelectionTreeView();
/**
@ -63,7 +63,6 @@ public:
void selectCollectionFolder( const Akonadi::Collection & col );
void setSelectionMode( QAbstractItemView::SelectionMode mode );
QAbstractItemView::SelectionMode selectionMode() const;
@ -89,19 +88,16 @@ public:
KLineEdit *filterFolderLineEdit();
void applyFilter( const QString& );
void disableContextMenuAndExtraColumn();
void readConfig();
protected:
void changeToolTipsPolicyConfig( ToolTipDisplayPolicy );
protected slots:
void slotChangeTooltipsPolicy( FolderSelectionTreeView::ToolTipDisplayPolicy );
private:
class FolderSelectionTreeViewPrivate;
FolderSelectionTreeViewPrivate * const d;

29
kmmainwidget.cpp
Unescape View File

@ -85,6 +85,7 @@
#include <akonadi/contact/contactsearchjob.h>
#include <akonadi/collectionpropertiesdialog.h>
#include <akonadi/entitydisplayattribute.h>
#include <akonadi/entitylistview.h>
#include <akonadi/agentinstance.h>
#include <akonadi/agenttype.h>
#include <akonadi/changerecorder.h>
@ -854,7 +855,9 @@ void KMMainWidget::createWidgets()
const KConfigGroup cfg( KMKernel::config(), "CollectionFolderView" );
mCollectionFolderView->folderTreeView()->header()->restoreState( cfg.readEntry( "HeaderState", QByteArray() ) );
mMessagePane = new MessageList::Pane( mCollectionFolderView->entityModel(), mCollectionFolderView->folderTreeView()->selectionModel(), this );
mMessagePane = new MessageList::Pane( mCollectionFolderView->entityModel(),
mCollectionFolderView->folderTreeView()->selectionModel(),
this );
mMessagePane->setXmlGuiClient( mGUIClient );
connect( mMessagePane, SIGNAL(messageSelected(Akonadi::Item)),
@ -1044,9 +1047,6 @@ void KMMainWidget::createWidgets()
connect( kmkernel->monitor(), SIGNAL( itemRemoved( const Akonadi::Item & ) ), SLOT(slotItemRemoved( const Akonadi::Item & ) ) );
Akonadi::EntityTreeViewStateSaver* saver = new Akonadi::EntityTreeViewStateSaver( mCollectionFolderView->folderTreeView() );
saver->restoreState( cfg );
}
void KMMainWidget::slotItemAdded( const Akonadi::Item &, const Akonadi::Collection& col)
@ -1382,15 +1382,15 @@ void KMMainWidget::slotFolderMailingListProperties()
}
//-----------------------------------------------------------------------------
void KMMainWidget::slotFolderShortcutCommand()
void KMMainWidget::slotShowFolderShortcutDialog()
{
if ( !mCollectionFolderView || !mCurrentFolder )
return;
MessageViewer::AutoQPointer<KMail::FolderShortcutDialog> shorty;
shorty = new KMail::FolderShortcutDialog( mCurrentFolder, kmkernel->getKMMainWidget(), mCollectionFolderView );
shorty = new KMail::FolderShortcutDialog( mCurrentFolder, kmkernel->getKMMainWidget(),
mCollectionFolderView );
shorty->exec();
//slotModifyFolder( KMMainWidget::PropsShortcut );
}
#if 0
@ -3095,9 +3095,10 @@ void KMMainWidget::setupActions()
connect(mFolderMailingListPropertiesAction, SIGNAL(triggered(bool)), SLOT( slotFolderMailingListProperties()));
// mFolderMailingListPropertiesAction->setIcon(KIcon("document-properties-mailing-list"));
mFolderShortCutCommandAction = new KAction(KIcon("configure-shortcuts"), i18n("&Assign Shortcut..."), this);
actionCollection()->addAction("folder_shortcut_command", mFolderShortCutCommandAction );
connect(mFolderShortCutCommandAction, SIGNAL(triggered(bool) ), SLOT( slotFolderShortcutCommand() ));
mShowFolderShortcutDialogAction = new KAction(KIcon("configure-shortcuts"), i18n("&Assign Shortcut..."), this);
actionCollection()->addAction("folder_shortcut_command", mShowFolderShortcutDialogAction );
connect( mShowFolderShortcutDialogAction, SIGNAL( triggered( bool ) ),
SLOT( slotShowFolderShortcutDialog() ) );
mMarkAllAsReadAction = new KAction(KIcon("mail-mark-read"), i18n("Mark All Messages as &Read"), this);
actionCollection()->addAction("mark_all_as_read", mMarkAllAsReadAction );
@ -3511,9 +3512,9 @@ void KMMainWidget::slotShowExpiryProperties()
void KMMainWidget::slotEditKeys()
{
KShortcutsDialog::configure( actionCollection(),
KShortcutsEditor::LetterShortcutsAllowed );
KShortcutsDialog::configure( actionCollection(), KShortcutsEditor::LetterShortcutsAllowed );
}
//-----------------------------------------------------------------------------
void KMMainWidget::slotReadOn()
{
@ -3794,7 +3795,7 @@ void KMMainWidget::updateFolderMenu()
mPreferHtmlAction->setChecked( mHtmlPref ? !mFolderHtmlPref : mFolderHtmlPref );
mPreferHtmlLoadExtAction->setChecked( mHtmlLoadExtPref ? !mFolderHtmlLoadExtPref : mFolderHtmlLoadExtPref );
mRemoveDuplicatesAction->setEnabled( !multiFolder && mCurrentFolder && mCurrentFolder->canDeleteMessages() );
mFolderShortCutCommandAction->setEnabled( !multiFolder &&mCurrentFolder);
mShowFolderShortcutDialogAction->setEnabled( !multiFolder && mCurrentFolder );
}
//-----------------------------------------------------------------------------

13
kmmainwidget.h
Unescape View File

@ -38,16 +38,15 @@
#include <QMenu>
#include <QHash>
#include <QPointer>
#include <akonadi/entitylistview.h>
#include <akonadi/entitytreemodel.h>
#include <akonadi/standardactionmanager.h>
#include <akonadi/entity.h>
#include <messagelist/core/view.h>
#include "folderselectiontreeview.h"
namespace MessageList {
class Pane;
}
namespace Akonadi {
class EntityListView;
}
namespace KMime {
@ -67,9 +66,7 @@ class KMSystemTray;
class CustomTemplatesMenu;
template <typename T> class QList;
template <typename T, typename S> class QMap;
template <typename T> class QPointer;
namespace KIO {
class Job;
@ -326,7 +323,7 @@ class KMAIL_EXPORT KMMainWidget : public QWidget
void slotCompose();
void slotPostToML();
void slotFolderMailingListProperties();
void slotFolderShortcutCommand();
void slotShowFolderShortcutDialog();
void slotExpireFolder();
void slotExpireAll();
void slotInvalidateIMAPFolders();
@ -600,7 +597,7 @@ private:
KAction *mRemoveFolderAction,
*mExpireFolderAction, *mCompactFolderAction,
*mEmptyFolderAction, *mMarkAllAsReadAction, *mFolderMailingListPropertiesAction,
*mFolderShortCutCommandAction,
*mShowFolderShortcutDialogAction,
*mRemoveDuplicatesAction, *mArchiveFolderAction,
*mPostToMailinglistAction;
KToggleAction *mPreferHtmlAction, *mPreferHtmlLoadExtAction;
@ -639,8 +636,6 @@ private:
bool mVacationIndicatorActive;
bool mGoToFirstUnreadMessageInSelectedFolder;
KPIM::ProgressItem *mFilterProgressItem;
};
#endif

Write Preview
Loading…
Cancel
Save