summaryrefslogtreecommitdiffstats
path: root/kioslave/media/medianotifier
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kioslave/media/medianotifier
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/media/medianotifier')
-rw-r--r--kioslave/media/medianotifier/medianotifier.cpp12
-rw-r--r--kioslave/media/medianotifier/medianotifier.h4
-rw-r--r--kioslave/media/medianotifier/notificationdialog.cpp2
3 files changed, 9 insertions, 9 deletions
diff --git a/kioslave/media/medianotifier/medianotifier.cpp b/kioslave/media/medianotifier/medianotifier.cpp
index 94ee0e8c2..de6a56645 100644
--- a/kioslave/media/medianotifier/medianotifier.cpp
+++ b/kioslave/media/medianotifier/medianotifier.cpp
@@ -80,25 +80,25 @@ void MediaNotifier::onMediumChange( const TQString &name, bool allowNotification
KURL url( "system:/media/"+name );
- KIO::SimpleJob *job = KIO::stat( url, false );
+ TDEIO::SimpleJob *job = TDEIO::stat( url, false );
job->setInteractive( false );
m_allowNotificationMap[job] = allowNotification;
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- this, TQT_SLOT( slotStatResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQT_SLOT( slotStatResult( TDEIO::Job * ) ) );
}
-void MediaNotifier::slotStatResult( KIO::Job *job )
+void MediaNotifier::slotStatResult( TDEIO::Job *job )
{
bool allowNotification = m_allowNotificationMap[job];
m_allowNotificationMap.remove( job );
if ( job->error() != 0 ) return;
- KIO::StatJob *stat_job = static_cast<KIO::StatJob *>( job );
+ TDEIO::StatJob *stat_job = static_cast<TDEIO::StatJob *>( job );
- KIO::UDSEntry entry = stat_job->statResult();
+ TDEIO::UDSEntry entry = stat_job->statResult();
KURL url = stat_job->url();
KFileItem medium( entry, url );
diff --git a/kioslave/media/medianotifier/medianotifier.h b/kioslave/media/medianotifier/medianotifier.h
index 23f203f97..acbb23505 100644
--- a/kioslave/media/medianotifier/medianotifier.h
+++ b/kioslave/media/medianotifier/medianotifier.h
@@ -43,7 +43,7 @@ k_dcop:
void onMediumChange( const TQString &name, bool allowNotification );
private slots:
- void slotStatResult( KIO::Job *job );
+ void slotStatResult( TDEIO::Job *job );
void checkFreeDiskSpace();
void slotFreeFinished( KMessageBox::ButtonCode );
void slotFreeContinue();
@@ -58,7 +58,7 @@ private:
bool execAutoopen( const KFileItem &medium, const TQString &path,
const TQString &autoopenFile );
- TQMap<KIO::Job*,bool> m_allowNotificationMap;
+ TQMap<TDEIO::Job*,bool> m_allowNotificationMap;
TQTimer * m_freeTimer;
KDialogBase * m_freeDialog;
};
diff --git a/kioslave/media/medianotifier/notificationdialog.cpp b/kioslave/media/medianotifier/notificationdialog.cpp
index 7ba172601..29cf6b4f2 100644
--- a/kioslave/media/medianotifier/notificationdialog.cpp
+++ b/kioslave/media/medianotifier/notificationdialog.cpp
@@ -37,7 +37,7 @@ NotificationDialog::NotificationDialog( KFileItem medium, NotifierSettings *sett
: KDialogBase( parent, name, false, i18n( "Medium Detected" ), Ok|Cancel|User1, Ok, true),
m_medium(medium), m_settings( settings )
{
- setCaption( KIO::decodeFileName(m_medium.name()) );
+ setCaption( TDEIO::decodeFileName(m_medium.name()) );
clearWState( WState_Polished );
TQWidget *page = new TQWidget( this );