- Happy new year!

 - Some parts of kvirc still refered to KviMainWindow as frame(), m_pFrm, etc.. => fixed
 - Some parts of kvirc were still coded as if more than one KviMainWindows could exists => fixed, this involved changing KviWindows's ctor and removing KviWindow::frame(), thus the big change
 - The trayicon module still called itself (and was called) dockextension, and was built to support more than one KviMainWindows => renamed and fixed
 - Modified KviWindow::hasAttention so that is can be used everywhere instead of mixing different ways to check if a notificationm should popup
 - should fix #1221 and hopefully introduce little to no bugs



git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6010 17fca916-40b9-46aa-a4ea-0a15b648b75c

3 files changed, 5 insertions, 5 deletions

diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp
index 707277b5f..00a9c2aa5 100644
--- a/src/modules/filetransferwindow/FileTransferWindow.cpp
+++ b/src/modules/filetransferwindow/FileTransferWindow.cpp
@@ -236,8 +236,8 @@ QSize FileTransferItemDelegate::sizeHint(const QStyleOptionViewItem &, const QMo
 	return QSize(((FileTransferWidget*)parent())->viewport()->size().width(), 68);
 }
 
-FileTransferWindow::FileTransferWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm)
-: KviWindow(KviWindow::Tool,lpFrm,"file transfer window",0), KviModuleExtension(d)
+FileTransferWindow::FileTransferWindow(KviModuleExtensionDescriptor * d)
+: KviWindow(KviWindow::Tool,"file transfer window",0), KviModuleExtension(d)
 {
 	g_pFileTransferWindow = this;
 	setAutoFillBackground(false);
@@ -272,7 +272,7 @@ FileTransferWindow::FileTransferWindow(KviModuleExtensionDescriptor * d,KviMainW
 	QFontMetrics fm(font());
 	m_iLineSpacing = fm.lineSpacing();
 
-	m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this);
+	m_pIrcView = new KviIrcView(m_pVertSplitter,this);
 
 	m_pTableWidget->installEventFilter(this);
 
diff --git a/src/modules/filetransferwindow/FileTransferWindow.h b/src/modules/filetransferwindow/FileTransferWindow.h
index 2fcac8689..9fadaba19 100644
--- a/src/modules/filetransferwindow/FileTransferWindow.h
+++ b/src/modules/filetransferwindow/FileTransferWindow.h
@@ -91,7 +91,7 @@ class FileTransferWindow : public KviWindow, public KviModuleExtension
 	friend class FileTransferItemDelegate;
 	Q_OBJECT
 public:
-	FileTransferWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm);
+	FileTransferWindow(KviModuleExtensionDescriptor * d);
 	~FileTransferWindow();
 protected:
 	QSplitter		* m_pVertSplitter;
diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
index fde213de0..110760555 100644
--- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
+++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
@@ -55,7 +55,7 @@ static KviModuleExtension * filetransferwindow_extension_alloc(KviModuleExtensio
 			}
 		}
 
-		g_pFileTransferWindow = new FileTransferWindow(s->pDescriptor,g_pMainWindow);
+		g_pFileTransferWindow = new FileTransferWindow(s->pDescriptor);
 		g_pMainWindow->addWindow(g_pFileTransferWindow,!bCreateMinimized);
 		if(bCreateMinimized)g_pFileTransferWindow->minimize();
 		return g_pFileTransferWindow;