aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/window
diff options
context:
space:
mode:
authorGravatar Szymon Tomasz Stefanek2011-01-01 20:19:56 +0000
committerGravatar Szymon Tomasz Stefanek2011-01-01 20:19:56 +0000
commitc601b5a27f74b16158adafe429faefbe573e64a2 (patch)
treea3cde3206a45628f8ac86e8dfbdab70b20c3a831 /src/modules/window
parentprobable compilation fix for rijndaled/crypto++ (diff)
downloadKVIrc-c601b5a27f74b16158adafe429faefbe573e64a2.tar.gz
KVIrc-c601b5a27f74b16158adafe429faefbe573e64a2.tar.bz2
KVIrc-c601b5a27f74b16158adafe429faefbe573e64a2.zip
The big rename for modules. Still some details remaining.
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5284 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/window')
-rw-r--r--src/modules/window/CMakeLists.txt4
-rw-r--r--src/modules/window/UserWindow.cpp (renamed from src/modules/window/userwindow.cpp)18
-rw-r--r--src/modules/window/UserWindow.h (renamed from src/modules/window/userwindow.h)8
-rw-r--r--src/modules/window/libkviwindow.cpp14
4 files changed, 22 insertions, 22 deletions
diff --git a/src/modules/window/CMakeLists.txt b/src/modules/window/CMakeLists.txt
index 6bb949398..682fae253 100644
--- a/src/modules/window/CMakeLists.txt
+++ b/src/modules/window/CMakeLists.txt
@@ -1,12 +1,12 @@
# CMakeLists for src/modules/window
SET(kviwindow_MOC_HDRS
- userwindow.h
+ UserWindow.h
)
SET(kviwindow_SRCS
libkviwindow.cpp
- userwindow.cpp
+ UserWindow.cpp
)
# After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/window/userwindow.cpp b/src/modules/window/UserWindow.cpp
index 74cade69a..72962304e 100644
--- a/src/modules/window/userwindow.cpp
+++ b/src/modules/window/UserWindow.cpp
@@ -1,6 +1,6 @@
//=============================================================================
//
-// File : userwindow.cpp
+// File : UserWindow.cpp
// Created on Mon 30 Aug 2004 15:00:52 by Szymon Stefanek
//
// This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
//
//=============================================================================
-#include "userwindow.h"
+#include "UserWindow.h"
#include "KviIconManager.h"
#include "KviInput.h"
@@ -30,10 +30,10 @@
#include "KviMainWindow.h"
#include "KviConsoleWindow.h"
-extern KviPointerList<KviUserWindow> * g_pUserWindowList;
+extern KviPointerList<UserWindow> * g_pUserWindowList;
-KviUserWindow::KviUserWindow(KviMainWindow * pFrm,const char * name,int iIcon,KviConsoleWindow * pConsole,int iCreationFlags)
+UserWindow::UserWindow(KviMainWindow * pFrm,const char * name,int iIcon,KviConsoleWindow * pConsole,int iCreationFlags)
: KviWindow(KVI_WINDOW_TYPE_USERWINDOW,pFrm,name,pConsole)
{
g_pUserWindowList->append(this);
@@ -66,18 +66,18 @@ KviUserWindow::KviUserWindow(KviMainWindow * pFrm,const char * name,int iIcon,Kv
if(context())context()->registerContextWindow(this);
}
-KviUserWindow::~KviUserWindow()
+UserWindow::~UserWindow()
{
if(context())context()->unregisterContextWindow(this);
g_pUserWindowList->removeRef(this);
}
-QPixmap * KviUserWindow::myIconPtr()
+QPixmap * UserWindow::myIconPtr()
{
return g_pIconManager->getSmallIcon(m_iIcon);
}
-void KviUserWindow::resizeEvent(QResizeEvent *)
+void UserWindow::resizeEvent(QResizeEvent *)
{
if(m_pInput)
{
@@ -89,12 +89,12 @@ void KviUserWindow::resizeEvent(QResizeEvent *)
}
}
-void KviUserWindow::fillCaptionBuffers()
+void UserWindow::fillCaptionBuffers()
{
// nothing here
}
-void KviUserWindow::setWindowTitleStrings(const QString &szPlainText)
+void UserWindow::setWindowTitleStrings(const QString &szPlainText)
{
m_szPlainTextCaption = szPlainText;
updateCaption();
diff --git a/src/modules/window/userwindow.h b/src/modules/window/UserWindow.h
index 06664bcc1..6e0e0e392 100644
--- a/src/modules/window/userwindow.h
+++ b/src/modules/window/UserWindow.h
@@ -2,7 +2,7 @@
#define _USERWINDOW_H_
//=============================================================================
//
-// File : userwindow.h
+// File : UserWindow.h
// Created on Mon 30 Aug 2004 15:00:52 by Szymon Stefanek
//
// This file is part of the KVIrc IRC client distribution
@@ -27,14 +27,14 @@
#include "kvi_settings.h"
#include "KviWindow.h"
-class KviUserWindow : public KviWindow
+class UserWindow : public KviWindow
{
Q_OBJECT
public:
enum CreationFlags { HasInput = 1 };
public:
- KviUserWindow(KviMainWindow * pFrm,const char * name,int iIcon,KviConsoleWindow * pConsole = 0,int iCreationFlags = 0);
- ~KviUserWindow();
+ UserWindow(KviMainWindow * pFrm,const char * name,int iIcon,KviConsoleWindow * pConsole = 0,int iCreationFlags = 0);
+ ~UserWindow();
protected:
int m_iIcon;
protected:
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index 690a6db3f..edb12774a 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -22,7 +22,7 @@
//
//=============================================================================
-#include "userwindow.h"
+#include "UserWindow.h"
#include "KviModule.h"
#include "KviConsoleWindow.h"
@@ -55,7 +55,7 @@
// KviApplication.cpp
extern KVIRC_API KviPointerHashTable<QString,KviWindow> * g_pGlobalWindowDict;
-KviPointerList<KviUserWindow> * g_pUserWindowList = 0;
+KviPointerList<UserWindow> * g_pUserWindowList = 0;
// $window.caption $window.x $window.y $window.width $window.height $window.isActive $window.type
// $window.input.text $window.input.cursorpos $window.input.textlen
@@ -1154,7 +1154,7 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c)
iIcon = iIcon % KVI_NUM_SMALL_ICONS;
int iFlags = 0;
- if(szFlags.contains('i'))iFlags |= KviUserWindow::HasInput;
+ if(szFlags.contains('i'))iFlags |= UserWindow::HasInput;
KviConsoleWindow * pConsole = 0;
if(c->parameterList()->count() >= 3)
@@ -1166,7 +1166,7 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c)
}
}
- KviUserWindow * wnd = new KviUserWindow(
+ UserWindow * wnd = new UserWindow(
c->window()->frame(),
szCaption.toUtf8().data(),
iIcon,
@@ -1220,7 +1220,7 @@ static bool window_kvs_cmd_setWindowTitle(KviKvsModuleCommandCall * c)
if(pWnd->type() == KVI_WINDOW_TYPE_USERWINDOW)
{
- ((KviUserWindow *)pWnd)->setWindowTitleStrings(szPlain);
+ ((UserWindow *)pWnd)->setWindowTitleStrings(szPlain);
} else {
//store the window title (needed for functions that search windows by their captions)
((KviWindow *)pWnd)->setFixedCaption(szPlain);
@@ -1599,7 +1599,7 @@ static bool window_kvs_cmd_setCryptEngine(KviKvsModuleCommandCall * c)
static bool window_module_init(KviModule *m)
{
- g_pUserWindowList = new KviPointerList<KviUserWindow>();
+ g_pUserWindowList = new KviPointerList<UserWindow>();
g_pUserWindowList->setAutoDelete(false);
KVSM_REGISTER_FUNCTION(m,"activityTemperature",window_kvs_fnc_activityTemperature);
@@ -1665,7 +1665,7 @@ static bool window_module_init(KviModule *m)
static bool window_module_cleanup(KviModule *)
{
- while(KviUserWindow * w = g_pUserWindowList->first())
+ while(UserWindow * w = g_pUserWindowList->first())
w->close();
delete g_pUserWindowList;
return true;