summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/QtUI')
-rw-r--r--Swift/QtUI/QtHistoryWindow.cpp17
-rw-r--r--Swift/QtUI/QtHistoryWindow.h10
-rw-r--r--Swift/QtUI/QtUIFactory.cpp2
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 {