X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Faction.cpp;h=7c2073460a26641f92e4443fe0be77779364291d;hp=29f4a43e7d9c6c025be39b14cc9817ae6fe975d0;hb=694f9bfbf7f1af19108461c7e00d133e55082bce;hpb=084d95e60b0fb587b1950a3e4f8ec5e4f017446c

diff --git a/src/uisupport/action.cpp b/src/uisupport/action.cpp
index 29f4a43e..7c207346 100644
--- a/src/uisupport/action.cpp
+++ b/src/uisupport/action.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -26,85 +26,102 @@
 
 Action::Action(QObject *parent)
 #ifdef HAVE_KDE
-: KAction(parent)
+    : KAction(parent)
 #else
-: QWidgetAction(parent)
+    : QWidgetAction(parent)
 #endif
 {
-  init();
+    init();
 }
 
+
 Action::Action(const QString &text, QObject *parent, const QObject *receiver, const char *slot, const QKeySequence &shortcut)
 #ifdef HAVE_KDE
-: KAction(parent)
+    : KAction(parent)
 #else
-: QWidgetAction(parent)
+    : QWidgetAction(parent)
 #endif
 {
-  init();
-  setText(text);
-  setShortcut(shortcut);
-  if(receiver && slot)
-    connect(this, SIGNAL(triggered()), receiver, slot);
+    init();
+    setText(text);
+    setShortcut(shortcut);
+    if (receiver && slot)
+        connect(this, SIGNAL(triggered()), receiver, slot);
 }
 
+
 Action::Action(const QIcon &icon, const QString &text, QObject *parent, const QObject *receiver, const char *slot, const QKeySequence &shortcut)
 #ifdef HAVE_KDE
-: KAction(parent)
+    : KAction(parent)
 #else
-: QWidgetAction(parent)
+    : QWidgetAction(parent)
 #endif
 {
-  init();
-  setIcon(icon);
-  setText(text);
-  setShortcut(shortcut);
-  if(receiver && slot)
-    connect(this, SIGNAL(triggered()), receiver, slot);
+    init();
+    setIcon(icon);
+    setText(text);
+    setShortcut(shortcut);
+    if (receiver && slot)
+        connect(this, SIGNAL(triggered()), receiver, slot);
 }
 
+
 #ifdef HAVE_KDE
-void Action::init() { }
+void Action::init() {}
 #else
-void Action::init() {
-  connect(this, SIGNAL(triggered(bool)), this, SLOT(slotTriggered()));
+void Action::init()
+{
+    connect(this, SIGNAL(triggered(bool)), this, SLOT(slotTriggered()));
 
-  setProperty("isShortcutConfigurable", true);
+    setProperty("isShortcutConfigurable", true);
 }
 
-void Action::slotTriggered() {
-  emit triggered(QApplication::mouseButtons(), QApplication::keyboardModifiers());
+
+void Action::slotTriggered()
+{
+    emit triggered(QApplication::mouseButtons(), QApplication::keyboardModifiers());
 }
 
-bool Action::isShortcutConfigurable() const {
-  return property("isShortcutConfigurable").toBool();
+
+bool Action::isShortcutConfigurable() const
+{
+    return property("isShortcutConfigurable").toBool();
 }
 
-void Action::setShortcutConfigurable(bool b) {
-  setProperty("isShortcutConfigurable", b);
+
+void Action::setShortcutConfigurable(bool b)
+{
+    setProperty("isShortcutConfigurable", b);
 }
 
-QKeySequence Action::shortcut(ShortcutTypes type) const {
-  Q_ASSERT(type);
-  if(type == DefaultShortcut)
-    return property("defaultShortcut").value<QKeySequence>();
 
-  if(shortcuts().count()) return shortcuts().value(0);
-  return QKeySequence();
+QKeySequence Action::shortcut(ShortcutTypes type) const
+{
+    Q_ASSERT(type);
+    if (type == DefaultShortcut)
+        return property("defaultShortcut").value<QKeySequence>();
+
+    if (shortcuts().count()) return shortcuts().value(0);
+    return QKeySequence();
 }
 
-void Action::setShortcut(const QShortcut &shortcut, ShortcutTypes type) {
-  setShortcut(shortcut.key(), type);
+
+void Action::setShortcut(const QShortcut &shortcut, ShortcutTypes type)
+{
+    setShortcut(shortcut.key(), type);
 }
 
-void Action::setShortcut(const QKeySequence &key, ShortcutTypes type) {
-  Q_ASSERT(type);
 
-  if(type & DefaultShortcut)
-    setProperty("defaultShortcut", key);
+void Action::setShortcut(const QKeySequence &key, ShortcutTypes type)
+{
+    Q_ASSERT(type);
+
+    if (type & DefaultShortcut)
+        setProperty("defaultShortcut", key);
 
-  if(type & ActiveShortcut)
-    QAction::setShortcut(key);
+    if (type & ActiveShortcut)
+        QAction::setShortcut(key);
 }
 
+
 #endif /* HAVE_KDE */