remove qtype char* constructor

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1944 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 1bbfa48770d2639f885a979d4971954ad700d6a1..e259bc0c799a4a124022dfb346a21edaa8f67943 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -120,7 +120,7 @@ int PacketHandler::findMboxFW(DNSPacket *p, DNSPacket *r, string &target)
   if(!getAuth(p, &sd, target, &zoneId))
     return false;
 
-  B.lookup("MBOXFW",string("%@")+target,p, zoneId);
+  B.lookup(QType(QType::MBOXFW),string("%@")+target,p, zoneId);
       
   while(B.get(rr))
     wedoforward=true;
@@ -145,7 +145,7 @@ int PacketHandler::findUrl(DNSPacket *p, DNSPacket *r, string &target)
 
   bool found=false;
       
-  B.lookup("URL",target,p); // search for a URL before we search for an A
+  B.lookup(QType(QType::URL),target,p); // search for a URL before we search for an A
         
   while(B.get(rr)) {
     if(!found) 
@@ -164,7 +164,7 @@ int PacketHandler::findUrl(DNSPacket *p, DNSPacket *r, string &target)
 
   // now try CURL
   
-  B.lookup("CURL",target,p); // search for a URL before we search for an A
+  B.lookup(QType(QType::CURL),target,p); // search for a URL before we search for an A
       
   while(B.get(rr)) {
     if(!found) 

diff --git a/pdns/qtype.cc b/pdns/qtype.cc
index b6c5ebd445faaf295291e2b18ea4a14f0f80cdbd..55e5aaea4d648110e78a9c9e02703b3768d7aacc 100644 (file)
--- a/pdns/qtype.cc
+++ b/pdns/qtype.cc
@@ -134,12 +134,6 @@ QType::QType(uint16_t n)
   code=n;
 }
 
-QType::QType(const char *p)
-{
-  QType();
-  code=chartocode(p);
-}
-
 string DNSResourceRecord::serialize() const
 {
   ostringstream ostr;

diff --git a/pdns/qtype.hh b/pdns/qtype.hh
index 46ec6eba9db00394540d0d62598f99d7172f8476..72b1e7c54a071c13534146a503f5fa48efab3601 100644 (file)
--- a/pdns/qtype.hh
+++ b/pdns/qtype.hh
@@ -47,7 +47,6 @@ class QType
 public:
   QType(); //!< Naked constructor
   explicit QType(uint16_t); //!< convert from an integer to a QType
-  QType(const char *p);  //!< convert from a char* to a QType
   QType(const QType& orig) : code(orig.code)
   {
   }