4 files changed, 33 insertions, 33 deletions

diff --git a/src/modules/channelsjoin/CMakeLists.txt b/src/modules/channelsjoin/CMakeLists.txt
index 06805bacb..1abae2f9e 100644
--- a/src/modules/channelsjoin/CMakeLists.txt
+++ b/src/modules/channelsjoin/CMakeLists.txt
@@ -2,10 +2,10 @@
 
 SET(kvichannelsjoin_SRCS
 	libkvichannelsjoin.cpp
-	channelsjoinwindow.cpp
+	ChannelsJoinDialog.cpp
 )
 SET(kvichannelsjoin_MOC_HDRS
-	channelsjoinwindow.h
+	ChannelsJoinDialog.h
 )
 # After this call, files will be moc'ed to moc_kvi_*.cpp
 QT4_WRAP_CPP(kvichannelsjoin_MOC_SRCS ${kvichannelsjoin_MOC_HDRS})
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/ChannelsJoinDialog.cpp
index 2372e885c..65e307028 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/ChannelsJoinDialog.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : channelsjoinwindow.cpp
+//   File : ChannelsJoinDialog.cpp
 //   Creation date : Thu Nov 6 2001 12:41:18 by Juanjo �varez
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "channelsjoinwindow.h"
+#include "ChannelsJoinDialog.h"
 
 #include "KviLocale.h"
 #include "KviOptions.h"
@@ -48,13 +48,13 @@
 #include <QCheckBox>
 
 
-extern KviChannelsJoinWindow * g_pChannelsWindow;
+extern ChannelsJoinDialog * g_pChannelsWindow;
 extern QRect                   g_rectChannelsJoinGeometry;
 // KviApplication.cpp
 extern KVIRC_API KviRegisteredChannelDataBase * g_pRegisteredChannelDataBase;
 
 
-KviChannelsJoinWindow::KviChannelsJoinWindow(QWidget * par, const char * name)
+ChannelsJoinDialog::ChannelsJoinDialog(QWidget * par, const char * name)
 : QDialog(par)
 {
 	setObjectName(name);
@@ -145,7 +145,7 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(QWidget * par, const char * name)
 	enableJoin();
 }
 
-KviChannelsJoinWindow::~KviChannelsJoinWindow()
+ChannelsJoinDialog::~ChannelsJoinDialog()
 {
 	KVI_OPTION_BOOL(KviOption_boolShowChannelsJoinOnIrc) = m_pShowAtStartupCheck->isChecked();
 
@@ -153,13 +153,13 @@ KviChannelsJoinWindow::~KviChannelsJoinWindow()
 	g_pChannelsWindow = 0;
 }
 
-void KviChannelsJoinWindow::setConsole(KviConsoleWindow  * pConsole)
+void ChannelsJoinDialog::setConsole(KviConsoleWindow  * pConsole)
 {
 	m_pConsole = pConsole;
 	fillListView();
 }
 
-void KviChannelsJoinWindow::fillListView()
+void ChannelsJoinDialog::fillListView()
 {
 	m_pTreeWidget->clear();
 
@@ -240,7 +240,7 @@ void KviChannelsJoinWindow::fillListView()
 	}
 }
 
-void KviChannelsJoinWindow::itemClicked(QTreeWidgetItem * it, int)
+void ChannelsJoinDialog::itemClicked(QTreeWidgetItem * it, int)
 {
 	if(!it)
 		return;
@@ -252,7 +252,7 @@ void KviChannelsJoinWindow::itemClicked(QTreeWidgetItem * it, int)
 	enableJoin();
 }
 
-void KviChannelsJoinWindow::itemDoubleClicked(QTreeWidgetItem * it, int)
+void ChannelsJoinDialog::itemDoubleClicked(QTreeWidgetItem * it, int)
 {
 	if(!it)
 		return;
@@ -265,12 +265,12 @@ void KviChannelsJoinWindow::itemDoubleClicked(QTreeWidgetItem * it, int)
 	joinClicked();
 }
 
-void KviChannelsJoinWindow::editTextChanged(const QString &)
+void ChannelsJoinDialog::editTextChanged(const QString &)
 {
 	enableJoin();
 }
 
-void KviChannelsJoinWindow::enableJoin()
+void ChannelsJoinDialog::enableJoin()
 {
 	QString szTmp = m_pChannelEdit->text();
 	KviConsoleWindow * c = g_pApp->topmostConnectedConsole();
@@ -291,12 +291,12 @@ void KviChannelsJoinWindow::enableJoin()
 	}
 }
 
-void KviChannelsJoinWindow::cancelClicked()
+void ChannelsJoinDialog::cancelClicked()
 {
 	delete this;
 }
 
-void KviChannelsJoinWindow::joinClicked()
+void ChannelsJoinDialog::joinClicked()
 {
 	QString szPass = m_pPass->text();
 	QString szTmp = m_pChannelEdit->text();
@@ -326,7 +326,7 @@ void KviChannelsJoinWindow::joinClicked()
 	m_pPass->setText("");
 }
 
-void KviChannelsJoinWindow::regClicked()
+void ChannelsJoinDialog::regClicked()
 {
 	QString szTmp = m_pChannelEdit->text();
 
@@ -357,7 +357,7 @@ void KviChannelsJoinWindow::regClicked()
 	}
 }
 
-void KviChannelsJoinWindow::clearClicked()
+void ChannelsJoinDialog::clearClicked()
 {
 	QString szCmd = "option stringlistRecentChannels";
 
@@ -374,20 +374,20 @@ void KviChannelsJoinWindow::clearClicked()
 }
 
 /*
-void KviChannelsJoinWindow::whoClicked()
+void ChannelsJoinDialog::whoClicked()
 {
 	KviCString tmp = m_pChannelEdit->text();
 	if(!tmp.isEmpty())doCmd("who", tmp.ptr());
 }
 
-void KviChannelsJoinWindow::namesClicked()
+void ChannelsJoinDialog::namesClicked()
 {
 	KviCString tmp = m_pChannelEdit->text();
 	//FIXME: I must be a nice guy and implement /names in the core...
 	if(!tmp.isEmpty())doCmd("raw names", tmp.ptr());
 }
 
-void KviChannelsJoinWindow::itemDoubleClicked(KviTalListBoxItem * it)
+void ChannelsJoinDialog::itemDoubleClicked(KviTalListBoxItem * it)
 {
 	if (it == 0)return;
 	KviCString tmp = it->text();
@@ -397,17 +397,17 @@ void KviChannelsJoinWindow::itemDoubleClicked(KviTalListBoxItem * it)
 }
 */
 
-void KviChannelsJoinWindow::editReturnPressed()
+void ChannelsJoinDialog::editReturnPressed()
 {
 	joinClicked();
 }
 
-void KviChannelsJoinWindow::closeEvent(QCloseEvent * e)
+void ChannelsJoinDialog::closeEvent(QCloseEvent * e)
 {
 	e->ignore();
 	delete this;
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_channelsjoinwindow.moc"
+#include "m_ChannelsJoinDialog.moc"
 #endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/channelsjoin/channelsjoinwindow.h b/src/modules/channelsjoin/ChannelsJoinDialog.h
index ee819f4cd..b4b64145e 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.h
+++ b/src/modules/channelsjoin/ChannelsJoinDialog.h
@@ -2,7 +2,7 @@
 #define _CHANNELSJOIN_H_
 //=============================================================================
 //
-//   File : channelsjoinwindow.h
+//   File : ChannelsJoinDialog.h
 //   Creation date : Thu Nov 06 2001 12:30:25 CEST by Juan Alvarez
 //
 //   This file is part of the KVIrc irc client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file channelsjoinwindow.h
+* \file ChannelsJoinDialog.h
 * \author Juan Alvarez
 * \brief Channels join window
 */
@@ -43,10 +43,10 @@ class KviConsoleWindow;
 class KviTalGroupBox;
 
 /**
-* \class KviChannelsJoinWindow
+* \class ChannelsJoinDialog
 * \brief Channels join window class
 */
-class KviChannelsJoinWindow : public QDialog
+class ChannelsJoinDialog : public QDialog
 {
 	Q_OBJECT
 public:
@@ -54,14 +54,14 @@ public:
 	* \brief Constructs the channels join window
 	* \param par The parent widget
 	* \param name The name of the window
-	* \return KviChannelsJoinWindow
+	* \return ChannelsJoinDialog
 	*/
-	KviChannelsJoinWindow(QWidget * par, const char * name);
+	ChannelsJoinDialog(QWidget * par, const char * name);
 
 	/**
 	* \brief Destroys the channels join window
 	*/
-	~KviChannelsJoinWindow();
+	~ChannelsJoinDialog();
 protected:
 	QLineEdit        * m_pChannelEdit;
 	QTreeWidget * m_pTreeWidget;
diff --git a/src/modules/channelsjoin/libkvichannelsjoin.cpp b/src/modules/channelsjoin/libkvichannelsjoin.cpp
index 4f602a2e3..a96c3dc86 100644
--- a/src/modules/channelsjoin/libkvichannelsjoin.cpp
+++ b/src/modules/channelsjoin/libkvichannelsjoin.cpp
@@ -22,7 +22,7 @@
 //   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 //=============================================================================
-#include "channelsjoinwindow.h"
+#include "ChannelsJoinDialog.h"
 
 #include "KviModule.h"
 #include "KviWindow.h"
@@ -32,7 +32,7 @@
 
 #include <QSplitter>
 
-KviChannelsJoinWindow * g_pChannelsWindow = 0;
+ChannelsJoinDialog * g_pChannelsWindow = 0;
 QRect                   g_rectChannelsJoinGeometry;
 
 /*
@@ -53,7 +53,7 @@ QRect                   g_rectChannelsJoinGeometry;
 
 static bool channelsjoin_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
-	if(!g_pChannelsWindow)g_pChannelsWindow = new KviChannelsJoinWindow(c->window()->frame(),"channelsjoin");
+	if(!g_pChannelsWindow)g_pChannelsWindow = new ChannelsJoinDialog(c->window()->frame(),"channelsjoin");
 
 	g_pChannelsWindow->setConsole(c->window()->console());