TDE
/
kgtk-qt3
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent 54c592a625
commit 2caa54700d
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

2
ChangeLog
Unescape View File

@ -14,7 +14,7 @@
2. When KDialogD is started, write its PID to a file. When each app 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 attempts to connect to KDialogD, it checks if the PID in the file
is still active - if not it starts KDialogD. 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 then check if parent folder exists - and if so, append filename to
that. that.

8
kdialogd3/kdialogd.cpp
Unescape View File

@ -29,7 +29,7 @@
#endif #endif
#include <fstream> #include <fstream>
KConfig *KDialogD::theirConfig=NULL; TDEConfig *KDialogD::theirConfig=NULL;
#define CFG_KEY_DIALOG_SIZE "KDialogDSize" #define CFG_KEY_DIALOG_SIZE "KDialogDSize"
#define CFG_TIMEOUT_GROUP "General" #define CFG_TIMEOUT_GROUP "General"
@ -132,7 +132,7 @@ static void urls2Local(KURL::List &urls, TQStringList &items, TQWidget *parent)
else else
{ {
#if KDE_IS_VERSION(3, 5, 0) #if KDE_IS_VERSION(3, 5, 0)
KURL url(KIO::NetAccess::mostLocalURL(*it, parent)); KURL url(TDEIO::NetAccess::mostLocalURL(*it, parent));
if(url.isLocalFile()) if(url.isLocalFile())
items.append(url.path()); items.append(url.path());
@ -170,7 +170,7 @@ KDialogD::KDialogD(TQObject *parent)
f.close(); f.close();
} }
if(!theirConfig) if(!theirConfig)
theirConfig=new KConfig("kdialogdrc", false, false); theirConfig=new TDEConfig("kdialogdrc", false, false);
connect(new TQSocketNotifier(itsFd, TQSocketNotifier::Read, this), connect(new TQSocketNotifier(itsFd, TQSocketNotifier::Read, this),
TQT_SIGNAL(activated(int)), this, TQT_SLOT(newConnection())); TQT_SIGNAL(activated(int)), this, TQT_SLOT(newConnection()));
@ -583,7 +583,7 @@ void KDialogDFileDialog::slotOk()
good=false; good=false;
} }
else if(itsConfirmOw && KFileDialog::Saving==operationMode()) 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, KMessageBox::Continue==KMessageBox::warningContinueCancel(this,
i18n("File %1 exists.\nDo you want to replace it?") i18n("File %1 exists.\nDo you want to replace it?")
.arg(urls.first().prettyURL()), .arg(urls.first().prettyURL()),

6
kdialogd3/kdialogd.h
Unescape View File

@ -14,7 +14,7 @@ class TQTimer;
#include <kdedmodule.h> #include <kdedmodule.h>
#endif #endif
class KDialogBase; class KDialogBase;
class KConfig; class TDEConfig;
class KDialogDFileDialog : public KFileDialog class KDialogDFileDialog : public KFileDialog
{ {
@ -123,7 +123,7 @@ class KDialogD : public TQObject
void deleteConnection(KDialogDClient *client); void deleteConnection(KDialogDClient *client);
void timeout(); void timeout();
static KConfig * config() { return theirConfig; } static TDEConfig * config() { return theirConfig; }
private: private:
@ -134,7 +134,7 @@ class KDialogD : public TQObject
int itsFd, int itsFd,
itsNumConnections; itsNumConnections;
static KConfig *theirConfig; static TDEConfig *theirConfig;
}; };
#ifndef KDIALOGD_APP #ifndef KDIALOGD_APP

Write Preview
Loading…
Cancel
Save