Swiftdiff options
| author | Catalin Badea <catalin.badea392@gmail.com> | 2012-06-04 12:00:47 (GMT) |
|---|---|---|
| committer | Cătălin Badea <catalin.badea392@gmail.com> | 2012-08-11 15:45:27 (GMT) |
| commit | ab658eccab4955e338db8f42accd847fd6a9c106 (patch) | |
| tree | b9f796c517c6187925aeaf1b20901ee4f9ed401f /Swift/QtUI | |
| parent | c09901d69a0b606d8f16a3496c0c4f24c3c7aa1b (diff) | |
| download | swift-contrib-ab658eccab4955e338db8f42accd847fd6a9c106.zip swift-contrib-ab658eccab4955e338db8f42accd847fd6a9c106.tar.bz2 | |
Disconnect history controller from the event stream. Fixed coding style
Diffstat (limited to 'Swift/QtUI')
| -rw-r--r-- | Swift/QtUI/QtHistoryWindow.cpp | 17 | ||||
| -rw-r--r-- | Swift/QtUI/QtHistoryWindow.h | 10 | ||||
| -rw-r--r-- | Swift/QtUI/QtUIFactory.cpp | 2 |
3 files changed, 10 insertions, 19 deletions
diff --git a/Swift/QtUI/QtHistoryWindow.cpp b/Swift/QtUI/QtHistoryWindow.cpp index a54fa03..6868ca5 100644 --- a/Swift/QtUI/QtHistoryWindow.cpp +++ b/Swift/QtUI/QtHistoryWindow.cpp @@ -1,11 +1,11 @@ /* * Copyright (c) 2012 Catalin Badea - * Licensed under the GNU General Public License v3. - * See Documentation/Licenses/GPLv3.txt for more information. + * Licensed under the simplified BSD license. + * See Documentation/Licenses/BSD-simplified.txt for more information. */ -#include "QtHistoryWindow.h" -#include "QtTabbable.h" +#include <QtHistoryWindow.h> +#include <QtTabbable.h> #include <QCloseEvent> #include <QTextEdit> @@ -14,7 +14,7 @@ #include <QScrollBar> #include <QCheckBox> -#include "QtSwiftUtil.h" +#include <QtSwiftUtil.h> #include <string> namespace Swift { @@ -35,16 +35,9 @@ QtHistoryWindow::QtHistoryWindow() { buttonLayout->addStretch(); setWindowTitle(tr("History")); - emit titleUpdated(); } QtHistoryWindow::~QtHistoryWindow() { - // do nothing -} - -void QtHistoryWindow::show() { - QWidget::show(); - emit windowOpening(); } void QtHistoryWindow::activate() { diff --git a/Swift/QtUI/QtHistoryWindow.h b/Swift/QtUI/QtHistoryWindow.h index f2e5cc0..eacba8d 100644 --- a/Swift/QtUI/QtHistoryWindow.h +++ b/Swift/QtUI/QtHistoryWindow.h @@ -1,13 +1,13 @@ /* * Copyright (c) 2012 Catalin Badea - * Licensed under the GNU General Public License v3. - * See Documentation/Licenses/GPLv3.txt for more information. + * Licensed under the simplified BSD license. + * See Documentation/Licenses/BSD-simplified.txt for more information. */ #pragma once -#include "Swift/Controllers/UIInterfaces/HistoryWindow.h" -#include "QtTabbable.h" +#include <Swift/Controllers/UIInterfaces/HistoryWindow.h> +#include <QtTabbable.h> class QTextEdit; class QCheckBox; @@ -20,8 +20,6 @@ namespace Swift { public: QtHistoryWindow(); ~QtHistoryWindow(); - - void show(); void activate(); private: diff --git a/Swift/QtUI/QtUIFactory.cpp b/Swift/QtUI/QtUIFactory.cpp index e58bbbe..03a2929 100644 --- a/Swift/QtUI/QtUIFactory.cpp +++ b/Swift/QtUI/QtUIFactory.cpp @@ -9,7 +9,6 @@ #include <QSplitter> #include "QtXMLConsoleWidget.h" -#include "QtHistoryWindow.h" #include "QtChatTabs.h" #include "QtMainWindow.h" #include "QtLoginWindow.h" @@ -28,6 +27,7 @@ #include "QtFileTransferListWidget.h" #include <Swift/Controllers/Settings/SettingsProviderHierachy.h> #include <Swift/QtUI/QtUISettingConstants.h> +#include <QtHistoryWindow.h> namespace Swift { |