Use dedicated kdDebug area.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit eb5c989f90ef1f8faf29fb0b39e9c46257f56fc9)

7 files changed, 13 insertions, 34 deletions

diff --git a/src/apt.cpp b/src/apt.cpp
index fdc9751..b237a75 100644
--- a/src/apt.cpp
+++ b/src/apt.cpp
@@ -437,7 +437,7 @@ void AptProtocol::get ( const KURL& url )
     for (QueryOptions::ConstIterator i = options.begin(); i != options.end(); ++i)
       m_query.addQueryItem(i.key(), i.data());
 
-    kdDebug() << "Old url " << url << ", new url " << m_query << endl;
+    kdDebug(7130) << "Old url " << url << ", new url " << m_query << endl;
 
     if (m_query != url)
     {
@@ -830,7 +830,7 @@ void AptProtocol::adept_batch(const TQString& query, const QueryOptions& options
       ip = SlaveBase::messageBox(QuestionYesNo,i18n("Do you want to remove the following %1 packages ?\n").arg(pcount).arg(options["package"]));
   }
 
-  kdDebug(DEBUG_ZONE) << command << endl;
+  kdDebug(7130) << command << endl;
 
   if (ip == KMessageBox::Yes)
   {
@@ -934,7 +934,7 @@ extern "C" {
     TDEInstance instance( "tdeio_apt" );
 
     if ( argc != 4 ) {
-      kdDebug( DEBUG_ZONE ) << "Usage: tdeio_apt  protocol domain-socket1 domain-socket2" << endl;
+      kdDebug(7130) << "Usage: tdeio_apt  protocol domain-socket1 domain-socket2" << endl;
       exit ( -1 );
     }
 
diff --git a/src/apt.h b/src/apt.h
index f119359..87f7854 100644
--- a/src/apt.h
+++ b/src/apt.h
@@ -8,7 +8,6 @@
 #include <tdeio/global.h>
 #include <tdeio/slavebase.h>
 
-#include "debug.h"
 #include "aptcache.h"
 #include "packagemanager.h"
 
diff --git a/src/aptcache.cpp b/src/aptcache.cpp
index f994051..8b2a57f 100644
--- a/src/aptcache.cpp
+++ b/src/aptcache.cpp
@@ -9,7 +9,6 @@
  ***************************************************************************/
 #include "aptcache.h"
 #include "apt.h"
-#include "debug.h"
 
 #include "regexps.h"
 
@@ -63,7 +62,7 @@ void AptCache::receivedStdErr( TDEProcess * /*process*/, char * buffer, int len
     }
     else
     {
-      kdDebug() << "Unmatched error : " << *i << endl;
+      kdDebug(7130) << "Unmatched error : " << *i << endl;
     }
   }
 }
@@ -106,14 +105,14 @@ void AptCache::receiveSearch(const TQStringList& lines)
 
     if (!rx_parse.exactMatch(*i))
     {
-      kdDebug(DEBUG_ZONE) << "Parsing error. Line is " << *i << endl;
+      kdDebug(7130) << "Parsing error. Line is " << *i << endl;
       continue;
     }
 
     emit token("package", rx_parse.cap(1));
       emit token("short_desc", rx_parse.cap(2));
 
-    kdDebug(DEBUG_ZONE) << "Found package : " << rx_parse.cap(1) << " - " << rx_parse.cap(2) << endl;
+    kdDebug(7130) << "Found package : " << rx_parse.cap(1) << " - " << rx_parse.cap(2) << endl;
   }
 }
 
diff --git a/src/debug.h b/src/debug.h
deleted file mode 100644
index ad8151b..0000000
--- a/src/debug.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2003 by Sylvain Joyeux                                  *
- *   sylvain.joyeux@m4x.org                                                *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- ***************************************************************************/
-
-#ifndef KIOAPT_DEBUG
-#define KIOAPT_DEBUG
-
-#define DEBUG_ZONE 7000
-
-#endif
-
diff --git a/src/dpkg.cpp b/src/dpkg.cpp
index 7ab742f..7d9397b 100644
--- a/src/dpkg.cpp
+++ b/src/dpkg.cpp
@@ -11,7 +11,6 @@
 #include <config.h>
 
 #include "dpkg.h"
-#include "debug.h"
 
 #include <tdelocale.h>
 #include <kdebug.h>
@@ -82,7 +81,7 @@ void Dpkg::receiveSearch( const TQStringList & line )
   // package1[, package2[, package3...]]: file
   for (TQStringList::ConstIterator i = line.begin(); i != line.end(); ++i)
   {
-    //kdDebug(DEBUG_ZONE) << *i << endl;
+    //kdDebug(7130) << *i << endl;
     if ((*i).isEmpty()) continue;
     if (rx_notfound.exactMatch(*i))
     {
@@ -93,7 +92,7 @@ void Dpkg::receiveSearch( const TQStringList & line )
     int semicolon = (*i).find(':');
     if (semicolon == -1)
     {
-      kdDebug(DEBUG_ZONE) << "receiveSearch unmatched line : " << *i << endl;
+      kdDebug(7130) << "receiveSearch unmatched line : " << *i << endl;
       continue;
     }
     TQStringList packages = TQStringList::split(',', (*i).left(semicolon));
diff --git a/src/parsers/policy.cpp b/src/parsers/policy.cpp
index 38c9576..af09992 100644
--- a/src/parsers/policy.cpp
+++ b/src/parsers/policy.cpp
@@ -77,7 +77,7 @@ void Policy::operator() (AptProtocol* slave, const TQString& type, const TQStrin
 
   static TQRegExp rx_notinstalled("(none)");
 
-  kdDebug() << "policy : " << type << " " << value << endl;
+  kdDebug(7130) << "policy : " << type << " " << value << endl;
 
   if (type == "begin")
   {
diff --git a/src/regexps.cpp b/src/regexps.cpp
index 32031c0..d407d6b 100644
--- a/src/regexps.cpp
+++ b/src/regexps.cpp
@@ -9,7 +9,6 @@
  ***************************************************************************/
 
 #include "regexps.h"
-#include "debug.h"
 
 #include <kdebug.h>
 
@@ -18,16 +17,16 @@ bool match_dversion(TQString version)
   static TQRegExp rx_revision(rxs_revision);
   TQString allowed_vchars = ".+\\w";
 
-  kdDebug(DEBUG_ZONE) << version << endl;
+  kdDebug(7130) << version << endl;
   if (version[1] == ':')
   {
     allowed_vchars += ":";
     if (! version[0].isDigit()) return false;
-    kdDebug(DEBUG_ZONE) << "Matched epoch" << endl;
+    kdDebug(7130) << "Matched epoch" << endl;
     version = version.right( version.length() - 2 );
   }
 
-  kdDebug(DEBUG_ZONE) << version << endl;
+  kdDebug(7130) << version << endl;
   int rev_pos = version.findRev('-');
   if (rev_pos > -1)
   {
@@ -36,7 +35,7 @@ bool match_dversion(TQString version)
     if (! rx_revision.exactMatch(revision))
       return false;
 
-    kdDebug(DEBUG_ZONE) << "Matched revision" << endl;
+    kdDebug(7130) << "Matched revision" << endl;
     version.truncate( version.length() - rev_pos - 1 );
   }