Sfoglia il codice sorgente

Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 6 anni fa
parent
commit
2caa54700d
3 ha cambiato i file con 8 aggiunte e 8 eliminazioni
  1. +1
    -1
      ChangeLog
  2. +4
    -4
      kdialogd3/kdialogd.cpp
  3. +3
    -3
      kdialogd3/kdialogd.h

+ 1
- 1
ChangeLog Vedi File

@@ -14,7 +14,7 @@
2. When KDialogD is started, write its PID to a file. When each app
attempts to connect to KDialogD, it checks if the PID in the file
is still active - if not it starts KDialogD.
3. KIO::NetAccess::mostLocalUrl fails if a file does not exist. If so,
3. TDEIO::NetAccess::mostLocalUrl fails if a file does not exist. If so,
then check if parent folder exists - and if so, append filename to
that.


+ 4
- 4
kdialogd3/kdialogd.cpp Vedi File

@@ -29,7 +29,7 @@
#endif
#include <fstream>

KConfig *KDialogD::theirConfig=NULL;
TDEConfig *KDialogD::theirConfig=NULL;

#define CFG_KEY_DIALOG_SIZE "KDialogDSize"
#define CFG_TIMEOUT_GROUP "General"
@@ -132,7 +132,7 @@ static void urls2Local(KURL::List &urls, TQStringList &items, TQWidget *parent)
else
{
#if KDE_IS_VERSION(3, 5, 0)
KURL url(KIO::NetAccess::mostLocalURL(*it, parent));
KURL url(TDEIO::NetAccess::mostLocalURL(*it, parent));

if(url.isLocalFile())
items.append(url.path());
@@ -170,7 +170,7 @@ KDialogD::KDialogD(TQObject *parent)
f.close();
}
if(!theirConfig)
theirConfig=new KConfig("kdialogdrc", false, false);
theirConfig=new TDEConfig("kdialogdrc", false, false);

connect(new TQSocketNotifier(itsFd, TQSocketNotifier::Read, this),
TQT_SIGNAL(activated(int)), this, TQT_SLOT(newConnection()));
@@ -583,7 +583,7 @@ void KDialogDFileDialog::slotOk()
good=false;
}
else if(itsConfirmOw && KFileDialog::Saving==operationMode())
good=!KIO::NetAccess::exists(urls.first(), false, this) ||
good=!TDEIO::NetAccess::exists(urls.first(), false, this) ||
KMessageBox::Continue==KMessageBox::warningContinueCancel(this,
i18n("File %1 exists.\nDo you want to replace it?")
.arg(urls.first().prettyURL()),

+ 3
- 3
kdialogd3/kdialogd.h Vedi File

@@ -14,7 +14,7 @@ class TQTimer;
#include <kdedmodule.h>
#endif
class KDialogBase;
class KConfig;
class TDEConfig;

class KDialogDFileDialog : public KFileDialog
{
@@ -123,7 +123,7 @@ class KDialogD : public TQObject
void deleteConnection(KDialogDClient *client);
void timeout();

static KConfig * config() { return theirConfig; }
static TDEConfig * config() { return theirConfig; }

private:

@@ -134,7 +134,7 @@ class KDialogD : public TQObject
int itsFd,
itsNumConnections;

static KConfig *theirConfig;
static TDEConfig *theirConfig;
};

#ifndef KDIALOGD_APP

Loading…
Annulla
Salva