[devel] kdenonbeta/kdedebian/kalternatives/src

Juanjo Alvarez <[email protected]> Fri, 1 Oct 2004 08:52:40 +0200 (CEST)
Newsgroups gmane.comp.kde.devel.debian
Message-ID <20041001065240.1E8E49BAF__9613.13367956809$1096613590$gmane$org@office.kde.org>
CVS commit by juanjux: 

Some Mandrake fixes and better check for distribution (Mandrake can have
/var/lib/dpkg/alternatives if dpkg is installed.) An implementation of 
description obtaining under Mandrake (like Debian has) will follow.


  M +6 -6      altitemelement.cpp   1.6
  M +4 -4      altitemelement.h   1.6


--- kdenonbeta/kdedebian/kalternatives/src/altitemelement.cpp  #1.5:1.6
@@ -38,8 +38,8 @@ AltItemElement::AltItemElement(KListView
         setOn(alternative->isSelected());
         setEnabled(!m_bisBroken);
-#ifdef DEBIAN
+//#ifdef DEBIAN
         findDescriptionThread = new FindDescriptionThread(this);
         m_desc = "";
-#endif
+//#endif
 }
 
@@ -49,5 +49,5 @@ AltItemElement::~AltItemElement()
 }
 
-#ifdef DEBIAN
+//#ifdef DEBIAN
 
 void AltItemElement::searchDescription()
@@ -70,8 +70,8 @@ void AltItemElement::setDescription(QStr
 }
 
-#endif
+//#endif
 
 /********************************* FindDescriptionThread ******************************/
-#ifdef DEBIAN
+//#ifdef DEBIAN
 FindDescriptionThread::FindDescriptionThread(AltItemElement *altItem):
 m_altItem(altItem)
@@ -174,5 +174,5 @@ QString FindDescriptionThread::getDescri
 }
 
-#endif
+//#endif
 
 #include "altitemelement.moc"

--- kdenonbeta/kdedebian/kalternatives/src/altitemelement.h  #1.5:1.6
@@ -53,13 +53,13 @@ public:
     Alternative *getAlternative() { return m_alt; }
         QString getPath() const {return m_path; }
-//#ifdef DEBIAN
+//ifdef DEBIAN
         QString getDescription() const {return m_desc;}
         void searchDescription();
         void setDescription(QString desc);
         
-//#endif
+//endif
 };
 
-//#ifdef DEBIAN
+//ifdef DEBIAN
 class FindDescriptionThread : public QObject, public QThread
 {
@@ -79,5 +79,5 @@ private slots:
         void slotGetExecutable(KProcess *proc, char *buffer, int buflen);
 };
-//#endif
+//endif
 
 #endif //_ALTITEMELEMENT_H_