Changeset 275:03f6a96b28f2

Timestamp:

06/11/2008 08:36:06 PM (4 years ago)

Author:

Dmitry Nezhevenko <dion@…>

Branch:

default

Message:

Make it compatible with gcc 4.3

Location:

src

Files:

• base/disco/discohandler.h (modified) (1 diff)
• base/glooxwrapper.h (modified) (1 diff)
• base/gluxibot.h (modified) (1 diff)
• base/main.cpp (modified) (1 diff)
• plugins/muc/mucplugin.h (modified) (1 diff)
• socketw/src/sw_base.cxx (modified) (1 diff)
• socketw/src/sw_ssl.cxx (modified) (1 diff)

src/base/disco/discohandler.h

@@ -30 +30 @@
 class GluxiBot;
 
-class gloox::Stanza;
-
 class DiscoHandler
 {

src/base/glooxwrapper.h

@@ -17 +17 @@
 #include "gloox/myvcardmanager.h"
 
-class gloox::Client;
-class gloox::Stanza;
 class MyStanza;
 

src/base/gluxibot.h

@@ -22 +22 @@
 class AbstractConfigurator;
 class RootDiscoHandler;
-
-class gloox::Client;
-class gloox::Stanza;
 
 class QuitEvent: public QEvent

src/base/main.cpp

@@ -12 +12 @@
 #include <signal.h>
 #endif
+
+#include <stdlib.h>
 
 GluxiBot *bot;

src/plugins/muc/mucplugin.h

@@ -64 +64 @@
         int getStatus(gloox::Stanza* s);
         bool warnImOwner(gloox::Stanza* s);
-        QString expandMacro(gloox::Stanza* s, Conference*c, Nick* n, const QString& s, const AListItem* item=0);
+        QString expandMacro(gloox::Stanza* s, Conference*c, Nick* n, const QString& str, const AListItem* item=0);
         void requestVCard(gloox::Stanza* s, Conference* conf, Nick* nick);
 private slots:

src/socketw/src/sw_base.cxx

@@ -20 +20 @@
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #ifndef __WIN32__

src/socketw/src/sw_ssl.cxx

@@ -56 +56 @@
 }
 
-X509* BuildCertificate(char *name, char *organization, char *country, EVP_PKEY *key) 
+X509* BuildCertificate(const char *name, char *organization, char *country, EVP_PKEY *key) 
 {
         if( !name )