summaryrefslogtreecommitdiffstats
path: root/kimagemapeditor
diff options
context:
space:
mode:
Diffstat (limited to 'kimagemapeditor')
-rw-r--r--kimagemapeditor/kimagemapeditor.cpp16
-rw-r--r--kimagemapeditor/kimagemapeditor.h14
-rw-r--r--kimagemapeditor/kimedialogs.cpp2
-rw-r--r--kimagemapeditor/kimedialogs.h6
-rw-r--r--kimagemapeditor/kimeshell.cpp12
-rw-r--r--kimagemapeditor/kimeshell.h8
-rw-r--r--kimagemapeditor/qextfileinfo.cpp48
-rw-r--r--kimagemapeditor/qextfileinfo.h6
8 files changed, 56 insertions, 56 deletions
diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp
index 1e31596d..3093e7a3 100644
--- a/kimagemapeditor/kimagemapeditor.cpp
+++ b/kimagemapeditor/kimagemapeditor.cpp
@@ -338,16 +338,16 @@ void KImageMapEditor::setModified(bool modified)
}
-KConfig *KImageMapEditor::config()
+TDEConfig *KImageMapEditor::config()
{
return KimeFactory::instance()->config();
}
-void KImageMapEditor::readConfig(KConfig* config) {
+void KImageMapEditor::readConfig(TDEConfig* config) {
recentFilesAction->loadEntries(config,"Data");
}
-void KImageMapEditor::writeConfig(KConfig* config) {
+void KImageMapEditor::writeConfig(TDEConfig* config) {
config->writeEntry("highlightareas",highlightAreasAction->isChecked());
config->writeEntry("showalt",showAltAction->isChecked());
recentFilesAction->saveEntries(config,"Data");
@@ -368,12 +368,12 @@ void KImageMapEditor::writeConfig() {
}
-void KImageMapEditor::saveProperties(KConfig *config)
+void KImageMapEditor::saveProperties(TDEConfig *config)
{
saveLastURL(config);
}
-void KImageMapEditor::readProperties(KConfig * config)
+void KImageMapEditor::readProperties(TDEConfig * config)
{
openLastURL(config);
}
@@ -399,7 +399,7 @@ void KImageMapEditor::slotConfigChanged()
drawZone->viewport()->repaint();
}
-void KImageMapEditor::openLastURL(KConfig* config) {
+void KImageMapEditor::openLastURL(TDEConfig* config) {
KURL lastURL ( config->readPathEntry("lastopenurl") );
TQString lastMap = config->readEntry("lastactivemap");
TQString lastImage = config->readPathEntry("lastactiveimage");
@@ -418,7 +418,7 @@ void KImageMapEditor::openLastURL(KConfig* config) {
}
}
-void KImageMapEditor::saveLastURL(KConfig* config) {
+void KImageMapEditor::saveLastURL(TDEConfig* config) {
config->writePathEntry("lastopenurl",url().path());
config->writeEntry("lastactivemap",mapName());
config->writePathEntry("lastactiveimage",_imageUrl.path());
@@ -2273,7 +2273,7 @@ void KImageMapEditor::saveImageMap(const KURL & url)
if (!backupFileCreated) {
TQString backupFile = url.path()+"~";
- KIO::file_copy(url, KURL::fromPathOrURL( backupFile ), -1, true, false, false);
+ TDEIO::file_copy(url, KURL::fromPathOrURL( backupFile ), -1, true, false, false);
backupFileCreated = true;
}
diff --git a/kimagemapeditor/kimagemapeditor.h b/kimagemapeditor/kimagemapeditor.h
index 9497ee84..34c7b0fc 100644
--- a/kimagemapeditor/kimagemapeditor.h
+++ b/kimagemapeditor/kimagemapeditor.h
@@ -139,7 +139,7 @@ public :
virtual ~KImageMapEditor();
static TDEAboutData *createAboutData();
- static KConfig *config();
+ static TDEConfig *config();
/**
* Makes sure, that the actions cut, copy, delete and
@@ -182,8 +182,8 @@ public :
void readConfig();
void writeConfig();
- virtual void readProperties(KConfig *);
- virtual void saveProperties(KConfig *);
+ virtual void readProperties(TDEConfig *);
+ virtual void saveProperties(TDEConfig *);
virtual bool closeURL();
bool queryClose();
virtual void setReadWrite(bool);
@@ -205,10 +205,10 @@ public :
* Opens the last URL the user worked with.
* Sets also, the last map and the last image
*/
- void openLastURL(KConfig*);
+ void openLastURL(TDEConfig*);
- void readConfig(KConfig*);
- void writeConfig(KConfig*);
+ void readConfig(TDEConfig*);
+ void writeConfig(TDEConfig*);
virtual bool openURL(const KURL & url);
@@ -227,7 +227,7 @@ protected:
/**
* Saves information to restore the last working state
*/
- void saveLastURL(KConfig*);
+ void saveLastURL(TDEConfig*);
private:
diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp
index 87d59980..02464423 100644
--- a/kimagemapeditor/kimedialogs.cpp
+++ b/kimagemapeditor/kimedialogs.cpp
@@ -749,7 +749,7 @@ void ImageMapChooseDialog::slotMapChanged(int i) {
selectImageWithUsemap(currentMap->name);
}
-PreferencesDialog::PreferencesDialog(TQWidget *parent, KConfig* conf)
+PreferencesDialog::PreferencesDialog(TQWidget *parent, TDEConfig* conf)
: KDialogBase(parent,"",true,i18n("Preferences"),Ok|Apply|Cancel,Ok,true)
{
config = conf;
diff --git a/kimagemapeditor/kimedialogs.h b/kimagemapeditor/kimedialogs.h
index 02a3bf24..ed965f06 100644
--- a/kimagemapeditor/kimedialogs.h
+++ b/kimagemapeditor/kimedialogs.h
@@ -175,13 +175,13 @@ class ImageMapChooseDialog : public KDialogBase {
};
-class KConfig;
+class TDEConfig;
class PreferencesDialog : public KDialogBase {
Q_OBJECT
public:
- PreferencesDialog(TQWidget *parent,KConfig*);
+ PreferencesDialog(TQWidget *parent,TDEConfig*);
~PreferencesDialog();
protected slots:
virtual void slotDefault( void );
@@ -194,7 +194,7 @@ class PreferencesDialog : public KDialogBase {
// TQCheckBox *colorizeAreaChk;
// TQCheckBox *showAltChk;
TQCheckBox *startWithCheck;
- KConfig *config;
+ TDEConfig *config;
};
class KHTMLPart;
diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp
index 1cc8a867..cb7d9e21 100644
--- a/kimagemapeditor/kimeshell.cpp
+++ b/kimagemapeditor/kimeshell.cpp
@@ -185,7 +185,7 @@ void KimeShell::fileOpen()
void KimeShell::readConfig() {
- KConfig *config;
+ TDEConfig *config;
config = kapp->config();
@@ -194,14 +194,14 @@ void KimeShell::readConfig() {
}
-void KimeShell::readConfig(KConfig* config) {
+void KimeShell::readConfig(TDEConfig* config) {
// applyMainWindowSettings(config);
// restoreWindowSize(config);
readDockConfig(config);
}
void KimeShell::writeConfig() {
- KConfig *config;
+ TDEConfig *config;
config = kapp->config();
@@ -209,7 +209,7 @@ void KimeShell::writeConfig() {
writeConfig(config);
}
-void KimeShell::writeConfig(KConfig* config) {
+void KimeShell::writeConfig(TDEConfig* config) {
saveMainWindowSettings(config);
saveWindowSize(config);
writeDockConfig(config);
@@ -218,7 +218,7 @@ void KimeShell::writeConfig(KConfig* config) {
}
-void KimeShell::saveProperties(KConfig *config)
+void KimeShell::saveProperties(TDEConfig *config)
{
//writeConfig(config);
m_part->saveProperties(config);
@@ -226,7 +226,7 @@ void KimeShell::saveProperties(KConfig *config)
}
-void KimeShell::readProperties(KConfig *config)
+void KimeShell::readProperties(TDEConfig *config)
{
readConfig();
m_part->readProperties(config);
diff --git a/kimagemapeditor/kimeshell.h b/kimagemapeditor/kimeshell.h
index 489de23f..8eaf4a3c 100644
--- a/kimagemapeditor/kimeshell.h
+++ b/kimagemapeditor/kimeshell.h
@@ -45,12 +45,12 @@ public:
protected:
void setupActions();
- void readConfig(KConfig*);
- void writeConfig(KConfig*);
+ void readConfig(TDEConfig*);
+ void writeConfig(TDEConfig*);
// virtual bool queryClose();
- virtual void readProperties(KConfig *config);
- virtual void saveProperties(KConfig *config);
+ virtual void readProperties(TDEConfig *config);
+ virtual void saveProperties(TDEConfig *config);
virtual bool queryClose();
virtual bool queryExit();
diff --git a/kimagemapeditor/qextfileinfo.cpp b/kimagemapeditor/qextfileinfo.cpp
index 5ef6d8d0..440e9c78 100644
--- a/kimagemapeditor/qextfileinfo.cpp
+++ b/kimagemapeditor/qextfileinfo.cpp
@@ -143,7 +143,7 @@ bool QExtFileInfo::createDir( const KURL& path )
// debug(d1);
}
// dir2.setPath(dir2.path(-1));
- result = KIO::NetAccess::mkdir(dir2, 0L, -1);
+ result = TDEIO::NetAccess::mkdir(dir2, 0L, -1);
i++;
}
result = exists(path);
@@ -184,7 +184,7 @@ bool QExtFileInfo::exists(const KURL& a_url)
{
// Andras: Don't use it now, as it brings up an extra dialog and need manual
// intervention when usign fish
-// return KIO::NetAccess::exists(a_url, false);
+// return TDEIO::NetAccess::exists(a_url, false);
// No dialog when stating.
if ( a_url.isLocalFile() )
@@ -219,11 +219,11 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString&
lstFilters.append( new TQRegExp(*it, false, true ) );
bJobOK = true;
- KIO::ListJob *job = KIO::listRecursive(startURL, false, true);
- connect(job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList&)),
- this, TQT_SLOT(slotNewEntries(KIO::Job *, const KIO::UDSEntryList&)));
- connect( job, TQT_SIGNAL( result (KIO::Job *) ),
- this, TQT_SLOT( slotResult (KIO::Job *) ) );
+ TDEIO::ListJob *job = TDEIO::listRecursive(startURL, false, true);
+ connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)),
+ this, TQT_SLOT(slotNewEntries(TDEIO::Job *, const TDEIO::UDSEntryList&)));
+ connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+ this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
// kdDebug(24000) << "Now listing: " << startURL.url() << endl;
enter_loop();
@@ -238,17 +238,17 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString&
}
-//Some hackery from KIO::NetAccess as they do not do exactly what we want
+//Some hackery from TDEIO::NetAccess as they do not do exactly what we want
/* return true if the url exists*/
bool QExtFileInfo::internalExists(const KURL& url)
{
bJobOK = true;
// kdDebug(24000)<<"QExtFileInfo::internalExists"<<endl;
- KIO::StatJob * job = KIO::stat( url, false);
+ TDEIO::StatJob * job = TDEIO::stat( url, false);
job->setDetails(0);
job->setSide(false); //check the url for writing
- 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 *) ) );
//To avoid lock-ups, start a timer.
TQTimer::singleShot(10*1000, this,TQT_SLOT(slotTimeout()));
@@ -263,11 +263,11 @@ bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permiss
{
bJobOK = true; // success unless further error occurs
- KIO::Scheduler::checkSlaveOnHold(true);
- KIO::Job * job = KIO::file_copy( src, target, permissions, overwrite, resume );
+ TDEIO::Scheduler::checkSlaveOnHold(true);
+ TDEIO::Job * job = TDEIO::file_copy( src, target, permissions, overwrite, resume );
job->setWindow (window);
- 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 *) ) );
enter_loop();
return bJobOK;
@@ -288,7 +288,7 @@ void QExtFileInfo::enter_loop()
tqt_leave_modal(&dummy);
}
-void QExtFileInfo::slotResult( KIO::Job * job )
+void QExtFileInfo::slotResult( TDEIO::Job * job )
{
bJobOK = !job->error();
if ( !bJobOK )
@@ -296,30 +296,30 @@ void QExtFileInfo::slotResult( KIO::Job * job )
if ( !lastErrorMsg )
lastErrorMsg = job->errorString();
}
- if ( job->isA("KIO::StatJob") )
- m_entry = static_cast<KIO::StatJob *>(job)->statResult();
+ if ( job->isA("TDEIO::StatJob") )
+ m_entry = static_cast<TDEIO::StatJob *>(job)->statResult();
tqApp->exit_loop();
}
-void QExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsList)
+void QExtFileInfo::slotNewEntries(TDEIO::Job *job, const TDEIO::UDSEntryList& udsList)
{
- KURL url = static_cast<KIO::ListJob *>(job)->url();
+ KURL url = static_cast<TDEIO::ListJob *>(job)->url();
url.adjustPath(-1);
// avoid creating these TQStrings again and again
static const TQString& dot = TDEGlobal::staticQString(".");
static const TQString& dotdot = TDEGlobal::staticQString("..");
- KIO::UDSEntryListConstIterator it = udsList.begin();
- KIO::UDSEntryListConstIterator end = udsList.end();
+ TDEIO::UDSEntryListConstIterator it = udsList.begin();
+ TDEIO::UDSEntryListConstIterator end = udsList.end();
KURL itemURL;
for ( ; it != end; ++it )
{
TQString name;
// find out about the name
- KIO::UDSEntry::ConstIterator entit = (*it).begin();
+ TDEIO::UDSEntry::ConstIterator entit = (*it).begin();
for( ; entit != (*it).end(); ++entit )
- if ( (*entit).m_uds == KIO::UDS_NAME )
+ if ( (*entit).m_uds == TDEIO::UDS_NAME )
{
name = (*entit).m_str;
break;
diff --git a/kimagemapeditor/qextfileinfo.h b/kimagemapeditor/qextfileinfo.h
index 210dd617..b064bcd8 100644
--- a/kimagemapeditor/qextfileinfo.h
+++ b/kimagemapeditor/qextfileinfo.h
@@ -55,7 +55,7 @@ private:
bool bJobOK;
static TQString lastErrorMsg;
- KIO::UDSEntry m_entry;
+ TDEIO::UDSEntry m_entry;
KURL::List dirListItems;
TQPtrList<TQRegExp> lstFilters;
@@ -65,8 +65,8 @@ private:
// friend class I_like_this_class;
private slots:
- void slotResult( KIO::Job * job );
- void slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsList);
+ void slotResult( TDEIO::Job * job );
+ void slotNewEntries(TDEIO::Job *job, const TDEIO::UDSEntryList& udsList);
public slots: // Public slots
/** Timeout occured while waiting for some network function to return. */
void slotTimeout();
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 12:19:56 +0000