aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/ident
diff options
context:
space:
mode:
authorGravatar Elvio Basello2008-04-04 00:48:52 +0000
committerGravatar Elvio Basello2008-04-04 00:48:52 +0000
commit3d14bfd7b140d24b021d8c5b8b64582b64a9496a (patch)
tree2d4f9781f7a8b544d88b04c95e531f667a8e890b /src/modules/ident
parentMore fixes for cmake on Mac OS X (diff)
downloadKVIrc-3d14bfd7b140d24b021d8c5b8b64582b64a9496a.tar.gz
KVIrc-3d14bfd7b140d24b021d8c5b8b64582b64a9496a.tar.bz2
KVIrc-3d14bfd7b140d24b021d8c5b8b64582b64a9496a.zip
more code clean
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1388 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/ident')
-rw-r--r--src/modules/ident/libkviident.cpp21
-rw-r--r--src/modules/ident/libkviident.h4
2 files changed, 9 insertions, 16 deletions
diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp
index 38afdefb1..4e4265a88 100644
--- a/src/modules/ident/libkviident.cpp
+++ b/src/modules/ident/libkviident.cpp
@@ -20,17 +20,15 @@
// Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//
-#include "kvi_module.h"
-
#include "libkviident.h"
+#include "kvi_module.h"
#include "kvi_socket.h"
#include "kvi_app.h"
#include "kvi_out.h"
#include "kvi_netutils.h"
#include "kvi_locale.h"
#include "kvi_window.h"
-
#include "kvi_options.h"
#include "kvi_defaults.h"
@@ -58,15 +56,15 @@ void startIdentService()
usleep(100);
#endif
}
-// debug("Service started");
+// qDebug("Service started");
}
void stopIdentService()
{
-// debug("Stopping");
+// qDebug("Stopping");
if(g_pIdentDaemon)delete g_pIdentDaemon;
- g_pIdentDaemon = 0;
-// debug("Stopped");
+ g_pIdentDaemon = 0;
+// qDebug("Stopped");
}
KviIdentSentinel::KviIdentSentinel()
@@ -145,7 +143,6 @@ KviIdentRequest::~KviIdentRequest()
}
-
KviIdentDaemon::KviIdentDaemon()
: KviSensitiveThread()
{
@@ -325,7 +322,6 @@ ipv6_failure:
for(;;)
{
-
if(KviThreadEvent * e = dequeueEvent())
{
// This can be ONLY a terminate event
@@ -509,8 +505,6 @@ ipv6_failure:
}
-
-
exit_on_request:
postEvent(g_pIdentSentinel,new KviThreadEvent(KVI_IDENT_THREAD_EVENT_EXITING_ON_REQUEST));
@@ -525,7 +519,7 @@ exit_thread:
if(m_sock != KVI_INVALID_SOCKET)kvi_socket_close(m_sock);
if(m_sock6 != KVI_INVALID_SOCKET)kvi_socket_close(m_sock6);
delete m_pRequestList;
- m_pRequestList = 0;
+ m_pRequestList = 0;
// debug("RUN EXITING");
}
@@ -603,7 +597,7 @@ static bool ident_module_can_unload(KviModule *m)
KVIRC_MODULE(
"Ident", // module name
- "1.0.0", // module version
+ "4.0.0", // module version
"Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
"Ident service",
ident_module_init,
@@ -615,4 +609,3 @@ KVIRC_MODULE(
#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
#include "libkviident.moc"
#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-
diff --git a/src/modules/ident/libkviident.h b/src/modules/ident/libkviident.h
index 8e8b7d2cd..422a9e517 100644
--- a/src/modules/ident/libkviident.h
+++ b/src/modules/ident/libkviident.h
@@ -27,9 +27,9 @@
#include "kvi_string.h"
#include "kvi_time.h"
#include "kvi_settings.h"
-
#include "kvi_pointerlist.h"
-#include <qobject.h>
+
+#include <QObject>
class KviIdentRequest
{