summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:12:04 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:12:04 -0600
commitb3950b0010bb905707dc4c58794a6f5fefe3f01c (patch)
tree61ec921981533cd970d31ec78d69dd0dd6cc59b5
parent1e90902cbb6ce2f7db9a32e611f516c3c91484d5 (diff)
downloadkrename-b3950b0010bb905707dc4c58794a6f5fefe3f01c.tar.gz
krename-b3950b0010bb905707dc4c58794a6f5fefe3f01c.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
-rw-r--r--krename/batchrenamer.cpp2
-rw-r--r--krename/commandplugin.cpp4
-rw-r--r--krename/dateplugin.cpp10
-rw-r--r--krename/fileoperation.cpp10
-rw-r--r--krename/fileoperation.h2
-rw-r--r--krename/kmyhistorycombo.cpp4
-rw-r--r--krename/kmylistbox.cpp6
-rw-r--r--krename/krenameimpl.cpp12
-rw-r--r--krename/profiledlg.cpp14
9 files changed, 32 insertions, 32 deletions
diff --git a/krename/batchrenamer.cpp b/krename/batchrenamer.cpp
index 707a8ac..bb50a78 100644
--- a/krename/batchrenamer.cpp
+++ b/krename/batchrenamer.cpp
@@ -49,7 +49,7 @@
#include "pluginloader.h"
#include "kmylistview.h"
-using namespace KIO;
+using namespace TDEIO;
BatchRenamer::BatchRenamer()
: m_index( 0 )
diff --git a/krename/commandplugin.cpp b/krename/commandplugin.cpp
index 73f451a..955b040 100644
--- a/krename/commandplugin.cpp
+++ b/krename/commandplugin.cpp
@@ -97,7 +97,7 @@ void CommandPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l )
connect( buttonRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( remove() ) );
connect( list, TQT_SIGNAL( executed( TQListBoxItem* ) ), this, TQT_SLOT( exec() ) );
- KConfig* conf = kapp->config();
+ TDEConfig* conf = kapp->config();
conf->setGroup("CommandPlugin");
list->insertStringList( conf->readListEntry("commandlines" ) );
@@ -144,7 +144,7 @@ TQString CommandPlugin::processFile( BatchRenamer* b, int i, TQString, int )
void CommandPlugin::finished()
{
- KConfig* conf = kapp->config();
+ TDEConfig* conf = kapp->config();
conf->setGroup("CommandPlugin");
TQStringList slist;
for( unsigned int i = 0; i < list->count(); i++ )
diff --git a/krename/dateplugin.cpp b/krename/dateplugin.cpp
index 2e51b6d..6cbc77e 100644
--- a/krename/dateplugin.cpp
+++ b/krename/dateplugin.cpp
@@ -87,19 +87,19 @@ TQString DatePlugin::processFile(BatchRenamer* b, int i, TQString token, int )
else if( token == "second" )
return tmp.sprintf("%0*i", 2, t.second() );
else {
- KIO::UDSEntry entry;
- KIO::NetAccess::stat( b->files()[i].src.url, entry );
+ TDEIO::UDSEntry entry;
+ TDEIO::NetAccess::stat( b->files()[i].src.url, entry );
KFileItem item( entry, b->files()[i].src.url );
if( token == "user" )
return item.user();
else if( token == "group" )
return item.group();
else if( token == "creationdate" )
- return time( item.time( KIO::UDS_CREATION_TIME ), format );
+ return time( item.time( TDEIO::UDS_CREATION_TIME ), format );
else if( token == "modificationdate" )
- return time( item.time( KIO::UDS_MODIFICATION_TIME ), format );
+ return time( item.time( TDEIO::UDS_MODIFICATION_TIME ), format );
else if( token == "accessdate" )
- return time( item.time( KIO::UDS_ACCESS_TIME ), format );
+ return time( item.time( TDEIO::UDS_ACCESS_TIME ), format );
}
diff --git a/krename/fileoperation.cpp b/krename/fileoperation.cpp
index b25cdcb..a678ea7 100644
--- a/krename/fileoperation.cpp
+++ b/krename/fileoperation.cpp
@@ -35,7 +35,7 @@
#include "ProgressDialog.h"
#include "batchrenamer.h"
-using namespace KIO;
+using namespace TDEIO;
FileOperation::FileOperation()
{
@@ -83,8 +83,8 @@ bool FileOperation::start( const KURL & src, const KURL & dest, int mode, bool o
return false;
job->setAutoErrorHandlingEnabled( false, 0 );
- connect( job, TQT_SIGNAL( result (KIO::Job *) ),
- this, TQT_SLOT( slotResult (KIO::Job *) ) );
+ connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+ this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
kapp->eventLoop()->enterLoop();
return !result;
@@ -92,7 +92,7 @@ bool FileOperation::start( const KURL & src, const KURL & dest, int mode, bool o
bool FileOperation::fcopy( const TQString & src, const TQString & dest )
{
- return start( KURL( src ), KURL( dest ), KIO::CopyJob::Copy, false );
+ return start( KURL( src ), KURL( dest ), TDEIO::CopyJob::Copy, false );
}
TQString FileOperation::getName( const TQString & file )
@@ -101,7 +101,7 @@ TQString FileOperation::getName( const TQString & file )
return info.fileName();
}
-void FileOperation::slotResult( KIO::Job * job )
+void FileOperation::slotResult( TDEIO::Job * job )
{
result = job->error();
if( result )
diff --git a/krename/fileoperation.h b/krename/fileoperation.h
index d3ab1c5..7082b0f 100644
--- a/krename/fileoperation.h
+++ b/krename/fileoperation.h
@@ -37,7 +37,7 @@ class FileOperation: public TQObject {
static TQString getName( const TQString & file );
private slots:
- void slotResult( KIO::Job * job );
+ void slotResult( TDEIO::Job * job );
private:
bool locked;
diff --git a/krename/kmyhistorycombo.cpp b/krename/kmyhistorycombo.cpp
index fec4707..4951300 100644
--- a/krename/kmyhistorycombo.cpp
+++ b/krename/kmyhistorycombo.cpp
@@ -41,7 +41,7 @@ KMyHistoryCombo::KMyHistoryCombo( bool customPopup, TQWidget* parent, const char
{
TQStringList history;
TQStringList completion;
- KConfig* config = kapp->config();
+ TDEConfig* config = kapp->config();
config->setGroup( name );
this->setDuplicatesEnabled( false );
@@ -71,7 +71,7 @@ void KMyHistoryCombo::saveSettings()
{
addToHistory( text() );
- KConfig* config = kapp->config();
+ TDEConfig* config = kapp->config();
config->setGroup( name() ? name() : "KMyHistoryCombo" );
config->writeEntry( "History", historyItems() );
diff --git a/krename/kmylistbox.cpp b/krename/kmylistbox.cpp
index 23b240f..f946360 100644
--- a/krename/kmylistbox.cpp
+++ b/krename/kmylistbox.cpp
@@ -41,7 +41,7 @@
#include "krecursivelister.h"
#include "threadedlister.h"
-using namespace KIO;
+using namespace TDEIO;
KMyListBox::KMyListBox(TQWidget* parent, const char* name, WFlags fl)
:KListBox(parent, name, fl)
@@ -334,10 +334,10 @@ void KMyListBox::select( TQListBoxItem* item )
void KMyListBox::preview( KURL::List list )
{
- KIO::PreviewJob* job = KIO::filePreview( list, previewSize, previewSize, 0, 100, false, true, 0 );
+ TDEIO::PreviewJob* job = TDEIO::filePreview( list, previewSize, previewSize, 0, 100, false, true, 0 );
connect( job, TQT_SIGNAL( gotPreview( const KFileItem*, const TQPixmap &) ), this, TQT_SLOT( previewDone( const KFileItem*, const TQPixmap &) ) );
connect( job, TQT_SIGNAL( failed( const KFileItem*)), this, TQT_SLOT( previewFailed( const KFileItem* ) ));
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( previewFinished() ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( previewFinished() ) );
TDEApplication::setOverrideCursor( TQt::waitCursor );
}
diff --git a/krename/krenameimpl.cpp b/krename/krenameimpl.cpp
index 7e7df40..0e9358b 100644
--- a/krename/krenameimpl.cpp
+++ b/krename/krenameimpl.cpp
@@ -1011,7 +1011,7 @@ void KRenameImpl::start()
filename->saveSettings();
extemplate->saveSettings();
- KConfig * config = kapp->config();
+ TDEConfig * config = kapp->config();
config->setGroup("FileExtension");
config->writeEntry("FileExtensionCombo", comboExtension->currentItem() );
@@ -1162,7 +1162,7 @@ bool KRenameImpl::setupBatchRenamer( BatchRenamer* b, bool preview )
if( url.right(1) != "/" )
url.append( "/" );
- if( !KIO::NetAccess::exists( KURL( url ) ) )
+ if( !TDEIO::NetAccess::exists( KURL( url ) ) )
{
int m = KMessageBox::warningContinueCancel( parent, i18n("The directory %1 does not exist. "
"KRename will create it for you.").arg( url ) );
@@ -1172,7 +1172,7 @@ bool KRenameImpl::setupBatchRenamer( BatchRenamer* b, bool preview )
int i = 0;
TQString d = "/";
while( (d += url.section( "/", i, i, TQString::SectionSkipEmpty )) && ! d.isEmpty() ) { // asignment here!
- if( !KIO::NetAccess::exists( d ) && !KIO::NetAccess::mkdir( d ) )
+ if( !TDEIO::NetAccess::exists( d ) && !TDEIO::NetAccess::mkdir( d ) )
{
tqDebug( "Can't create %s", d.latin1() );
break;
@@ -1254,7 +1254,7 @@ void KRenameImpl::updatePreview()
void KRenameImpl::loadConfig()
{
- KConfig* config = kapp->config();
+ TDEConfig* config = kapp->config();
config->setGroup("HistSize");
m_hist = config->readNumEntry("HistoryItems", 10 );
@@ -1320,7 +1320,7 @@ void KRenameImpl::loadConfig()
void KRenameImpl::saveConfig()
{
- KConfig* config = kapp->config();
+ TDEConfig* config = kapp->config();
config->setGroup("HistSize");
config->writeEntry("HistoryItems", m_hist );
@@ -1659,7 +1659,7 @@ void KRenameImpl::changeParent( TQWidget* p, KMenuBar* m, TQPushButton* finish,
TQWidget* KRenameImpl::launch( TQRect rect, const KURL::List & list, KRenameImpl* impl, bool loadprofile )
{
- KConfig* config = kapp->config();
+ TDEConfig* config = kapp->config();
config->setGroup("GUISettings");
bool firststart = config->readBoolEntry( "firststart", true );
bool wizardmode = config->readBoolEntry( "GUIWizardMode", false );
diff --git a/krename/profiledlg.cpp b/krename/profiledlg.cpp
index 17a2906..5d52e87 100644
--- a/krename/profiledlg.cpp
+++ b/krename/profiledlg.cpp
@@ -96,7 +96,7 @@ ProfileManager::ProfileManager( KRenameImpl* krename )
const TQString ProfileManager::readProfilePath( const TQString & name )
{
TQString path;
- KConfig* conf = kapp->config();
+ TDEConfig* conf = kapp->config();
conf->setGroup( "Profiles" );
path = conf->readEntry( name, TQString() );
@@ -115,7 +115,7 @@ const TQString ProfileManager::getProfilePath( const TQString & name )
TQString path = locateLocal( "data", TQString( "krename/%1.xml" ).arg( name ) );
- KConfig* conf = kapp->config();
+ TDEConfig* conf = kapp->config();
conf->setGroup( "ProfilesHeader" );
list = conf->readListEntry( "list" );
@@ -364,7 +364,7 @@ const TQValueList<int> ProfileManager::stringToList( const TQString & data )
bool ProfileManager::hasDefaultProfile()
{
- KConfig* conf = kapp->config();
+ TDEConfig* conf = kapp->config();
conf->setGroup( "ProfilesHeader" );
TQString def = conf->readEntry( "defprofile", TQString() );
@@ -374,7 +374,7 @@ bool ProfileManager::hasDefaultProfile()
void ProfileManager::loadDefaultProfile( KRenameImpl* krename )
{
- KConfig* conf = kapp->config();
+ TDEConfig* conf = kapp->config();
conf->setGroup( "ProfilesHeader" );
TQString def = conf->readEntry( "defprofile", TQString() );
@@ -437,7 +437,7 @@ ProfileDlg::ProfileDlg(KRenameImpl* krename, TQWidget *parent, const char *name)
connect( checkDefault, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSetDefault() ) );
connect( this, TQT_SIGNAL( hidden() ), this, TQT_SLOT( slotHidden() ) );
- KConfig* conf = kapp->config();
+ TDEConfig* conf = kapp->config();
conf->setGroup( "ProfilesHeader" );
ProfileListBoxText* item;
@@ -565,7 +565,7 @@ void ProfileDlg::slotDeleteProfile()
if( item )
delete item;
- KConfig* conf = kapp->config();
+ TDEConfig* conf = kapp->config();
conf->setGroup( "ProfilesHeader" );
TQStringList list = conf->readListEntry( "list" );
@@ -580,7 +580,7 @@ void ProfileDlg::slotDeleteProfile()
void ProfileDlg::slotHidden()
{
int i;
- KConfig* conf = kapp->config();
+ TDEConfig* conf = kapp->config();
TQString def = TQString();
ProfileListBoxText* item;