1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00

Updated coding style

This commit is contained in:
nowrep 2012-08-31 15:19:07 +02:00
parent d1d837616a
commit cf2c28cfdb
17 changed files with 31 additions and 12 deletions

View File

@ -63,6 +63,7 @@
#include "speeddial.h"
#include "qtwin.h"
#include <QKeyEvent>
#include <QSplitter>
#include <QStatusBar>
#include <QMenuBar>
@ -1481,7 +1482,7 @@ void QupZilla::fullScreen(bool make)
m_tabWidget->getTabBar()->hide();
#ifdef Q_WS_WIN
if (m_usingTransparentBackground) {
QtWin::extendFrameIntoClientArea(this, 0, 0, 0 ,0);
QtWin::extendFrameIntoClientArea(this, 0, 0, 0 , 0);
QtWin::enableBlurBehindWindow(this, false);
}
#endif
@ -1828,7 +1829,7 @@ bool QupZilla::quitApp()
}
#ifdef Q_WS_WIN
bool QupZilla::winEvent(MSG *message, long *result)
bool QupZilla::winEvent(MSG* message, long* result)
{
if (message && message->message == WM_DWMCOMPOSITIONCHANGED) {
Settings settings;
@ -1862,8 +1863,7 @@ bool QupZilla::winEvent(MSG *message, long *result)
m_webInspectorDock.data()->installEventFilter(this);
}
if (isVisible())
{
if (isVisible()) {
hide();
show();
}
@ -1875,17 +1875,21 @@ bool QupZilla::winEvent(MSG *message, long *result)
void QupZilla::applyBlurToMainWindow(bool force)
{
if (!force && (m_actionShowFullScreen->isChecked() || !m_usingTransparentBackground)) return;
if (!force && (m_actionShowFullScreen->isChecked() || !m_usingTransparentBackground)) {
return;
}
int topMargin = 0;
int bottomMargin = 1;
int rightMargin = 1;
int leftMargin = 1;
if (m_sideBar) {
if (isRightToLeft())
if (isRightToLeft()) {
rightMargin += m_sideBar.data()->width() + m_mainSplitter->handleWidth();
else
}
else {
leftMargin += m_sideBar.data()->width() + m_mainSplitter->handleWidth();
}
}
topMargin += menuBar()->isVisible() ? menuBar()->height() : 0;
@ -1904,15 +1908,15 @@ void QupZilla::applyBlurToMainWindow(bool force)
if (m_webInspectorDock) {
bottomMargin += m_webInspectorDock.data()->isVisible()
? m_webInspectorDock.data()->height()
+ m_webInspectorDock.data()->style()->pixelMetric( QStyle::PM_DockWidgetSeparatorExtent)
: 0;
? m_webInspectorDock.data()->height()
+ m_webInspectorDock.data()->style()->pixelMetric(QStyle::PM_DockWidgetSeparatorExtent)
: 0;
}
QtWin::extendFrameIntoClientArea(this, leftMargin, topMargin, rightMargin, bottomMargin);
}
bool QupZilla::eventFilter(QObject *object, QEvent *event)
bool QupZilla::eventFilter(QObject* object, QEvent* event)
{
switch (event->type()) {
case QEvent::DeferredDelete:

View File

@ -203,7 +203,7 @@ private:
void disconnectObjects();
#ifdef Q_WS_WIN
bool winEvent(MSG* message, long* result);
bool eventFilter(QObject *object, QEvent *event);
bool eventFilter(QObject* object, QEvent* event);
#endif
bool m_historyMenuChanged;

View File

@ -26,6 +26,7 @@
#include "speeddial.h"
#include <QStyle>
#include <QContextMenuEvent>
BookmarkIcon::BookmarkIcon(QupZilla* mainClass, QWidget* parent)
: ClickableLabel(parent)

View File

@ -40,6 +40,7 @@
#include <QClipboard>
#include <QTimer>
#include <QContextMenuEvent>
LocationBar::LocationBar(QupZilla* mainClass)
: LineEdit(mainClass)

View File

@ -21,6 +21,7 @@
#include "globalfunctions.h"
#include <QApplication>
#include <QContextMenuEvent>
SiteIcon::SiteIcon(LocationBar* parent)
: ToolButton(parent)

View File

@ -35,6 +35,7 @@
#include <QTimer>
#include <QWebFrame>
#include <QClipboard>
#include <QContextMenuEvent>
WebSearchBar_Button::WebSearchBar_Button(QWidget* parent)
: ClickableLabel(parent)

View File

@ -24,6 +24,7 @@
#include "enhancedmenu.h"
#include <QWebFrame>
#include <QContextMenuEvent>
PopupWebView::PopupWebView(QWidget* parent)
: WebView(parent)

View File

@ -26,6 +26,7 @@
#include <QVBoxLayout>
#include <QStatusBar>
#include <QWebFrame>
#include <QCloseEvent>
PopupWindow::PopupWindow(PopupWebView* view, bool showStatusBar)
: QWidget()

View File

@ -48,6 +48,7 @@
#include <QInputDialog>
#include <QFileDialog>
#include <QMessageBox>
#include <QCloseEvent>
Preferences::Preferences(QupZilla* mainClass, QWidget* parent)
: QDialog(parent)

View File

@ -22,6 +22,7 @@
#include "ui_searchtoolbar.h"
#include "iconprovider.h"
#include <QKeyEvent>
#include <QShortcut>
SearchToolBar::SearchToolBar(QupZilla* mainClass, QWidget* parent)

View File

@ -28,6 +28,7 @@
#include "pluginproxy.h"
#include <QMenu>
#include <QMouseEvent>
#include <QApplication>
#include <QTimer>
#include <QRect>

View File

@ -35,6 +35,7 @@
#include <QStatusBar>
#include <QHostInfo>
#include <QWebFrame>
#include <QContextMenuEvent>
bool TabbedWebView::m_navigationVisible = false;

View File

@ -22,6 +22,7 @@
#include "tabbedwebview.h"
#include <QLabel>
#include <QPaintEvent>
#include <QPalette>
#include <QStylePainter>
#include <QVBoxLayout>

View File

@ -34,6 +34,7 @@
#include <QMovie>
#include <QMenu>
#include <QStackedWidget>
#include <QMouseEvent>
#include <QWebHistory>
#include <QClipboard>
#include <QFile>

View File

@ -47,6 +47,7 @@
#endif
#include <QDir>
#include <QMouseEvent>
#include <QWebHistory>
#include <QFileSystemWatcher>
#include <QTimer>

View File

@ -44,6 +44,7 @@
#include <QLabel>
#include <QTimer>
#include <QToolTip>
#include <QKeyEvent>
Qt::Key keyFromCode(int code)
{

View File

@ -27,6 +27,7 @@
#include <QWebFrame>
#include <QLabel>
#include <QToolTip>
#include <QKeyEvent>
PIM_Handler::PIM_Handler(const QString &sPath, QObject* parent)
: QObject(parent)