Remove unnecessary KDirLister instance from IVI free space indicator module

This relates to Bug 1666
pull/2/head
Timothy Pearson 10 years ago
parent ea6a215368
commit a3c4787220

@ -26,6 +26,7 @@
#include <tqbitmap.h> #include <tqbitmap.h>
#include <tqimage.h> #include <tqimage.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqtimer.h>
#include <tdefileivi.h> #include <tdefileivi.h>
#include <tdefileitem.h> #include <tdefileitem.h>
@ -48,40 +49,29 @@
#include "kivfreespaceoverlay.h" #include "kivfreespaceoverlay.h"
KIVFreeSpaceOverlay::KIVFreeSpaceOverlay(KFileIVI* freespace) KIVFreeSpaceOverlay::KIVFreeSpaceOverlay(KFileIVI* freespace)
: m_lister(0)
{ {
if (!m_lister)
{
m_lister = new KDirLister;
m_lister->setAutoErrorHandlingEnabled(false, 0);
connect(m_lister, TQT_SIGNAL(completed()), TQT_SLOT(slotCompleted()));
connect(m_lister, TQT_SIGNAL(newItems( const KFileItemList& )), TQT_SLOT(slotNewItems( const KFileItemList& )));
m_lister->setShowingDotFiles(false);
}
m_freespace = freespace; m_freespace = freespace;
} }
KIVFreeSpaceOverlay::~KIVFreeSpaceOverlay() KIVFreeSpaceOverlay::~KIVFreeSpaceOverlay()
{ {
if (m_lister) m_lister->stop(); //
delete m_lister;
} }
void KIVFreeSpaceOverlay::start() void KIVFreeSpaceOverlay::start()
{ {
if ( m_freespace->item()->isReadable() ) { if ( !m_freespace->item()->isReadable() ) {
m_lister->openURL(m_freespace->item()->url());
} else {
emit finished(); emit finished();
} }
TQTimer::singleShot(0, this, TQT_SLOT(slotDisplay()));
} }
void KIVFreeSpaceOverlay::timerEvent(TQTimerEvent *) void KIVFreeSpaceOverlay::timerEvent(TQTimerEvent *)
{ {
m_lister->stop(); //
} }
void KIVFreeSpaceOverlay::slotCompleted() void KIVFreeSpaceOverlay::slotDisplay()
{ {
KFileItem* item = m_freespace->item(); KFileItem* item = m_freespace->item();
if (item) { if (item) {
@ -125,9 +115,4 @@ void KIVFreeSpaceOverlay::slotCompleted()
emit finished(); emit finished();
} }
void KIVFreeSpaceOverlay::slotNewItems( const KFileItemList& items )
{
//
}
#include "kivfreespaceoverlay.moc" #include "kivfreespaceoverlay.moc"

@ -45,11 +45,9 @@ protected:
virtual void timerEvent(TQTimerEvent *); virtual void timerEvent(TQTimerEvent *);
private slots: private slots:
void slotCompleted(); void slotDisplay();
void slotNewItems( const KFileItemList& items );
private: private:
KDirLister* m_lister;
KFileIVI* m_freespace; KFileIVI* m_freespace;
}; };

Loading…
Cancel
Save