SharedFilesWindow: Remove unused variables and some code cleanup

3 files changed, 28 insertions, 35 deletions

diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.cpp b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
index 8389607f9..27dffb0e5 100644
--- a/src/modules/sharedfileswindow/SharedFilesWindow.cpp
+++ b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
@@ -25,24 +25,25 @@
 #include "SharedFilesWindow.h"
 
 #include "kvi_debug.h"
+#include "kvi_out.h"
+#include "KviFileDialog.h"
 #include "KviIconManager.h"
+#include "KviInput.h"
 #include "KviIrcView.h"
-#include "kvi_out.h"
-#include "KviOptions.h"
 #include "KviLocale.h"
-#include "KviThemedLabel.h"
-#include "KviInput.h"
-#include "KviFileDialog.h"
+#include "KviOptions.h"
 #include "KviTalHBox.h"
 #include "KviTalVBox.h"
+#include "KviThemedLabel.h"
 
+#include <QCheckBox>
 #include <QDateTimeEdit>
+#include <QFileInfo>
 #include <QLabel>
-#include <QLineEdit>
-#include <QPushButton>
 #include <QLayout>
+#include <QLineEdit>
 #include <QMessageBox>
-#include <QFileInfo>
+#include <QPushButton>
 
 extern SharedFilesWindow * g_pSharedFilesWindow;
 extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
@@ -132,7 +133,7 @@ void SharedFileEditDialog::browse()
 	m_pFilePathEdit->setText(szBuf);
 }
 
-KviSharedFile * SharedFileEditDialog::getResult()
+KviSharedFile * SharedFileEditDialog::getResult() const
 {
 	QString szName = m_pShareNameEdit->text();
 	QString szPath = m_pFilePathEdit->text();
diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.h b/src/modules/sharedfileswindow/SharedFilesWindow.h
index a9defece4..fd9fd6dee 100644
--- a/src/modules/sharedfileswindow/SharedFilesWindow.h
+++ b/src/modules/sharedfileswindow/SharedFilesWindow.h
@@ -24,19 +24,19 @@
 //
 //=============================================================================
 
-#include "KviWindow.h"
+#include "KviConsoleWindow.h"
 #include "KviCString.h"
 #include "KviIrcServerParser.h"
-#include "KviConsoleWindow.h"
 #include "KviModuleExtension.h"
 #include "KviSharedFilesManager.h"
 #include "KviThemedTreeWidget.h"
+#include "KviWindow.h"
 
 #include <QDialog>
-#include <QCheckBox>
 
-class QGridLayout;
+class QCheckBox;
 class QDateTimeEdit;
+class QGridLayout;
 class QLabel;
 class QLineEdit;
 class QPushButton;
@@ -45,12 +45,12 @@ class SharedFilesTreeWidgetItem : public QTreeWidgetItem
 {
 public:
 	SharedFilesTreeWidgetItem(QTreeWidget * lv, KviSharedFile * f);
-	~SharedFilesTreeWidgetItem();
+	virtual ~SharedFilesTreeWidgetItem();
 
 protected:
 	KviSharedFile * m_pSharedFilePointer; // THIS IS READ ONLY!
 public:
-	KviSharedFile * readOnlySharedFilePointer() { return m_pSharedFilePointer; };
+	KviSharedFile * readOnlySharedFilePointer() const { return m_pSharedFilePointer; }
 };
 
 class SharedFileEditDialog : public QDialog
@@ -58,7 +58,7 @@ class SharedFileEditDialog : public QDialog
 	Q_OBJECT
 public:
 	SharedFileEditDialog(QWidget * par, KviSharedFile * f = 0);
-	~SharedFileEditDialog();
+	virtual ~SharedFileEditDialog();
 
 	QDateTimeEdit * m_pExpireDateTimeEdit;
 	QLineEdit * m_pFilePathEdit;
@@ -68,7 +68,7 @@ public:
 	QCheckBox * m_pExpireCheckBox;
 
 public:
-	KviSharedFile * getResult();
+	KviSharedFile * getResult() const;
 protected slots:
 	void okClicked();
 	void browse();
@@ -80,11 +80,9 @@ class SharedFilesWindow : public KviWindow
 	Q_OBJECT
 public:
 	SharedFilesWindow();
-	~SharedFilesWindow();
+	virtual ~SharedFilesWindow();
 
 protected:
-	QSplitter * m_pVertSplitter;
-
 	KviThemedTreeWidget * m_pTreeWidget;
 
 	QPushButton * m_pRemoveButton;
@@ -95,13 +93,13 @@ public: // Methods
 	virtual void die();
 
 protected:
-	virtual QPixmap * myIconPtr();
-	virtual void fillCaptionBuffers();
-	virtual void resizeEvent(QResizeEvent * e);
-	virtual void getBaseLogFileName(QString & buffer);
+	QPixmap * myIconPtr() override;
+	void fillCaptionBuffers() override;
+	void resizeEvent(QResizeEvent * e) override;
+	void getBaseLogFileName(QString & buffer) override;
 
 public:
-	virtual QSize sizeHint() const;
+	QSize sizeHint() const override;
 protected slots:
 	void fillFileView();
 	void sharedFileAdded(KviSharedFile * f);
diff --git a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
index c471e1db3..8aa7af9c9 100644
--- a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
@@ -25,12 +25,10 @@
 
 #include "KviModule.h"
 #include "KviApplication.h"
+#include "KviIconManager.h"
+#include "KviLocale.h"
 #include "KviMainWindow.h"
 #include "KviWindow.h"
-#include "KviLocale.h"
-#include "KviIconManager.h"
-
-#include <QSplitter>
 
 #define KVI_SHARED_FILES_WINDOW_EXTENSION_NAME "Shared files window extension"
 
@@ -57,19 +55,15 @@ SharedFilesWindow * g_pSharedFilesWindow = nullptr;
 
 static bool sharedfileswindow_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
-	QString dummy;
-	bool bCreateMinimized = c->hasSwitch('m', "minimized");
-	bool bNoRaise = c->hasSwitch('n', "noraise");
-
 	if(!g_pSharedFilesWindow)
 	{
+		bool bCreateMinimized = c->hasSwitch('m', "minimized");
 		g_pSharedFilesWindow = new SharedFilesWindow();
 		g_pMainWindow->addWindow(g_pSharedFilesWindow, !bCreateMinimized);
-		//if(bCreateMinimized)g_pSharedFilesWindow->minimize();
 		return true;
 	}
 
-	if(!bNoRaise)
+	if(!c->hasSwitch('n', "noraise"))
 		g_pSharedFilesWindow->delayedAutoRaise();
 	return true;
 }