diff options
| author | 2012-01-01 16:43:23 +0000 | |
|---|---|---|
| committer | 2012-01-01 16:43:23 +0000 | |
| commit | b538ec203da0ad5f6ea00dc4340dac7af0169b90 (patch) | |
| tree | d6233eb4e8e2453aa9d3834135b5327fc66a3aee /src/modules/sharedfileswindow | |
| parent | refix #537 (diff) | |
| download | KVIrc-b538ec203da0ad5f6ea00dc4340dac7af0169b90.tar.gz KVIrc-b538ec203da0ad5f6ea00dc4340dac7af0169b90.tar.bz2 KVIrc-b538ec203da0ad5f6ea00dc4340dac7af0169b90.zip | |
- 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
Diffstat (limited to 'src/modules/sharedfileswindow')
| -rw-r--r-- | src/modules/sharedfileswindow/SharedFilesWindow.cpp | 4 | ||||
| -rw-r--r-- | src/modules/sharedfileswindow/SharedFilesWindow.h | 2 | ||||
| -rw-r--r-- | src/modules/sharedfileswindow/libkvisharedfileswindow.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.cpp b/src/modules/sharedfileswindow/SharedFilesWindow.cpp index b99aff87c..dee47083d 100644 --- a/src/modules/sharedfileswindow/SharedFilesWindow.cpp +++ b/src/modules/sharedfileswindow/SharedFilesWindow.cpp @@ -206,8 +206,8 @@ SharedFilesTreeWidgetItem::~SharedFilesTreeWidgetItem() } -SharedFilesWindow::SharedFilesWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm) -: KviWindow(KviWindow::Tool,lpFrm,"shared files window",0), KviModuleExtension(d) +SharedFilesWindow::SharedFilesWindow(KviModuleExtensionDescriptor * d) +: KviWindow(KviWindow::Tool,"shared files window",0), KviModuleExtension(d) { g_pSharedFilesWindow = this; m_pSplitter = new KviTalSplitter(Qt::Horizontal,this); diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.h b/src/modules/sharedfileswindow/SharedFilesWindow.h index 157d47044..0faad1be8 100644 --- a/src/modules/sharedfileswindow/SharedFilesWindow.h +++ b/src/modules/sharedfileswindow/SharedFilesWindow.h @@ -79,7 +79,7 @@ class SharedFilesWindow : public KviWindow, public KviModuleExtension friend class KviSharedFilesItem; Q_OBJECT public: - SharedFilesWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm); + SharedFilesWindow(KviModuleExtensionDescriptor * d); ~SharedFilesWindow(); protected: QSplitter * m_pVertSplitter; diff --git a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp index 4045db69b..e9bb1e74b 100644 --- a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp @@ -57,7 +57,7 @@ static KviModuleExtension * sharedfileswindow_extension_alloc(KviModuleExtension } } - g_pSharedFilesWindow = new SharedFilesWindow(s->pDescriptor,g_pMainWindow); + g_pSharedFilesWindow = new SharedFilesWindow(s->pDescriptor); g_pMainWindow->addWindow(g_pSharedFilesWindow,!bCreateMinimized); if(bCreateMinimized)g_pSharedFilesWindow->minimize(); return g_pSharedFilesWindow; |
