Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

src/apt.cpp

@@ -181,12 +181,12 @@ static TQString make_extform_cmd(bool ext_form, const KURL& query)
 TQString AptProtocol::make_html_form() const
 {
   bool can_fsearch = false;
-  bool ext_form = KGlobal::config() -> readBoolEntry("extended_form", true);
+  bool ext_form = TDEGlobal::config() -> readBoolEntry("extended_form", true);
   // Only in config-file. Needed for some dpkg-based distros that are not Debian
   can_fsearch = can_searchfile(true);
 
   bool online = false;
-  bool online_form = KGlobal::config() -> readBoolEntry("online_form", true);
+  bool online_form = TDEGlobal::config() -> readBoolEntry("online_form", true);
   if (m_adept_batch)
     online = online_form && (!m_internal) && ext_form && m_adept_batch -> capabilities(PackageManager::ONLINE);
 
@@ -225,16 +225,16 @@ AptProtocol::AptProtocol( const TQCString &pool_socket, const TQCString &app_soc
       m_adept_batch(0), m_parser(0)
 
 {
-  KStandardDirs* dirs = KGlobal::dirs();
+  KStandardDirs* dirs = TDEGlobal::dirs();
   m_stylesheet = dirs->findResource( "data", "kio_apt/kio_apt.css" );
 
   m_logo = dirs->findResource( "data", "kio_apt/" 
-          + KGlobal::config() -> readEntryUntranslated("logo", "kdedeb_logo.png" ) );
+          + TDEGlobal::config() -> readEntryUntranslated("logo", "kdedeb_logo.png" ) );
 
   m_header_background = dirs->findResource( "data", "kio_apt/" 
-          + KGlobal::config() -> readEntryUntranslated("background", "headerbg.png" ) );
+          + TDEGlobal::config() -> readEntryUntranslated("background", "headerbg.png" ) );
 
-  m_logo_alt = KGlobal::config() -> readEntryUntranslated("alt_tag", i18n("KDE on Debian") );
+  m_logo_alt = TDEGlobal::config() -> readEntryUntranslated("alt_tag", i18n("KDE on Debian") );
 
   connect(&m_process, TQT_SIGNAL(token(const TQString&, const TQString&)),
     this, TQT_SLOT(token_dispatch(const TQString&, const TQString&)));
@@ -397,7 +397,7 @@ void AptProtocol::get ( const KURL& url )
   if (!opt.isNull())
   {
     bool ext_form = (opt != "0");
-    KGlobal::config() -> writeEntry("extended_form", ext_form);
+    TDEGlobal::config() -> writeEntry("extended_form", ext_form);
   }
 
   // Enable install/remove/upgrade/...
@@ -412,7 +412,7 @@ void AptProtocol::get ( const KURL& url )
   m_internal = (opt == "1");
 
   // Sync the config (must use kcfg sometime :p)
-  KGlobal::config() -> sync();
+  TDEGlobal::config() -> sync();
 
   if (command.isEmpty() || query.isEmpty())
   {
@@ -535,8 +535,8 @@ void AptProtocol::show(const TQString& package, const QueryOptions& options)
 
   if (options.contains("show_filelist"))
   {
-    KGlobal::config() -> writeEntry("show_filelist", options["show_filelist"] != "0");
-    KGlobal::config() -> sync();
+    TDEGlobal::config() -> writeEntry("show_filelist", options["show_filelist"] != "0");
+    TDEGlobal::config() -> sync();
   }
 
   mimeType("text/html");
@@ -601,7 +601,7 @@ void AptProtocol::show(const TQString& package, const QueryOptions& options)
 
 
   /** Add file list (if enabled) */
-  bool show_filelist = KGlobal::config() -> readBoolEntry("show_filelist", false);
+  bool show_filelist = TDEGlobal::config() -> readBoolEntry("show_filelist", false);
   if ( show_filelist )
   {
     if (can_listfiles(!installed_version.isEmpty()))
@@ -837,7 +837,7 @@ void AptProtocol::adept_batch(const TQString& query, const QueryOptions& options
     p = new KShellProcess;
     p->clearArguments();
     *p << command;
-    p->start( KProcess::Block, KProcess::All );
+    p->start( TDEProcess::Block, TDEProcess::All );
 
     for(int i = 0; i != pcount; ++i)
     {

src/aptcache.cpp

@@ -25,10 +25,10 @@
 
 AptCache::AptCache()
 {
-  connect(&m_process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
-    this, TQT_SLOT(receivedStdErr(KProcess*, char*, int )));
-  connect(&m_process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
-    this, TQT_SLOT(receivedStdOut(KProcess*, char*, int )));
+  connect(&m_process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+    this, TQT_SLOT(receivedStdErr(TDEProcess*, char*, int )));
+  connect(&m_process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+    this, TQT_SLOT(receivedStdOut(TDEProcess*, char*, int )));
 }
 AptCache::~AptCache() {}
 
@@ -49,7 +49,7 @@ static TQStringList received(TQString& buffer, char* input, int input_len)
 
   return ret;
 }
-void AptCache::receivedStdErr( KProcess * /*process*/, char * buffer, int len )
+void AptCache::receivedStdErr( TDEProcess * /*process*/, char * buffer, int len )
 {
   static TQRegExp rx_we("(W|E):\\s+(.*)");
 
@@ -67,7 +67,7 @@ void AptCache::receivedStdErr( KProcess * /*process*/, char * buffer, int len )
     }
   }
 }
-void AptCache::receivedStdOut( KProcess * /*process*/, char * buffer, int len )
+void AptCache::receivedStdOut( TDEProcess * /*process*/, char * buffer, int len )
 {
   TQStringList lines = received(m_received_out, buffer, len);
   (this->*m_receive)(lines);
@@ -92,7 +92,7 @@ bool AptCache::search(const TQString& expression)
   m_process << "apt-cache" << "search";
   m_process << TQStringList::split(" ", expression);
   m_receive = &AptCache::receiveSearch;
-  return m_process.start(KProcess::Block, KProcess::Stdout );
+  return m_process.start(TDEProcess::Block, TDEProcess::Stdout );
 }
 
 void AptCache::receiveSearch(const TQStringList& lines)
@@ -124,7 +124,7 @@ bool AptCache::show(const TQString& package)
   m_process.setEnvironment("LANGUAGE", "C");
   m_process << "apt-cache" << "show" << package;
   m_receive = &AptCache::receiveShow;
-  return m_process.start(KProcess::Block, KProcess::Stdout );
+  return m_process.start(TDEProcess::Block, TDEProcess::Stdout );
 }
 
 void AptCache::receiveShow(const TQStringList& lines)
@@ -240,7 +240,7 @@ bool AptCache::policy( const TQString & package )
   m_process.setEnvironment("LANGUAGE", "C");
   m_process << "apt-cache" << "policy" << package;
   m_receive = &AptCache::receivePolicy;
-  return m_process.start(KProcess::Block, KProcess::Stdout );
+  return m_process.start(TDEProcess::Block, TDEProcess::Stdout );
 }
 
 void AptCache::receivePolicy(const TQStringList& lines)

src/aptcache.h

@@ -28,7 +28,7 @@ class AptCache : public TQObject {
   ReceiveMethod m_receive;
 
   // KProcIO messes the stderr and the stdout lines :(
-  KProcess m_process;
+  TDEProcess m_process;
   TQString m_received_out, m_received_err;
 
   TQString m_attribute;
@@ -36,8 +36,8 @@ class AptCache : public TQObject {
   TQString m_installed, m_candidate;
 
 private slots:
-  void receivedStdErr(KProcess* process, char* buffer, int len);
-  void receivedStdOut(KProcess* process, char* buffer, int len);
+  void receivedStdErr(TDEProcess* process, char* buffer, int len);
+  void receivedStdOut(TDEProcess* process, char* buffer, int len);
 
 private:
   void clear();

src/dpkg.cpp

@@ -72,7 +72,7 @@ bool Dpkg::search( const TQString & file )
   m_process.clearArguments();
   m_process << "dpkg" << "-S" << file;
   m_receive = &Dpkg::receiveSearch;
-  return m_process.start(KProcess::Block, KProcess::Stdout );
+  return m_process.start(TDEProcess::Block, TDEProcess::Stdout );
 }
 
 void Dpkg::receiveSearch( const TQStringList & line )
@@ -114,7 +114,7 @@ bool Dpkg::list( const TQString & package )
   m_process.clearArguments();
   m_process << "dpkg" << "-L" << package;
   m_receive = &Dpkg::receiveList;
-  return m_process.start(KProcess::Block, KProcess::Stdout );
+  return m_process.start(TDEProcess::Block, TDEProcess::Stdout );
 }
 
 void Dpkg::receiveList( const TQStringList & line )