diff options
| author |  Elvio Basello | 2011-01-05 22:54:21 +0000 |
|---|---|---|
| committer | Elvio Basello | 2011-01-05 22:54:21 +0000 |
| commit | 12fba74234ec39059b1043c2febcc983fd7cbaf6 (patch) | |
| tree | ae5f7f58c546feac36742c2b12ae1a36cc24d5a1 /src/modules/window/UserWindow.cpp | |
| parent | Another fix for the options instance generation script (diff) | |
| download | KVIrc-12fba74234ec39059b1043c2febcc983fd7cbaf6.tar.gz KVIrc-12fba74234ec39059b1043c2febcc983fd7cbaf6.tar.bz2 KVIrc-12fba74234ec39059b1043c2febcc983fd7cbaf6.zip | |
reworked icon stuff
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5301 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/window/UserWindow.cpp')
| -rw-r--r-- | src/modules/window/UserWindow.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/window/UserWindow.cpp b/src/modules/window/UserWindow.cpp index 72962304e..72aef3925 100644 --- a/src/modules/window/UserWindow.cpp +++ b/src/modules/window/UserWindow.cpp @@ -23,8 +23,6 @@ //============================================================================= #include "UserWindow.h" - -#include "KviIconManager.h" #include "KviInput.h" #include "KviIrcView.h" #include "KviMainWindow.h" @@ -33,14 +31,14 @@ extern KviPointerList<UserWindow> * g_pUserWindowList; -UserWindow::UserWindow(KviMainWindow * pFrm,const char * name,int iIcon,KviConsoleWindow * pConsole,int iCreationFlags) -: KviWindow(KVI_WINDOW_TYPE_USERWINDOW,pFrm,name,pConsole) +UserWindow::UserWindow(KviMainWindow * pFrm, const char * pcName, int iIcon, KviConsoleWindow * pConsole, int iCreationFlags) +: KviWindow(KVI_WINDOW_TYPE_USERWINDOW,pFrm,pcName,pConsole) { g_pUserWindowList->append(this); m_iIcon = iIcon; - m_szPlainTextCaption = name; + m_szPlainTextCaption = pcName; fillSingleColorCaptionBuffers(m_szPlainTextCaption); // Register ourselves @@ -63,12 +61,14 @@ UserWindow::UserWindow(KviMainWindow * pFrm,const char * name,int iIcon,KviConso m_pInput = 0; // applyOptions(); - if(context())context()->registerContextWindow(this); + if(context()) + context()->registerContextWindow(this); } UserWindow::~UserWindow() { - if(context())context()->unregisterContextWindow(this); + if(context()) + context()->unregisterContextWindow(this); g_pUserWindowList->removeRef(this); } @@ -94,7 +94,7 @@ void UserWindow::fillCaptionBuffers() // nothing here } -void UserWindow::setWindowTitleStrings(const QString &szPlainText) +void UserWindow::setWindowTitleStrings(const QString & szPlainText) { m_szPlainTextCaption = szPlainText; updateCaption(); |