[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenox/konq-embed/dropin
From:       Stefan Eilers <stefan.eilers () basyskom ! de>
Date:       2007-09-07 15:05:51
Message-ID: 1189177551.970720.9674.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 709472 by eilers:

Fixes several warnings. Thanks to Stephane Loeuillet for contributing
this patch!


 M  +2 -2      kio/authcache.cpp  
 M  +1 -1      kio/observer.cpp  
 M  +2 -0      klocale.h  
 M  +2 -2      kparts/part.cpp  
 M  +1 -1      kssl/configure.in.in  


--- trunk/kdenox/konq-embed/dropin/kio/authcache.cpp #709471:709472
@@ -66,7 +66,7 @@
 				   QString user, QString pass,
 				   QString digest)
 {
-  int i, si = -1, smallest = INT_MAX;
+  int i, smallest = INT_MAX;
   QStringList strlist;
 
   if(user.isNull())
@@ -85,7 +85,7 @@
 }
 
 // DCOP function
-QStringList KAuthCacheServer::searchAuthCache(QString host, QString realm)
+QStringList KAuthCacheServer::searchAuthCache(QString host, QString /*realm*/ )
 {
   int i, si = -1, largest = 0;
   QStringList strlist;
--- trunk/kdenox/konq-embed/dropin/kio/observer.cpp #709471:709472
@@ -66,7 +66,7 @@
 
 int Observer::messageBox( int progressId, int type, const QString &_text, const QString &caption,
                           const QString &buttonYes, const QString &buttonNo,
-                          const QString &dontAskAgainName )
+                          const QString & /*dontAskAgainName*/ )
 {
     return Observer::messageBox( progressId, type, _text, caption,
                           buttonYes, buttonNo);
--- trunk/kdenox/konq-embed/dropin/klocale.h #709471:709472
@@ -34,7 +34,9 @@
 inline QString i18n( const char *, const char *s ) { return QObject::tr( s ); }
 QString i18n( const char *singular, const char *plural, unsigned long n );
 
+#ifndef I18N_NOOP
 #define I18N_NOOP( x ) x
+#endif
 #define I18N_NOOP2(comment,x) x
 
 // dummy
--- trunk/kdenox/konq-embed/dropin/kparts/part.cpp #709471:709472
@@ -40,8 +40,8 @@
 using namespace KParts;
 
 Part::Part( QObject *parent, const char *name ) 
-    :  QObject( parent, name ), m_manager(0), m_selectable(false), 
-       m_widget(0), m_instance(0)
+    :  QObject( parent, name ), m_instance(0), m_manager(0),
+       m_selectable(false), m_widget(0)
 {
 }
 
--- trunk/kdenox/konq-embed/dropin/kssl/configure.in.in #709471:709472
@@ -4,7 +4,7 @@
 dnl and $(SSL_INCLUDES) will be -Isslhdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
-AC_DEFUN(AC_PATH_SSL,
+AC_DEFUN([AC_PATH_SSL],
 [
 LIBSSL="-lssl -lcrypto"
 AC_MSG_CHECKING([for OpenSSL])
[prev in list] [next in list] [prev in thread] [next in thread]