Commit 2e439547 authored by Peter Penz's avatar Peter Penz
Browse files

adapt Dolphin to kdelibs coding style...

adapt Dolphin to kdelibs coding style (http://techbase.kde.org/Policies/Kdelibs_Coding_Style) by using:
astyle --indent=spaces=4 --brackets=linux \
       --indent-labels --pad=oper --unpad=paren \
       --one-line=keep-statements --convert-tabs \
       --indent-preprocessor \
       `find -type f -name '*.cpp'` `find -type f -name '*.h'`

svn path=/trunk/KDE/kdebase/apps/; revision=651981
parent 808e11e9
......@@ -28,10 +28,10 @@
ApplyViewPropsJob::ApplyViewPropsJob(const KUrl& dir,
const ViewProperties& viewProps) :
KIO::Job(false),
m_viewProps(0),
m_progress(0),
m_dir(dir)
KIO::Job(false),
m_viewProps(0),
m_progress(0),
m_dir(dir)
{
m_viewProps = new ViewProperties(dir);
m_viewProps->setViewMode(viewProps.viewMode());
......@@ -69,7 +69,7 @@ void ApplyViewPropsJob::slotEntries(KIO::Job*, const KIO::UDSEntryList& list)
for (; it != end; ++it) {
const KIO::UDSEntry& entry = *it;
const QString name = entry.stringValue(KIO::UDS_NAME);
if ((name != ".") && (name != ".." ) && entry.isDir()) {
if ((name != ".") && (name != "..") && entry.isDir()) {
++m_progress;
KUrl url(m_dir);
......@@ -86,8 +86,8 @@ void ApplyViewPropsJob::slotEntries(KIO::Job*, const KIO::UDSEntryList& list)
void ApplyViewPropsJob::slotResult(KJob* job)
{
if (job->error()) {
setError( job->error() );
setErrorText( job->errorText() );
setError(job->error());
setErrorText(job->errorText());
}
emitResult();
}
......
......@@ -62,7 +62,10 @@ public:
*/
ApplyViewPropsJob(const KUrl& dir, const ViewProperties& viewProps);
virtual ~ApplyViewPropsJob();
int progress() const { return m_progress; }
int progress() const
{
return m_progress;
}
private:
void startNextJob(const KUrl & url);
......
......@@ -36,13 +36,13 @@
#include <QSpinBox>
ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
QWidget* parent) :
KVBox(parent),
m_mainWindow(mainWindow),
m_smallIconSize(0),
m_mediumIconSize(0),
m_largeIconSize(0),
m_fontRequester(0)
QWidget* parent) :
KVBox(parent),
m_mainWindow(mainWindow),
m_smallIconSize(0),
m_mediumIconSize(0),
m_largeIconSize(0),
m_fontRequester(0)
{
const int spacing = KDialog::spacingHint();
const int margin = KDialog::marginHint();
......@@ -62,17 +62,17 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
m_mediumIconSize = new QRadioButton(i18n("Medium"), this);
m_largeIconSize = new QRadioButton(i18n("Large"), this);
switch (settings->iconSize()) {
case K3Icon::SizeLarge:
m_largeIconSize->setChecked(true);
break;
case K3Icon::SizeLarge:
m_largeIconSize->setChecked(true);
break;
case K3Icon::SizeMedium:
m_mediumIconSize->setChecked(true);
break;
case K3Icon::SizeMedium:
m_mediumIconSize->setChecked(true);
break;
case K3Icon::SizeSmall:
default:
m_smallIconSize->setChecked(true);
case K3Icon::SizeSmall:
default:
m_smallIconSize->setChecked(true);
}
QButtonGroup* iconSizeGroup = new QButtonGroup(this);
......@@ -108,8 +108,7 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
}
ColumnViewSettingsPage::~ColumnViewSettingsPage()
{
}
{}
void ColumnViewSettingsPage::applySettings()
{
......@@ -119,8 +118,7 @@ void ColumnViewSettingsPage::applySettings()
int iconSize = K3Icon::SizeSmall;
if (m_mediumIconSize->isChecked()) {
iconSize = K3Icon::SizeMedium;
}
else if (m_largeIconSize->isChecked()) {
} else if (m_largeIconSize->isChecked()) {
iconSize = K3Icon::SizeLarge;
}
settings->setIconSize(iconSize);
......
......@@ -36,17 +36,17 @@
#include <QSpinBox>
DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
QWidget* parent) :
KVBox(parent),
m_mainWindow(mainWindow),
m_dateBox(0),
m_permissionsBox(0),
m_ownerBox(0),
m_groupBox(0),
m_smallIconSize(0),
m_mediumIconSize(0),
m_largeIconSize(0),
m_fontRequester(0)
QWidget* parent) :
KVBox(parent),
m_mainWindow(mainWindow),
m_dateBox(0),
m_permissionsBox(0),
m_ownerBox(0),
m_groupBox(0),
m_smallIconSize(0),
m_mediumIconSize(0),
m_largeIconSize(0),
m_fontRequester(0)
{
const int spacing = KDialog::spacingHint();
const int margin = KDialog::marginHint();
......@@ -88,17 +88,17 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
m_mediumIconSize = new QRadioButton(i18n("Medium"), this);
m_largeIconSize = new QRadioButton(i18n("Large"), this);
switch (settings->iconSize()) {
case K3Icon::SizeLarge:
m_largeIconSize->setChecked(true);
break;
case K3Icon::SizeLarge:
m_largeIconSize->setChecked(true);
break;
case K3Icon::SizeMedium:
m_mediumIconSize->setChecked(true);
break;
case K3Icon::SizeMedium:
m_mediumIconSize->setChecked(true);
break;
case K3Icon::SizeSmall:
default:
m_smallIconSize->setChecked(true);
case K3Icon::SizeSmall:
default:
m_smallIconSize->setChecked(true);
}
QButtonGroup* iconSizeGroup = new QButtonGroup(this);
......@@ -134,8 +134,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
}
DetailsViewSettingsPage::~DetailsViewSettingsPage()
{
}
{}
void DetailsViewSettingsPage::applySettings()
{
......@@ -150,8 +149,7 @@ void DetailsViewSettingsPage::applySettings()
int iconSize = K3Icon::SizeSmall;
if (m_mediumIconSize->isChecked()) {
iconSize = K3Icon::SizeMedium;
}
else if (m_largeIconSize->isChecked()) {
} else if (m_largeIconSize->isChecked()) {
iconSize = K3Icon::SizeLarge;
}
settings->setIconSize(iconSize);
......
......@@ -27,7 +27,7 @@
#include <QDBusConnection>
DolphinApplication::DolphinApplication() :
m_lastId(0)
m_lastId(0)
{
new ApplicationAdaptor(this);
QDBusConnection::sessionBus().registerObject("/dolphin/Application", this);
......@@ -78,8 +78,7 @@ int DolphinApplication::newInstance()
for (int i = 0; i < args->count(); ++i) {
openWindow(args->arg(i));
}
}
else {
} else {
openWindow(QString());
}
......
......@@ -32,8 +32,8 @@
#include <QPoint>
DolphinColumnView::DolphinColumnView(QWidget* parent, DolphinController* controller) :
QColumnView(parent),
m_controller(controller)
QColumnView(parent),
m_controller(controller)
{
Q_ASSERT(controller != 0);
......@@ -53,7 +53,7 @@ DolphinColumnView::DolphinColumnView(QWidget* parent, DolphinController* control
connect(controller, SIGNAL(zoomOut()),
this, SLOT(zoomOut()));
// apply the column mode settings to the widget
// apply the column mode settings to the widget
const ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
Q_ASSERT(settings != 0);
......@@ -68,8 +68,7 @@ DolphinColumnView::DolphinColumnView(QWidget* parent, DolphinController* control
}
DolphinColumnView::~DolphinColumnView()
{
}
{}
QStyleOptionViewItem DolphinColumnView::viewOptions() const
{
......@@ -113,9 +112,9 @@ void DolphinColumnView::zoomIn()
ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
// TODO: get rid of K3Icon sizes
switch (settings->iconSize()) {
case K3Icon::SizeSmall: settings->setIconSize(K3Icon::SizeMedium); break;
case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeLarge); break;
default: Q_ASSERT(false); break;
case K3Icon::SizeSmall: settings->setIconSize(K3Icon::SizeMedium); break;
case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeLarge); break;
default: Q_ASSERT(false); break;
}
updateDecorationSize();
}
......@@ -123,13 +122,13 @@ void DolphinColumnView::zoomIn()
void DolphinColumnView::zoomOut()
{
if (isZoomOutPossible()) {
if (isZoomOutPossible()) {
ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
// TODO: get rid of K3Icon sizes
switch (settings->iconSize()) {
case K3Icon::SizeLarge: settings->setIconSize(K3Icon::SizeMedium); break;
case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeSmall); break;
default: Q_ASSERT(false); break;
case K3Icon::SizeLarge: settings->setIconSize(K3Icon::SizeMedium); break;
case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeSmall); break;
default: Q_ASSERT(false); break;
}
updateDecorationSize();
}
......
......@@ -50,10 +50,10 @@
DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
KFileItem* fileInfo,
const KUrl& baseUrl) :
m_mainWindow(parent),
m_fileInfo(fileInfo),
m_baseUrl(baseUrl),
m_context(NoContext)
m_mainWindow(parent),
m_fileInfo(fileInfo),
m_baseUrl(baseUrl),
m_context(NoContext)
{
// The context menu either accesses the URLs of the selected items
// or the items itself. To increase the performance both lists are cached.
......@@ -63,8 +63,7 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
}
DolphinContextMenu::~DolphinContextMenu()
{
}
{}
void DolphinContextMenu::open()
{
......@@ -76,21 +75,18 @@ void DolphinContextMenu::open()
if (m_fileInfo != 0) {
m_context |= ItemContext;
// TODO: handle other use cases like devices + desktop files
}
}
// open the corresponding popup for the context
if (m_context & TrashContext) {
if (m_context & ItemContext) {
openTrashItemContextMenu();
}
else {
} else {
openTrashContextMenu();
}
}
else if (m_context & ItemContext) {
} else if (m_context & ItemContext) {
openItemContextMenu();
}
else {
} else {
Q_ASSERT(m_context == NoContext);
openViewportContextMenu();
}
......@@ -114,10 +110,10 @@ void DolphinContextMenu::openTrashContextMenu()
if (popup->exec(QCursor::pos()) == emptyTrashAction) {
const QString text(i18n("Do you really want to empty the Trash? All items will get deleted."));
const bool del = KMessageBox::warningContinueCancel(m_mainWindow,
text,
QString(),
KGuiItem(i18n("Empty Trash"), KIcon("user-trash"))
) == KMessageBox::Continue;
text,
QString(),
KGuiItem(i18n("Empty Trash"), KIcon("user-trash"))
) == KMessageBox::Continue;
if (del) {
KonqOperations::emptyTrash(m_mainWindow);
}
......@@ -179,25 +175,22 @@ void DolphinContextMenu::openItemContextMenu()
QAction* activatedAction = popup->exec(QCursor::pos());
if ((bookmarkAction!= 0) && (activatedAction == bookmarkAction)) {
if ((bookmarkAction != 0) && (activatedAction == bookmarkAction)) {
const KUrl selectedUrl(m_fileInfo->url());
if (selectedUrl.isValid()) {
DolphinSettings::instance().placesModel()->addPlace(selectedUrl.fileName(),
selectedUrl);
selectedUrl);
}
}
else if (serviceActions.contains(activatedAction)) {
} else if (serviceActions.contains(activatedAction)) {
// one of the 'Actions' items has been selected
int id = serviceActions.indexOf(activatedAction);
KDesktopFileActions::executeService(m_selectedUrls, actionsVector[id]);
}
else if (openWithActions.contains(activatedAction)) {
} else if (openWithActions.contains(activatedAction)) {
// one of the 'Open With' items has been selected
if (openWithActions.last() == activatedAction) {
// the item 'Other...' has been selected
KRun::displayOpenWithDialog(m_selectedUrls, m_mainWindow);
}
else {
} else {
int id = openWithActions.indexOf(activatedAction);
KService::Ptr servicePtr = openWithVector[id];
KRun::run(*servicePtr, m_selectedUrls, m_mainWindow);
......@@ -247,8 +240,7 @@ void DolphinContextMenu::openViewportContextMenu()
QAction* activatedAction = popup->exec(QCursor::pos());
if (activatedAction == propertiesAction) {
new KPropertiesDialog(m_mainWindow->activeView()->url());
}
else if (activatedAction == bookmarkAction) {
} else if (activatedAction == bookmarkAction) {
const KUrl& url = m_mainWindow->activeView()->url();
if (url.isValid()) {
DolphinSettings::instance().placesModel()->addPlace(url.fileName(), url);
......@@ -285,8 +277,7 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup)
if (url.isLocalFile()) {
QAction* moveToTrashAction = collection->action("move_to_trash");
popup->addAction(moveToTrashAction);
}
else {
} else {
showDeleteCommand = true;
}
......@@ -297,7 +288,7 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup)
}
QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
QVector<KService::Ptr>& openWithVector)
QVector<KService::Ptr>& openWithVector)
{
// Parts of the following code have been taken
// from the class KonqOperations located in
......@@ -322,12 +313,12 @@ QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
// fill the 'Open with' sub menu with application types
const KMimeType::Ptr mimePtr = KMimeType::findByUrl(m_fileInfo->url());
KService::List offers = KMimeTypeTrader::self()->query(mimePtr->name(),
"Application",
"Type == 'Application'");
"Application",
"Type == 'Application'");
if (offers.count() > 0) {
KService::List::Iterator it;
KMenu* openWithMenu = new KMenu(i18n("Open With"));
for(it = offers.begin(); it != offers.end(); ++it) {
for (it = offers.begin(); it != offers.end(); ++it) {
// The offer list from the KTrader returns duplicate
// application entries. Although this seems to be a configuration
// problem outside the scope of Dolphin, duplicated entries just
......@@ -346,16 +337,14 @@ QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
openWithActions << action;
popup->addMenu(openWithMenu);
}
else {
} else {
// No applications are registered, hence just offer
// a "Open With..." item instead of a sub menu containing
// only one entry.
QAction* action = popup->addAction(i18n("Open With..."));
openWithActions << action;
}
}
else {
} else {
// At least one of the selected items has a different MIME type. In this case
// just show a disabled "Open With..." entry.
QAction* action = popup->addAction(i18n("Open With..."));
......@@ -366,7 +355,7 @@ QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
}
QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
QVector<KDesktopFileActions::Service>& actionsVector)
QVector<KDesktopFileActions::Service>& actionsVector)
{
// Parts of the following code have been taken
// from the class KonqOperations located in
......@@ -388,7 +377,7 @@ QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
QStringList entries = dir.entryList(QDir::Files);
for (QStringList::ConstIterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt) {
KConfigGroup cfg(KSharedConfig::openConfig( *dirIt + *entryIt, KConfig::OnlyLocal), "Desktop Entry" );
KConfigGroup cfg(KSharedConfig::openConfig(*dirIt + *entryIt, KConfig::OnlyLocal), "Desktop Entry");
if ((cfg.hasKey("Actions") || cfg.hasKey("X-KDE-GetActionMenu")) && cfg.hasKey("ServiceTypes")) {
//const QStringList types = cfg.readListEntry("ServiceTypes");
QStringList types;
......@@ -429,7 +418,7 @@ QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
if (insert) {
menu = actionsMenu;
const QString submenuName = cfg.readEntry( "X-KDE-Submenu" );
const QString submenuName = cfg.readEntry("X-KDE-Submenu");
if (!submenuName.isEmpty()) {
menu = new KMenu(submenuName);
actionsMenu->addMenu(menu);
......@@ -445,8 +434,7 @@ QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
QAction* action = menu->addAction(KIcon(service.m_strIcon),
service.m_strName);
serviceActions << action;
}
else {
} else {
QAction *action = menu->addAction(service.m_strName);
serviceActions << action;
}
......@@ -479,21 +467,18 @@ QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
QAction* action = popup->addAction(text);
serviceActions.clear();
serviceActions << action;
}
else {
} else {
QAction* action = popup->addAction(icon, text);
serviceActions.clear();
serviceActions << action;
}
}
else {
} else {
// The item is a sub menu, hence show the sub menu in the root menu.
popup->addMenu(menu);
}
actionsMenu->deleteLater();
actionsMenu = 0;
}
else {
} else {
popup->addMenu(actionsMenu);
}
......
......@@ -109,7 +109,8 @@ private:
const QString& entryName) const;
private:
struct Entry {
struct Entry
{
int type;
QString name;
QString filePath; // empty for separator
......@@ -118,7 +119,8 @@ private:
QString comment;
};
enum ContextType {
enum ContextType
{
NoContext = 0,
ItemContext = 1,
TrashContext = 2
......
......@@ -20,16 +20,14 @@
#include "dolphincontroller.h"
DolphinController::DolphinController(QObject* parent) :
QObject(parent),
m_showPreview(false),
m_zoomInPossible(false),
m_zoomOutPossible(false)
{
}
QObject(parent),
m_showPreview(false),
m_zoomInPossible(false),
m_zoomOutPossible(false)
{}
DolphinController::~DolphinController()
{
}
{}
void DolphinController::triggerContextMenuRequest(const QPoint& pos)
{
......@@ -43,8 +41,8 @@ void DolphinController::triggerActivation()
}
void DolphinController::indicateDroppedUrls(const KUrl::List& urls,
const QModelIndex& index,
QWidget* source)
const QModelIndex& index,
QWidget* source)
{
emit urlsDropped(urls, index, source);
}
......
......@@ -54,8 +54,14 @@ public:
explicit DolphinController(QObject* parent);
virtual ~DolphinController();
void setUrl(const KUrl& url) { m_url = url; }
const KUrl& url() const { return m_url; }
void setUrl(const KUrl& url)
{
m_url = url;
}
const KUrl& url() const
{
return m_url;
}
void triggerContextMenuRequest(const QPoint& pos);
......@@ -70,15 +76,30 @@ public:
void indicateSortOrderChange(Qt::SortOrder order);
void setShowPreview(bool showPreview);
bool showPreview() const { return m_showPreview; }
bool showPreview() const
{
return m_showPreview;
}
void triggerZoomIn();
void setZoomInPossible(bool possible) { m_zoomInPossible = possible; }
bool isZoomInPossible() const { return m_zoomInPossible; }
void setZoomInPossible(bool possible)
{
m_zoomInPossible = possible;
}
bool isZoomInPossible() const
{
return m_zoomInPossible;
}
void triggerZoomOut();
void setZoomOutPossible(bool possible) { m_zoomOutPossible = possible; }
bool isZoomOutPossible() const { return m_zoomOutPossible; }
void setZoomOutPossible(bool possible)
{
m_zoomOutPossible = possible;
}
bool isZoomOutPossible() const
{
return m_zoomOutPossible;
}
public slots:
void triggerItem(const QModelIndex& index);
......
......@@ -33,8 +33,8 @@
#include <QHeaderView>
DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* controller) :
QTreeView(parent),
m_controller(controller)
QTreeView(parent),