Procházet zdrojové kódy

Removed throw list because ctkLDAPExpr may throw others too.

Sascha Zelzer před 14 roky
rodič
revize
28d9db6980

+ 4 - 4
Libs/PluginFramework/ctkLDAPExpr.cpp

@@ -125,7 +125,7 @@ ctkLDAPExpr::ctkLDAPExpr()
 
 }
 
-ctkLDAPExpr::ctkLDAPExpr( const QString &filter ) throw (std::invalid_argument)
+ctkLDAPExpr::ctkLDAPExpr( const QString &filter )
 {
   ParseState ps(filter);
   try
@@ -242,7 +242,7 @@ bool ctkLDAPExpr::isNull() const
   return !d;
 }
 
-bool ctkLDAPExpr::query( const QString &filter, const ctkDictionary &pd ) throw (std::invalid_argument)
+bool ctkLDAPExpr::query( const QString &filter, const ctkDictionary &pd )
 {
   return ctkLDAPExpr(filter).evaluate(pd, false);
 }
@@ -407,7 +407,7 @@ bool ctkLDAPExpr::patSubstr( const QString &s, const QString &pat )
   return s.isNull() ? false : patSubstr(s,0,pat,0);
 }
 
-ctkLDAPExpr ctkLDAPExpr::parseExpr( ParseState &ps ) throw (std::invalid_argument)
+ctkLDAPExpr ctkLDAPExpr::parseExpr( ParseState &ps )
 {
   ps.skipWhite();
   if (!ps.prefix("("))
@@ -438,7 +438,7 @@ ctkLDAPExpr ctkLDAPExpr::parseExpr( ParseState &ps ) throw (std::invalid_argumen
   return ctkLDAPExpr(op, v);
 }
 
-ctkLDAPExpr ctkLDAPExpr::parseSimple( ParseState &ps ) throw (std::invalid_argument)
+ctkLDAPExpr ctkLDAPExpr::parseSimple( ParseState &ps )
 {
   QString attrName = ps.getAttributeName();
   if (attrName.isNull())

+ 4 - 7
Libs/PluginFramework/ctkLDAPExpr_p.h

@@ -66,7 +66,7 @@ public:
   ctkLDAPExpr();
 
   //!
-  ctkLDAPExpr(const QString &filter) throw ( std::invalid_argument );
+  ctkLDAPExpr(const QString &filter);
 
   //!
   ctkLDAPExpr(const ctkLDAPExpr& other);
@@ -120,8 +120,7 @@ public:
   bool isNull() const;
 
   //! 
-  static bool query(const QString &filter, const ctkDictionary &pd)
-      throw (std::invalid_argument);
+  static bool query(const QString &filter, const ctkDictionary &pd);
 
   //! Evaluate this LDAP filter.
   bool evaluate(const ctkDictionary &p, bool matchCase) const;
@@ -141,12 +140,10 @@ private:
   ctkLDAPExpr(int op, const QString &attrName, const QString &attrValue);
 
   //!
-  static ctkLDAPExpr parseExpr(ParseState &ps)
-    throw (std::invalid_argument);
+  static ctkLDAPExpr parseExpr(ParseState &ps);
 
   //!
-  static ctkLDAPExpr parseSimple(ParseState &ps)
-    throw (std::invalid_argument);
+  static ctkLDAPExpr parseSimple(ParseState &ps);
 
   //!
   bool compare(const QVariant &obj, int op, const QString &s) const;