From 26522796eec65ced2ef0b4b33963f4cc7c26c9a1 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Tue, 28 Jun 2016 07:13:04 +0300 Subject: [PATCH] Fix a couple of harmless warnings Signed-off-by: Alexander Golubev (cherry picked from commit e0b892796d218e0ad64ed6698640e1923662d943) --- dcop/client/marshall.cpp | 2 +- kabc/ldapurl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dcop/client/marshall.cpp b/dcop/client/marshall.cpp index 32d448c71..c7142d31b 100644 --- a/dcop/client/marshall.cpp +++ b/dcop/client/marshall.cpp @@ -273,7 +273,7 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type ) { if( i >= args.count() ) { - qWarning("Not enough arguments (expected %d, got %d).", i, args.count()); + qWarning("Not enough arguments (expected %u, got %lu).", i, args.count()); exit(1); } TQString s = TQString::fromLocal8Bit( args[ i ] ); diff --git a/kabc/ldapurl.h b/kabc/ldapurl.h index 0c2693758..72fb4bd55 100644 --- a/kabc/ldapurl.h +++ b/kabc/ldapurl.h @@ -48,7 +48,7 @@ namespace KABC { bool critical; }; - typedef enum Scope { Base, One, Sub }; + enum Scope { Base, One, Sub }; /** Constructs an empty KLDAPUrl. */ LDAPUrl();