summaryrefslogtreecommitdiff
path: root/Libraries
diff options
context:
space:
mode:
authorSergey Bugaev <bugaevc@gmail.com>2020-01-10 19:06:00 +0300
committerAndreas Kling <awesomekling@gmail.com>2020-01-10 17:45:59 +0100
commit10324f95b020710d811cfce9c336aa24ba90ed00 (patch)
treeffb02ba683c538e715722ee7ac35bf41eed5d551 /Libraries
parentfdeb91e000f57407334c7cfdd11ccd7c97dd51c6 (diff)
downloadserenity-10324f95b020710d811cfce9c336aa24ba90ed00.zip
LibGUI+FileManager: Misc tweaks courtesy of clang-format
Diffstat (limited to 'Libraries')
-rw-r--r--Libraries/LibGUI/GAbstractButton.h2
-rw-r--r--Libraries/LibGUI/GAction.h2
-rw-r--r--Libraries/LibGUI/GButton.cpp2
-rw-r--r--Libraries/LibGUI/GButton.h4
-rw-r--r--Libraries/LibGUI/GCheckBox.h2
-rw-r--r--Libraries/LibGUI/GDesktop.h2
-rw-r--r--Libraries/LibGUI/GFontDatabase.h2
-rw-r--r--Libraries/LibGUI/GFrame.cpp2
-rw-r--r--Libraries/LibGUI/GFrame.h2
-rw-r--r--Libraries/LibGUI/GItemView.cpp6
-rw-r--r--Libraries/LibGUI/GLabel.h2
-rw-r--r--Libraries/LibGUI/GMenuItem.h2
-rw-r--r--Libraries/LibGUI/GModelEditingDelegate.h2
-rw-r--r--Libraries/LibGUI/GModelSelection.h2
-rw-r--r--Libraries/LibGUI/GUndoStack.cpp1
15 files changed, 17 insertions, 18 deletions
diff --git a/Libraries/LibGUI/GAbstractButton.h b/Libraries/LibGUI/GAbstractButton.h
index db3f5dd26e..778ca1bec8 100644
--- a/Libraries/LibGUI/GAbstractButton.h
+++ b/Libraries/LibGUI/GAbstractButton.h
@@ -1,8 +1,8 @@
#pragma once
#include <LibCore/CTimer.h>
-#include <LibGUI/GWidget.h>
#include <LibDraw/TextAlignment.h>
+#include <LibGUI/GWidget.h>
class GPainter;
diff --git a/Libraries/LibGUI/GAction.h b/Libraries/LibGUI/GAction.h
index 58cf4a7c10..fb609d12eb 100644
--- a/Libraries/LibGUI/GAction.h
+++ b/Libraries/LibGUI/GAction.h
@@ -1,11 +1,11 @@
#pragma once
-#include <AK/String.h>
#include <AK/Badge.h>
#include <AK/Function.h>
#include <AK/HashTable.h>
#include <AK/NonnullRefPtr.h>
#include <AK/RefCounted.h>
+#include <AK/String.h>
#include <AK/WeakPtr.h>
#include <AK/Weakable.h>
#include <LibDraw/GraphicsBitmap.h>
diff --git a/Libraries/LibGUI/GButton.cpp b/Libraries/LibGUI/GButton.cpp
index 395adbb23b..1127219d35 100644
--- a/Libraries/LibGUI/GButton.cpp
+++ b/Libraries/LibGUI/GButton.cpp
@@ -1,10 +1,10 @@
#include <AK/StringBuilder.h>
#include <Kernel/KeyCode.h>
+#include <LibDraw/StylePainter.h>
#include <LibGUI/GAction.h>
#include <LibGUI/GActionGroup.h>
#include <LibGUI/GButton.h>
#include <LibGUI/GPainter.h>
-#include <LibDraw/StylePainter.h>
GButton::GButton(GWidget* parent)
: GAbstractButton(parent)
diff --git a/Libraries/LibGUI/GButton.h b/Libraries/LibGUI/GButton.h
index 22c82352ee..3aff13dc8e 100644
--- a/Libraries/LibGUI/GButton.h
+++ b/Libraries/LibGUI/GButton.h
@@ -1,11 +1,11 @@
#pragma once
-#include <AK/String.h>
#include <AK/Function.h>
-#include <LibGUI/GAbstractButton.h>
+#include <AK/String.h>
#include <LibDraw/GraphicsBitmap.h>
#include <LibDraw/StylePainter.h>
#include <LibDraw/TextAlignment.h>
+#include <LibGUI/GAbstractButton.h>
class GAction;
diff --git a/Libraries/LibGUI/GCheckBox.h b/Libraries/LibGUI/GCheckBox.h
index b1553dc1f9..8527f40a8b 100644
--- a/Libraries/LibGUI/GCheckBox.h
+++ b/Libraries/LibGUI/GCheckBox.h
@@ -1,7 +1,7 @@
#pragma once
-#include <AK/String.h>
#include <AK/Function.h>
+#include <AK/String.h>
#include <LibGUI/GAbstractButton.h>
class GCheckBox : public GAbstractButton {
diff --git a/Libraries/LibGUI/GDesktop.h b/Libraries/LibGUI/GDesktop.h
index 73bdca506f..104397a90f 100644
--- a/Libraries/LibGUI/GDesktop.h
+++ b/Libraries/LibGUI/GDesktop.h
@@ -1,8 +1,8 @@
#pragma once
-#include <AK/String.h>
#include <AK/Badge.h>
#include <AK/Function.h>
+#include <AK/String.h>
#include <LibDraw/Rect.h>
class GWindowServerConnection;
diff --git a/Libraries/LibGUI/GFontDatabase.h b/Libraries/LibGUI/GFontDatabase.h
index ca268d1332..5f3feaf1f9 100644
--- a/Libraries/LibGUI/GFontDatabase.h
+++ b/Libraries/LibGUI/GFontDatabase.h
@@ -1,8 +1,8 @@
#pragma once
-#include <AK/String.h>
#include <AK/Function.h>
#include <AK/HashMap.h>
+#include <AK/String.h>
class Font;
diff --git a/Libraries/LibGUI/GFrame.cpp b/Libraries/LibGUI/GFrame.cpp
index 1097c2de85..bd00523591 100644
--- a/Libraries/LibGUI/GFrame.cpp
+++ b/Libraries/LibGUI/GFrame.cpp
@@ -1,6 +1,6 @@
+#include <LibDraw/StylePainter.h>
#include <LibGUI/GFrame.h>
#include <LibGUI/GPainter.h>
-#include <LibDraw/StylePainter.h>
GFrame::GFrame(GWidget* parent)
: GWidget(parent)
diff --git a/Libraries/LibGUI/GFrame.h b/Libraries/LibGUI/GFrame.h
index 8cfbca7ee6..ad9e74f5ce 100644
--- a/Libraries/LibGUI/GFrame.h
+++ b/Libraries/LibGUI/GFrame.h
@@ -1,7 +1,7 @@
#pragma once
-#include <LibGUI/GWidget.h>
#include <LibDraw/StylePainter.h>
+#include <LibGUI/GWidget.h>
class GFrame : public GWidget {
C_OBJECT(GFrame)
diff --git a/Libraries/LibGUI/GItemView.cpp b/Libraries/LibGUI/GItemView.cpp
index a3be11df31..1d916fb8fe 100644
--- a/Libraries/LibGUI/GItemView.cpp
+++ b/Libraries/LibGUI/GItemView.cpp
@@ -116,7 +116,7 @@ void GItemView::mousedown_event(GMouseEvent& event)
if (event.button() == GMouseButton::Left) {
m_left_mousedown_position = event.position();
if (item_index == -1) {
- if(event.modifiers() & Mod_Ctrl) {
+ if (event.modifiers() & Mod_Ctrl) {
selection().for_each_index([&](auto& index) {
m_rubber_band_remembered_selection.append(index);
});
@@ -150,7 +150,7 @@ void GItemView::mouseup_event(GMouseEvent& event)
}
int item_index = item_at_event_position(event.position());
auto index = model()->index(item_index, m_model_column);
- if((selection().size() > 1) & m_might_drag) {
+ if ((selection().size() > 1) & m_might_drag) {
selection().set(index);
m_might_drag = false;
}
@@ -170,7 +170,7 @@ void GItemView::mousemove_event(GMouseEvent& event)
for (auto item_index : items_intersecting_rect(rubber_band_rect)) {
selection().add(model()->index(item_index, model_column()));
}
- if(event.modifiers() & Mod_Ctrl) {
+ if (event.modifiers() & Mod_Ctrl) {
for (auto storeditem : m_rubber_band_remembered_selection) {
selection().add(storeditem);
}
diff --git a/Libraries/LibGUI/GLabel.h b/Libraries/LibGUI/GLabel.h
index df819eb895..ea120d8716 100644
--- a/Libraries/LibGUI/GLabel.h
+++ b/Libraries/LibGUI/GLabel.h
@@ -1,7 +1,7 @@
#pragma once
-#include <LibGUI/GFrame.h>
#include <LibDraw/TextAlignment.h>
+#include <LibGUI/GFrame.h>
class GraphicsBitmap;
diff --git a/Libraries/LibGUI/GMenuItem.h b/Libraries/LibGUI/GMenuItem.h
index 7fdd26d24f..ce93c3058d 100644
--- a/Libraries/LibGUI/GMenuItem.h
+++ b/Libraries/LibGUI/GMenuItem.h
@@ -1,9 +1,9 @@
#pragma once
-#include <AK/String.h>
#include <AK/Badge.h>
#include <AK/NonnullOwnPtr.h>
#include <AK/OwnPtr.h>
+#include <AK/String.h>
class GAction;
class GMenu;
diff --git a/Libraries/LibGUI/GModelEditingDelegate.h b/Libraries/LibGUI/GModelEditingDelegate.h
index 8403fead8b..317979c10b 100644
--- a/Libraries/LibGUI/GModelEditingDelegate.h
+++ b/Libraries/LibGUI/GModelEditingDelegate.h
@@ -26,7 +26,7 @@ public:
virtual GVariant value() const = 0;
virtual void set_value(const GVariant&) = 0;
- virtual void will_begin_editing() { }
+ virtual void will_begin_editing() {}
protected:
virtual RefPtr<GWidget> create_widget() = 0;
diff --git a/Libraries/LibGUI/GModelSelection.h b/Libraries/LibGUI/GModelSelection.h
index 6b885741a5..e2b5ad2fbc 100644
--- a/Libraries/LibGUI/GModelSelection.h
+++ b/Libraries/LibGUI/GModelSelection.h
@@ -50,7 +50,7 @@ public:
for (auto& index : m_indexes)
selected_indexes.append(index);
-
+
return selected_indexes;
}
diff --git a/Libraries/LibGUI/GUndoStack.cpp b/Libraries/LibGUI/GUndoStack.cpp
index 670ee16111..0057d06a1e 100644
--- a/Libraries/LibGUI/GUndoStack.cpp
+++ b/Libraries/LibGUI/GUndoStack.cpp
@@ -66,7 +66,6 @@ void GUndoStack::push(NonnullOwnPtr<GCommand>&& command)
m_stack[0].m_undo_vector.prepend(move(command));
}
-
void GUndoStack::finalize_current_combo()
{
if (m_stack.is_empty())