aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/reguser
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/reguser')
-rw-r--r--src/modules/reguser/dialog.cpp18
-rw-r--r--src/modules/reguser/dialog.h8
-rw-r--r--src/modules/reguser/edituser.cpp20
-rw-r--r--src/modules/reguser/edituser.h8
-rw-r--r--src/modules/reguser/libkvireguser.cpp20
-rw-r--r--src/modules/reguser/wizard.cpp24
-rw-r--r--src/modules/reguser/wizard.h6
7 files changed, 52 insertions, 52 deletions
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 5cd4882c0..4d2325d02 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -4,7 +4,7 @@
// Creation date : Tue Dec 26 2000 12:24:12 CEST by Szymon Stefanek
//
// This file is part of the KVirc irc client distribution
-// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@ -28,21 +28,21 @@
#include "wizard.h"
#include "dialog.h"
-#include "kvi_regusersdb.h"
-#include "kvi_locale.h"
-#include "kvi_ircmask.h"
+#include "KviRegisteredUserDataBase.h"
+#include "KviLocale.h"
+#include "KviIrcMask.h"
#include "kvi_debug.h"
#include "kvi_iconmanager.h"
#include "kvi_app.h"
#include "kvi_options.h"
-#include "kvi_file.h"
+#include "KviFile.h"
#include "kvi_filedialog.h"
#include "kvi_msgbox.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
#include "kvi_settings.h"
-#include "kvi_stringconversion.h"
+#include "KviStringConversion.h"
#include "kvi_options.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
#include "kvi_tal_hbox.h"
#include "kvi_tal_vbox.h"
@@ -817,7 +817,7 @@ void KviRegisteredUsersDialog::selectAllClicked()
void KviRegisteredUsersDialog::importClicked()
{
- //KviStr buffer;
+ //KviCString buffer;
QString buffer;
if(!KviFileDialog::askForOpenFileName(buffer,__tr2qs_ctx("Choose a Filename - KVIrc","register")))return;
diff --git a/src/modules/reguser/dialog.h b/src/modules/reguser/dialog.h
index 21c78f422..5e3cb8d47 100644
--- a/src/modules/reguser/dialog.h
+++ b/src/modules/reguser/dialog.h
@@ -6,7 +6,7 @@
// Creation date : Sun Dec 24 2000 15:16:17 CEST by Szymon Stefanek
//
// This file is part of the KVirc irc client distribution
-// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@ -24,10 +24,10 @@
//
//=============================================================================
-#include "kvi_string.h"
-#include "kvi_regusersdb.h"
+#include "KviCString.h"
+#include "KviRegisteredUserDataBase.h"
#include "kvi_selectors.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
#include <QTreeWidget>
#include "kvi_tal_listwidget.h"
#include "kvi_tal_popupmenu.h"
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index 25ee40f42..633458046 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -4,7 +4,7 @@
// Creation date : Tue Dec 26 2000 12:24:12 CEST by Szymon Stefanek
//
// This file is part of the KVirc irc client distribution
-// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@ -28,21 +28,21 @@
#include "wizard.h"
#include "dialog.h"
-#include "kvi_regusersdb.h"
-#include "kvi_locale.h"
-#include "kvi_ircmask.h"
+#include "KviRegisteredUserDataBase.h"
+#include "KviLocale.h"
+#include "KviIrcMask.h"
#include "kvi_debug.h"
#include "kvi_iconmanager.h"
#include "kvi_app.h"
#include "kvi_options.h"
-#include "kvi_file.h"
+#include "KviFile.h"
#include "kvi_filedialog.h"
#include "kvi_msgbox.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
#include "kvi_settings.h"
-#include "kvi_stringconversion.h"
+#include "KviStringConversion.h"
#include "kvi_options.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
#include "kvi_tal_hbox.h"
#include "kvi_tal_vbox.h"
@@ -283,7 +283,7 @@ void KviReguserMaskDialog::closeEvent(QCloseEvent *e)
void KviReguserMaskDialog::okClicked()
{
- KviStr szTmp = m_pNickEdit->text();
+ KviCString szTmp = m_pNickEdit->text();
if(szTmp.isEmpty())szTmp = "*";
m_pMask->setNick(szTmp.ptr());
@@ -741,7 +741,7 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked()
{
m_pPropertyDict->remove("avatar");
} else {
- KviStr szPath = m_pAvatar->path();
+ KviCString szPath = m_pAvatar->path();
if(szPath.isEmpty())m_pPropertyDict->remove("avatar");
else m_pPropertyDict->replace("avatar",new QString(szPath));
}
diff --git a/src/modules/reguser/edituser.h b/src/modules/reguser/edituser.h
index f6a3835b3..e453b9b84 100644
--- a/src/modules/reguser/edituser.h
+++ b/src/modules/reguser/edituser.h
@@ -6,7 +6,7 @@
// Creation date : Sun Dec 24 2000 15:16:17 CEST by Szymon Stefanek
//
// This file is part of the KVirc irc client distribution
-// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@ -24,10 +24,10 @@
//
//=============================================================================
-#include "kvi_string.h"
-#include "kvi_regusersdb.h"
+#include "KviCString.h"
+#include "KviRegisteredUserDataBase.h"
#include "kvi_selectors.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
#include <QTreeWidget>
#include "kvi_tal_popupmenu.h"
#include <kvi_tal_tabdialog.h>
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index 9cbd97cbe..34bc5115f 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -4,7 +4,7 @@
// Creation date : Fri Dec 01 2000 14:53:10 CEST by Szymon Stefanek
//
// This file is part of the KVirc irc client distribution
-// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@ -28,16 +28,16 @@
#include "dialog.h"
#include "kvi_module.h"
-#include "kvi_regusersdb.h"
-#include "kvi_ircuserdb.h"
+#include "KviRegisteredUserDataBase.h"
+#include "KviIrcUserDataBase.h"
#include "kvi_out.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
#include "kvi_window.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
#include "kvi_app.h"
#include "kvi_window.h"
#include "kvi_frame.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
#include <QSplitter> // FIXME: REmove this!
@@ -936,7 +936,7 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
// [module:reguser]reguser module documentation[/module]
//*/
-//static void search_reguser_list(KviRegisteredUserList * l,KviWindow * w,const char * mask,KviStr & buffer)
+//static void search_reguser_list(KviRegisteredUserList * l,KviWindow * w,const char * mask,KviCString & buffer)
//{
// for(KviRegisteredUser * u = l->first();u;u = l->next())
// {
@@ -948,11 +948,11 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
// }
//}
-//static bool reguser_module_fnc_matches(KviModule *m,KviCommand *c,KviParameterList * parms,KviStr &buffer)
+//static bool reguser_module_fnc_matches(KviModule *m,KviCommand *c,KviParameterList * parms,KviCString &buffer)
//{
// ENTER_STACK_FRAME(c,"reguser.matches");
//
-// KviStr list;
+// KviCString list;
//
// const KviPointerHashTable<const char *,KviRegisteredUserList> * d = g_pRegisteredUserDataBase->nickDict();
// KviPointerHashTableIterator<const char *,KviRegisteredUserList> it(*d);
@@ -1017,7 +1017,7 @@ static bool reguser_kvs_fnc_mask(KviKvsModuleFunctionCall * c)
KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(szName);
if(u)
{
- KviStr n = szName;
+ KviCString n = szName;
if(n.hasData() && n.isUnsignedNum())
{
KviIrcMask * m = u->maskList()->at(n.toInt());
diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp
index bb82d738e..86b888ead 100644
--- a/src/modules/reguser/wizard.cpp
+++ b/src/modules/reguser/wizard.cpp
@@ -4,7 +4,7 @@
// Creation date : Fri Jun 26 2002 21:21:21 CEST by Szymon Stefanek
//
// This file is part of the KVirc irc client distribution
-// Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@ -25,13 +25,13 @@
#include "wizard.h"
-#include "kvi_locale.h"
-#include "kvi_pointerlist.h"
+#include "KviLocale.h"
+#include "KviPointerList.h"
#include "kvi_app.h"
-#include "kvi_ircmask.h"
+#include "KviIrcMask.h"
#include "kvi_selectors.h"
-#include "kvi_pixmap.h"
-#include "kvi_regusersdb.h"
+#include "KviPixmap.h"
+#include "KviRegisteredUserDataBase.h"
#include "kvi_iconmanager.h"
#include <QDesktopWidget>
@@ -114,7 +114,7 @@ KviRegistrationWizard::KviRegistrationWizard(const QString &startMask,KviRegiste
m_pPage2Layout->addWidget(m_pLabel2,0,0,1,5);
- //KviStr szMask;
+ //KviCString szMask;
//mask.mask(szMask,11);
@@ -405,9 +405,9 @@ void KviRegistrationWizard::showEvent(QShowEvent *e)
void KviRegistrationWizard::maskChanged(const QString &)
{
- KviStr tmp1 = m_pNicknameEdit1->text();
- KviStr tmp2 = m_pUsernameEdit1->text();
- KviStr tmp3 = m_pHostEdit1->text();
+ KviCString tmp1 = m_pNicknameEdit1->text();
+ KviCString tmp2 = m_pUsernameEdit1->text();
+ KviCString tmp3 = m_pHostEdit1->text();
if(tmp1.isEmpty())
{
@@ -427,7 +427,7 @@ void KviRegistrationWizard::maskChanged(const QString &)
return;
}
- KviStr mask(KviStr::Format,"%s!%s@%s",tmp1.ptr(),tmp2.ptr(),tmp3.ptr());
+ KviCString mask(KviCString::Format,"%s!%s@%s",tmp1.ptr(),tmp2.ptr(),tmp3.ptr());
//KviIrcMask m(mask.ptr());
@@ -447,7 +447,7 @@ void KviRegistrationWizard::notifyNickChanged(const QString &)
if(!bYes)
{
// we need at least one nickname then :)
- KviStr tmp = m_pNotifyNickEdit1->text();
+ KviCString tmp = m_pNotifyNickEdit1->text();
if(tmp.hasData())
{
bYes = true;
diff --git a/src/modules/reguser/wizard.h b/src/modules/reguser/wizard.h
index cb630351d..27481475d 100644
--- a/src/modules/reguser/wizard.h
+++ b/src/modules/reguser/wizard.h
@@ -6,7 +6,7 @@
// Creation date : Fri Jun 26 2002 21:21:21 CEST by Szymon Stefanek
//
// This file is part of the KVirc irc client distribution
-// Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@ -24,7 +24,7 @@
//
//=============================================================================
-#include "kvi_string.h"
+#include "KviCString.h"
#include "kvi_tal_wizard.h"
#include <QCheckBox>
@@ -48,7 +48,7 @@ public:
KviRegisteredUserDataBase * m_pDb;
- KviStr m_szStartMask;
+ KviCString m_szStartMask;
bool m_bModal;