Browse Source

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

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
3c5631f74d
100 changed files with 425 additions and 425 deletions
  1. +1
    -1
      kamera/kcontrol/kamera.cpp
  2. +2
    -2
      kamera/kcontrol/kamera.h
  3. +2
    -2
      kamera/kcontrol/kameradevice.cpp
  4. +4
    -4
      kamera/kcontrol/kameradevice.h
  5. +23
    -23
      kamera/kioslave/kamera.cpp
  6. +4
    -4
      kamera/kioslave/kamera.h
  7. +2
    -2
      kcoloredit/kcoloredit.h
  8. +3
    -3
      kdvi/dviRenderer.cpp
  9. +1
    -1
      kdvi/infodialog.cpp
  10. +1
    -1
      kdvi/kdvi_multipage.cpp
  11. +1
    -1
      kdvi/kdvi_multipage.h
  12. +3
    -3
      kfax/kfax.cpp
  13. +2
    -2
      kfax/kfax.h
  14. +6
    -6
      kgamma/kcmkgamma/kgamma.cpp
  15. +1
    -1
      kgamma/kcmkgamma/kgamma.h
  16. +1
    -1
      kghostview/displayoptions.h
  17. +2
    -2
      kghostview/kghostview.upd
  18. +13
    -13
      kghostview/kgv_view.cpp
  19. +3
    -3
      kghostview/kgv_view.h
  20. +2
    -2
      kghostview/kgvconfigdialog.cpp
  21. +1
    -1
      kghostview/kgvdocument.cpp
  22. +2
    -2
      kghostview/kgvshell.cpp
  23. +3
    -3
      kghostview/kgvshell.h
  24. +2
    -2
      kiconedit/kicon.cpp
  25. +3
    -3
      kiconedit/kiconedit.cpp
  26. +2
    -2
      kiconedit/kiconedit.h
  27. +2
    -2
      kiconedit/knew.cpp
  28. +2
    -2
      kiconedit/properties.cpp
  29. +1
    -1
      kmrml/kmrml/kcontrol/kcmkmrml.cpp
  30. +1
    -1
      kmrml/kmrml/kcontrol/kcmkmrml.h
  31. +1
    -1
      kmrml/kmrml/kcontrol/mainpage.cpp
  32. +4
    -4
      kmrml/kmrml/lib/kmrml_config.cpp
  33. +4
    -4
      kmrml/kmrml/lib/kmrml_config.h
  34. +10
    -10
      kmrml/kmrml/loader.cpp
  35. +4
    -4
      kmrml/kmrml/loader.h
  36. +4
    -4
      kmrml/kmrml/mrml.cpp
  37. +1
    -1
      kmrml/kmrml/mrml.h
  38. +18
    -18
      kmrml/kmrml/mrml_part.cpp
  39. +7
    -7
      kmrml/kmrml/mrml_part.h
  40. +4
    -4
      kolourpaint/kpcommandhistory.cpp
  41. +9
    -9
      kolourpaint/kpdocument.cpp
  42. +12
    -12
      kolourpaint/kpdocumentsaveoptions.cpp
  43. +12
    -12
      kolourpaint/kpdocumentsaveoptions.h
  44. +6
    -6
      kolourpaint/kpdocumentsaveoptionswidget.cpp
  45. +11
    -11
      kolourpaint/kpmainwindow.cpp
  46. +2
    -2
      kolourpaint/kpmainwindow.h
  47. +15
    -15
      kolourpaint/kpmainwindow_file.cpp
  48. +2
    -2
      kolourpaint/kpmainwindow_help.cpp
  49. +4
    -4
      kolourpaint/kpmainwindow_image.cpp
  50. +2
    -2
      kolourpaint/kpmainwindow_settings.cpp
  51. +14
    -14
      kolourpaint/kpmainwindow_text.cpp
  52. +4
    -4
      kolourpaint/kpmainwindow_tools.cpp
  53. +10
    -10
      kolourpaint/kpmainwindow_view.cpp
  54. +4
    -4
      kolourpaint/pixmapfx/kpeffectflatten.cpp
  55. +2
    -2
      kolourpaint/pixmapfx/kppixmapfx.cpp
  56. +2
    -2
      kolourpaint/widgets/kptooltoolbar.cpp
  57. +4
    -4
      kolourpaint/widgets/kptoolwidgetbase.cpp
  58. +1
    -1
      kooka/CHANGES
  59. +10
    -10
      kooka/img_saver.cpp
  60. +9
    -9
      kooka/kocrbase.cpp
  61. +1
    -1
      kooka/kocrbase.h
  62. +2
    -2
      kooka/kocrgocr.cpp
  63. +4
    -4
      kooka/kocrkadmos.cpp
  64. +1
    -1
      kooka/kocrkadmos.h
  65. +2
    -2
      kooka/kocrocrad.cpp
  66. +4
    -4
      kooka/kooka.cpp
  67. +3
    -3
      kooka/kooka.h
  68. +1
    -1
      kooka/kookapref.cpp
  69. +2
    -2
      kooka/kookapref.h
  70. +2
    -2
      kooka/kookaview.cpp
  71. +2
    -2
      kooka/kookaview.h
  72. +4
    -4
      kooka/ksaneocr.cpp
  73. +2
    -2
      kooka/ksaneocr.h
  74. +6
    -6
      kooka/scanpackager.cpp
  75. +5
    -5
      kooka/scanpackager.h
  76. +7
    -7
      kooka/thumbview.cpp
  77. +4
    -4
      kooka/thumbview.h
  78. +1
    -1
      kpdf/TODO
  79. +2
    -2
      kpdf/conf/preferencesdialog.cpp
  80. +3
    -3
      kpdf/conf/preferencesdialog.h
  81. +8
    -8
      kpdf/part.cpp
  82. +5
    -5
      kpdf/part.h
  83. +4
    -4
      kpdf/shell/shell.cpp
  84. +5
    -5
      kpdf/shell/shell.h
  85. +2
    -2
      kpovmodeler/pmcontrolpoint.cpp
  86. +3
    -3
      kpovmodeler/pmcontrolpoint.h
  87. +2
    -2
      kpovmodeler/pmdialogeditbase.cpp
  88. +3
    -3
      kpovmodeler/pmdialogeditbase.h
  89. +8
    -8
      kpovmodeler/pmdockwidget.cpp
  90. +16
    -16
      kpovmodeler/pmdockwidget.h
  91. +2
    -2
      kpovmodeler/pmdocumentationmap.cpp
  92. +3
    -3
      kpovmodeler/pmdocumentationmap.h
  93. +2
    -2
      kpovmodeler/pmerrordialog.cpp
  94. +3
    -3
      kpovmodeler/pmerrordialog.h
  95. +2
    -2
      kpovmodeler/pmglview.cpp
  96. +3
    -3
      kpovmodeler/pmglview.h
  97. +3
    -3
      kpovmodeler/pmlibrarybrowser.cpp
  98. +3
    -3
      kpovmodeler/pmlibrarybrowser.h
  99. +2
    -2
      kpovmodeler/pmlibraryhandleedit.cpp
  100. +0
    -0
      kpovmodeler/pmlibraryhandleedit.h

+ 1
- 1
kamera/kcontrol/kamera.cpp View File

@@ -49,7 +49,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kamera, KKameraConfigFactory( "kcmkamera" ) )
KKameraConfig *KKameraConfig::m_instance = NULL;

KKameraConfig::KKameraConfig(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(KKameraConfigFactory::instance(), parent, name)
: TDECModule(KKameraConfigFactory::instance(), parent, name)
{
m_devicePopup = new KPopupMenu(this);
m_actions = new KActionCollection(this);

+ 2
- 2
kamera/kcontrol/kamera.h View File

@@ -44,7 +44,7 @@ class KActionCollection;
class KToolBar;
class KPopupMenu;

class KKameraConfig : public KCModule
class KKameraConfig : public TDECModule
{
Q_OBJECT
@@ -54,7 +54,7 @@ public:
KKameraConfig(TQWidget *parent, const char *name, const TQStringList &);
virtual ~KKameraConfig();

// KCModule interface methods
// TDECModule interface methods
void load();
void load(bool useDefaults);
void save();

+ 2
- 2
kamera/kcontrol/kameradevice.cpp View File

@@ -190,7 +190,7 @@ bool KCamera::test()
return camera() != 0;
}

void KCamera::load(KConfig *config)
void KCamera::load(TDEConfig *config)
{
config->setGroup(m_name);
if (m_model.isNull())
@@ -200,7 +200,7 @@ void KCamera::load(KConfig *config)
invalidateCamera();
}

void KCamera::save(KConfig *config)
void KCamera::save(TDEConfig *config)
{
config->setGroup(m_name);
config->writeEntry("Model", m_model);

+ 4
- 4
kamera/kcontrol/kameradevice.h View File

@@ -27,7 +27,7 @@
#include <kdialogbase.h>
#include <config.h>

class KConfig;
class TDEConfig;
class TQString;
class KListView;
class TQWidgetStack;
@@ -46,8 +46,8 @@ public:
~KCamera();
void invalidateCamera();
bool configure();
void load(KConfig *m_config);
void save(KConfig *m_config);
void load(TDEConfig *m_config);
void save(TDEConfig *m_config);
bool test();
TQStringList supportedPorts();

@@ -78,7 +78,7 @@ protected:
// int frontend_prompt(Camera *camera, CameraWidget *widgets);

Camera *m_camera;
// KConfig *m_config;
// TDEConfig *m_config;
TQString m_name; // the camera's real name
TQString m_model;
TQString m_path;

+ 23
- 23
kamera/kioslave/kamera.cpp View File

@@ -49,7 +49,7 @@

#define tocstr(x) ((x).local8Bit())

using namespace KIO;
using namespace TDEIO;

extern "C"
{
@@ -213,12 +213,12 @@ void KameraProtocol::get(const KURL &url)
CameraFileType fileType;
int gpr;
if (url.host().isEmpty()) {
error(KIO::ERR_DOES_NOT_EXIST, url.path());
error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
return;
}

if(!openCamera()) {
error(KIO::ERR_DOES_NOT_EXIST, url.path());
error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
return;
}

@@ -229,7 +229,7 @@ void KameraProtocol::get(const KURL &url)
CameraText xx; \
gpr = gp_camera_get_##xx(m_camera, &xx, m_context); \
if (gpr != GP_OK) { \
error(KIO::ERR_DOES_NOT_EXIST, url.path()); \
error(TDEIO::ERR_DOES_NOT_EXIST, url.path()); \
return; \
} \
TQByteArray chunkDataBuffer; \
@@ -260,9 +260,9 @@ void KameraProtocol::get(const KURL &url)
// fprintf(stderr,"Folder %s / File %s not found, gpr is %d\n",folder.latin1(), url.fileName().latin1(), gpr);
gp_file_unref(m_file);
if ((gpr == GP_ERROR_FILE_NOT_FOUND) || (gpr == GP_ERROR_DIRECTORY_NOT_FOUND))
error(KIO::ERR_DOES_NOT_EXIST, url.path());
error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
else
error(KIO::ERR_UNKNOWN, gp_result_as_string(gpr));
error(TDEIO::ERR_UNKNOWN, gp_result_as_string(gpr));
return;
}

@@ -301,12 +301,12 @@ void KameraProtocol::get(const KURL &url)
case GP_ERROR_DIRECTORY_NOT_FOUND:
gp_file_unref(m_file);
m_file = NULL;
error(KIO::ERR_DOES_NOT_EXIST, url.fileName());
error(TDEIO::ERR_DOES_NOT_EXIST, url.fileName());
return ;
default:
gp_file_unref(m_file);
m_file = NULL;
error(KIO::ERR_UNKNOWN, gp_result_as_string(gpr));
error(TDEIO::ERR_UNKNOWN, gp_result_as_string(gpr));
return;
}
// emit the mimetype
@@ -326,7 +326,7 @@ void KameraProtocol::get(const KURL &url)
kdDebug(7123) << "get():: get_data_and_size failed." << endl;
gp_file_free(m_file);
m_file = NULL;
error(KIO::ERR_UNKNOWN, gp_result_as_string(gpr));
error(TDEIO::ERR_UNKNOWN, gp_result_as_string(gpr));
return;
}
// make sure we're not sending zero-sized chunks (=EOF)
@@ -419,7 +419,7 @@ void KameraProtocol::statRegular(const KURL &url)

kdDebug(7123) << "statRegular(\"" << url.path() << "\")" << endl;
if (openCamera() == false) {
error(KIO::ERR_DOES_NOT_EXIST, url.path());
error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
return;
}

@@ -433,9 +433,9 @@ void KameraProtocol::statRegular(const KURL &url)
gpr = gp_camera_folder_list_folders(m_camera, tocstr(fix_foldername(url.directory(false))), dirList, m_context);
if (gpr != GP_OK) {
if ((gpr == GP_ERROR_FILE_NOT_FOUND) || (gpr == GP_ERROR_DIRECTORY_NOT_FOUND))
error(KIO::ERR_DOES_NOT_EXIST, url.path());
error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
else
error(KIO::ERR_UNKNOWN, gp_result_as_string(gpr));
error(TDEIO::ERR_UNKNOWN, gp_result_as_string(gpr));
gp_list_free(dirList);
return;
}
@@ -445,7 +445,7 @@ void KameraProtocol::statRegular(const KURL &url)
CameraText xx; \
gpr = gp_camera_get_about(m_camera, &xx, m_context); \
if (gpr != GP_OK) { \
error(KIO::ERR_DOES_NOT_EXIST, url.fileName()); \
error(TDEIO::ERR_DOES_NOT_EXIST, url.fileName()); \
return; \
} \
translateTextToUDS(entry,#xx".txt",xx.text); \
@@ -477,9 +477,9 @@ void KameraProtocol::statRegular(const KURL &url)
gpr = gp_camera_file_get_info(m_camera, tocstr(fix_foldername(url.directory(false))), tocstr(url.fileName()), &info, m_context);
if (gpr != GP_OK) {
if ((gpr == GP_ERROR_FILE_NOT_FOUND) || (gpr == GP_ERROR_DIRECTORY_NOT_FOUND))
error(KIO::ERR_DOES_NOT_EXIST, url.path());
error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
else
error(KIO::ERR_UNKNOWN, gp_result_as_string(gpr));
error(TDEIO::ERR_UNKNOWN, gp_result_as_string(gpr));
return;
}
translateFileToUDS(entry, info, url.fileName());
@@ -493,11 +493,11 @@ void KameraProtocol::del(const KURL &url, bool isFile)
kdDebug(7123) << "KameraProtocol::del(" << url.path() << ")" << endl;

if(!openCamera()) {
error(KIO::ERR_CANNOT_DELETE, url.fileName());
error(TDEIO::ERR_CANNOT_DELETE, url.fileName());
return;
}
if (!cameraSupportsDel()) {
error(KIO::ERR_CANNOT_DELETE, url.fileName());
error(TDEIO::ERR_CANNOT_DELETE, url.fileName());
return;
}
if(isFile){
@@ -508,7 +508,7 @@ void KameraProtocol::del(const KURL &url, bool isFile)
ret = gp_camera_file_delete(m_camera, tocstr(fix_foldername(url.directory(false))), tocstr(url.fileName()), m_context);

if(ret != GP_OK) {
error(KIO::ERR_CANNOT_DELETE, url.fileName());
error(TDEIO::ERR_CANNOT_DELETE, url.fileName());
} else {
finished();
}
@@ -665,7 +665,7 @@ void KameraProtocol::listDir(const KURL &url)
}

if (!openCamera()) {
error(KIO::ERR_COULD_NOT_READ,url.path());
error(TDEIO::ERR_COULD_NOT_READ,url.path());
return;
}

@@ -693,7 +693,7 @@ void KameraProtocol::listDir(const KURL &url)
gp_list_free(dirList);
gp_list_free(fileList);
gp_list_free(specialList);
error(KIO::ERR_COULD_NOT_READ, gp_result_as_string(gpr));
error(TDEIO::ERR_COULD_NOT_READ, gp_result_as_string(gpr));
return;
}

@@ -787,7 +787,7 @@ void KameraProtocol::setHost(const TQString& host, int port, const TQString& use
if (idx < 0) {
gp_port_info_list_free(port_info_list);
kdDebug(7123) << "Unable to get port info for path: " << host << endl;
error(KIO::ERR_UNKNOWN, gp_result_as_string(idx));
error(TDEIO::ERR_UNKNOWN, gp_result_as_string(idx));
return;
}
gp_port_info_list_get_info(port_info_list, idx, &port_info);
@@ -796,7 +796,7 @@ void KameraProtocol::setHost(const TQString& host, int port, const TQString& use
// create a new camera object
gpr = gp_camera_new(&m_camera);
if(gpr != GP_OK) {
error(KIO::ERR_UNKNOWN, gp_result_as_string(gpr));
error(TDEIO::ERR_UNKNOWN, gp_result_as_string(gpr));
return;
}

@@ -816,7 +816,7 @@ void KameraProtocol::setHost(const TQString& host, int port, const TQString& use
TQString errstr;
if (!openCamera(errstr)) {
kdDebug(7123) << "Unable to init camera: " << gp_result_as_string(gpr) << endl;
error(KIO::ERR_SERVICE_NOT_AVAILABLE, errstr);
error(TDEIO::ERR_SERVICE_NOT_AVAILABLE, errstr);
gp_camera_exit(m_camera, m_context);
return;
}

+ 4
- 4
kamera/kioslave/kamera.h View File

@@ -29,7 +29,7 @@

class KSimpleConfig;

class KameraProtocol : public KIO::SlaveBase
class KameraProtocol : public TDEIO::SlaveBase
{
public:
KameraProtocol(const TQCString &pool, const TQCString &app);
@@ -63,9 +63,9 @@ private:

void statRoot(void);
void statRegular(const KURL &url);
void translateTextToUDS(KIO::UDSEntry &udsEntry, const TQString &info, const char *txt);
void translateFileToUDS(KIO::UDSEntry &udsEntry, const CameraFileInfo &info, TQString name);
void translateDirectoryToUDS(KIO::UDSEntry &udsEntry, const TQString &dirname);
void translateTextToUDS(TDEIO::UDSEntry &udsEntry, const TQString &info, const char *txt);
void translateFileToUDS(TDEIO::UDSEntry &udsEntry, const CameraFileInfo &info, TQString name);
void translateDirectoryToUDS(TDEIO::UDSEntry &udsEntry, const TQString &dirname);
bool cameraSupportsPreview(void);
bool cameraSupportsDel(void);
bool cameraSupportsPut(void);

+ 2
- 2
kcoloredit/kcoloredit.h View File

@@ -45,7 +45,7 @@ class KColorEditView;
* full session management as well as keyboard accelerator configuration by using KAccel.
* @see KMainWindow
* @see TDEApplication
* @see KConfig
* @see TDEConfig
* @see KAccel
*
* @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
@@ -166,7 +166,7 @@ class KColorEditApp : public KMainWindow
private:

/** the configuration object of the application */
KConfig *config;
TDEConfig *config;

KAction *m_actSave, *m_actCut, *m_actCopy, *m_actPaste, *m_actPalette;
KToggleAction *m_actNames;

+ 3
- 3
kdvi/dviRenderer.cpp View File

@@ -254,8 +254,8 @@ void dviRenderer::showThatSourceInformationIsPresent()
// here. Most of the code is stolen from there.
// Check if the 'Don't show again' feature was used
KConfig *config = kapp->config();
KConfigGroupSaver saver( config, "Notification Messages" );
TDEConfig *config = kapp->config();
TDEConfigGroupSaver saver( config, "Notification Messages" );
bool showMsg = config->readBoolEntry( "KDVI-info_on_source_specials", true);
if (showMsg) {
@@ -294,7 +294,7 @@ void dviRenderer::showThatSourceInformationIsPresent()
showMsg = !checkbox->isChecked();
if (!showMsg) {
KConfigGroupSaver saver( config, "Notification Messages" );
TDEConfigGroupSaver saver( config, "Notification Messages" );
config->writeEntry( "KDVI-info_on_source_specials", showMsg);
}
config->sync();

+ 1
- 1
kdvi/infodialog.cpp View File

@@ -68,7 +68,7 @@ void infoDialog::setDVIData(dvifile *dviFile)

TQFile file(dviFile->filename);
if (file.exists())
text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("File Size")).arg(KIO::convertSize(file.size())));
text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("File Size")).arg(TDEIO::convertSize(file.size())));
else
text.append(TQString("<tr><td><b> </b></td> <td>%1</td></tr>").arg(i18n("The file does no longer exist.")));


+ 1
- 1
kdvi/kdvi_multipage.cpp View File

@@ -198,7 +198,7 @@ TQStringList KDVIMultiPage::fileFormats() const
}


void KDVIMultiPage::addConfigDialogs(KConfigDialog* configDialog)
void KDVIMultiPage::addConfigDialogs(TDEConfigDialog* configDialog)
{
static optionDialogFontsWidget* fontConfigWidget = 0;

+ 1
- 1
kdvi/kdvi_multipage.h View File

@@ -32,7 +32,7 @@ public:
/// method and return true here.
virtual bool isReadWrite() {return true;}

virtual void addConfigDialogs(KConfigDialog* configDialog);
virtual void addConfigDialogs(TDEConfigDialog* configDialog);

static TDEAboutData* createAboutData();


+ 3
- 3
kfax/kfax.cpp View File

@@ -828,7 +828,7 @@ void TopLevel::saveNetFile( const KURL& dest)
statusbar->message( i18n( "Saving..." ) );
KURL source = KURL::fromPathOrURL(thispage->pathname);
bool ok = KIO::NetAccess::file_copy( source, dest, -1, true, false, this);
bool ok = TDEIO::NetAccess::file_copy( source, dest, -1, true, false, this);

statusbar->clear();

@@ -856,13 +856,13 @@ void TopLevel::openNetFile( const KURL &u)
{
statusbar->message(i18n("Downloading..."));
TQString tmpFile = TQString();
if ( KIO::NetAccess::download( u, tmpFile, this ) )
if ( TDEIO::NetAccess::download( u, tmpFile, this ) )
{
openadd( tmpFile );
setCaption( u.prettyURL() );
}
statusbar->clear();
KIO::NetAccess::removeTempFile( tmpFile );
TDEIO::NetAccess::removeTempFile( tmpFile );
}
}


+ 2
- 2
kfax/kfax.h View File

@@ -36,7 +36,7 @@
#define Pimage(p) ((XImage *)(p)->extra)

class TQPopupMenu;
class KConfig;
class TDEConfig;
class KStatusBar;
class KAction;
class KRecentFilesAction;
@@ -112,7 +112,7 @@ private:

int open_mode;

KConfig *config;
TDEConfig *config;

TQScrollBar *hsb;
TQScrollBar *vsb;

+ 6
- 6
kgamma/kcmkgamma/kgamma.cpp View File

@@ -56,7 +56,7 @@ extern "C"
}

KGamma::KGamma(TQWidget *parent, const char *name, const TQStringList&)
:KCModule(parent,name)
:TDECModule(parent,name)
{
bool ok;
GammaCorrection = true;
@@ -291,7 +291,7 @@ void KGamma::load() {
/** Restore latest saved gamma values */
void KGamma::load(bool useDefaults) {
if (GammaCorrection) {
KConfig *config = new KConfig("kgammarc");
TDEConfig *config = new TDEConfig("kgammarc");

config->setReadDefaults( useDefaults );

@@ -344,7 +344,7 @@ void KGamma::save() {
}
xv->setScreen(currentScreen);

KConfig *config = new KConfig("kgammarc");
TDEConfig *config = new TDEConfig("kgammarc");
config->setGroup("SyncBox");
if ( syncbox->isChecked() ) config->writeEntry("sync", "yes");
else config->writeEntry("sync", "no");
@@ -385,7 +385,7 @@ void KGamma::defaults() {
}

bool KGamma::loadSettings() {
KConfig *config = new KConfig("kgammarc");
TDEConfig *config = new TDEConfig("kgammarc");
config->setGroup("ConfigFile");
TQString ConfigFile( config->readEntry("use") );
config->setGroup("SyncBox");
@@ -402,7 +402,7 @@ bool KGamma::loadSettings() {
}

bool KGamma::loadUserSettings() {
KConfig *config = new KConfig("kgammarc");
TDEConfig *config = new TDEConfig("kgammarc");

for (int i = 0; i < ScreenCount; i++) {
config->setGroup(TQString( "Screen %1" ).arg(i) );
@@ -606,7 +606,7 @@ extern "C"
if (ok) {
xv.setGammaLimits(0.4, 3.5);
float rgamma, ggamma, bgamma;
KConfig *config = new KConfig("kgammarc");
TDEConfig *config = new TDEConfig("kgammarc");

for (int i = 0; i < xv._ScreenCount(); i++) {
xv.setScreen(i);

+ 1
- 1
kgamma/kcmkgamma/kgamma.h View File

@@ -25,7 +25,7 @@ class TQComboBox;
class XVidExtWrap;
class TDEProcess;

class KGamma: public KCModule
class KGamma: public TDECModule
{
Q_OBJECT

+ 1
- 1
kghostview/displayoptions.h View File

@@ -22,7 +22,7 @@
#include "dscparse_adapter.h"
#include <kdemacros.h>
class TDECmdLineArgs;
class KConfig;
class TDEConfig;

class KDE_EXPORT DisplayOptions
{

+ 2
- 2
kghostview/kghostview.upd View File

@@ -1,4 +1,4 @@
Id=1changeToKConfigXT
Id=1changeToTDEConfigXT
File=kghostviewrc
Group=General
Key=Platform Fonts,PlatformFonts
@@ -7,7 +7,7 @@ Key=Antialiasing arguments,AntialiasingArguments
Key=Non-antialiasing arguments,NonAntialiasingArguments
Key=Redetection Counter,RedetectionCounter
#
Id=2changeToKConfigXT
Id=2changeToTDEConfigXT
File=kghostviewrc
Group=General
Script=update-to-xt-names.pl,perl

+ 13
- 13
kghostview/kgv_view.cpp View File

@@ -434,7 +434,7 @@ bool KGVPart::closeURL()

void KGVPart::writeSettings()
{
KConfigGroup general( KGVFactory::instance()->config(), "General" );
TDEConfigGroup general( KGVFactory::instance()->config(), "General" );
if ( !_embeddedInKGhostView )
general.writeEntry( "Display Options", DisplayOptions::toString( miniWidget()->displayOptions() ) );
general.sync();
@@ -442,7 +442,7 @@ void KGVPart::writeSettings()

void KGVPart::readSettings()
{
KConfigGroup general( KGVFactory::instance()->config(), "General" );
TDEConfigGroup general( KGVFactory::instance()->config(), "General" );
_showScrollBars->setChecked( Configuration::showScrollBars() );
showScrollBars( _showScrollBars->isChecked() );
@@ -691,17 +691,17 @@ void KGVPart::openURLContinue()
_tmpFile.open( IO_ReadWrite );

/*
d->m_job = KIO::file_copy( m_url, m_file, 0600, true, false, d->m_showProgressInfo );
d->m_job = TDEIO::file_copy( m_url, m_file, 0600, true, false, d->m_showProgressInfo );
emit started( d->m_job );
connect( d->m_job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( KIO::Job * ) ) );
connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( TDEIO::Job * ) ) );
*/

_job = KIO::get( m_url, false, isProgressInfoEnabled() );
_job = TDEIO::get( m_url, false, isProgressInfoEnabled() );

connect( _job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
connect( _job, TQT_SIGNAL( result( KIO::Job* ) ),
TQT_SLOT( slotJobFinished( KIO::Job* ) ) );
connect( _job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
connect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ),
TQT_SLOT( slotJobFinished( TDEIO::Job* ) ) );

emit started( _job );
}
@@ -770,7 +770,7 @@ void KGVPart::guiActivateEvent( KParts::GUIActivateEvent* event )
KParts::ReadOnlyPart::guiActivateEvent( event );
}

void KGVPart::slotData( KIO::Job* job, const TQByteArray& data )
void KGVPart::slotData( TDEIO::Job* job, const TQByteArray& data )
{
Q_ASSERT( _job == job );

@@ -799,7 +799,7 @@ void KGVPart::slotMimetypeError()
emit canceled( TQString() );
}

void KGVPart::slotJobFinished( KIO::Job* job )
void KGVPart::slotJobFinished( TDEIO::Job* job )
{
Q_ASSERT( _job == job );

@@ -1006,9 +1006,9 @@ void KGVRun::foundMimeType( const TQString& mimetype )
{
kdDebug(4500) << "KGVRun::foundMimeType( " << mimetype << " )" << endl;

if( m_job && m_job->inherits( "KIO::TransferJob" ) )
if( m_job && m_job->inherits( "TDEIO::TransferJob" ) )
{
KIO::TransferJob *job = static_cast< KIO::TransferJob* >( m_job );
TDEIO::TransferJob *job = static_cast< TDEIO::TransferJob* >( m_job );
job->putOnHold();
m_job = 0;
}

+ 3
- 3
kghostview/kgv_view.h View File

@@ -135,8 +135,8 @@ public slots:
void setDisplayOptions( const DisplayOptions& opts );

protected slots:
void slotData( KIO::Job*, const TQByteArray& );
void slotJobFinished( KIO::Job* );
void slotData( TDEIO::Job*, const TQByteArray& );
void slotJobFinished( TDEIO::Job* );

void slotMimetypeFinished( const TQString& );
void slotMimetypeError();
@@ -209,7 +209,7 @@ private:
KPopupMenu* _popup;

TQFile _tmpFile;
KIO::TransferJob* _job;
TDEIO::TransferJob* _job;
KDirWatch* _fileWatcher;
KGVRun* _mimetypeScanner;
TQTimer* _dirtyHandler;

+ 2
- 2
kghostview/kgvconfigdialog.cpp View File

@@ -133,11 +133,11 @@ namespace {

void ConfigDialog::showSettings( KGVPart* main ) {
const char* name = "kghostview-settings";
if ( KConfigDialog::showDialog( name ) ) return;
if ( TDEConfigDialog::showDialog( name ) ) return;

if ( Configuration::redetectionCounter() < currentRedetection ) redoGSDetection();

KConfigDialog* dialog = new KConfigDialog( 0, name,
TDEConfigDialog* dialog = new TDEConfigDialog( 0, name,
Configuration::self(), KDialogBase::IconList );
dialog->addPage( new GeneralSettingsWidget( 0, "general-settings" ),
i18n( "General" ), TQString::fromLatin1( "kghostview" ) );

+ 1
- 1
kghostview/kgvdocument.cpp View File

@@ -565,7 +565,7 @@ void KGVDocument::saveAs()
TQString(),
_part->widget(),
TQString() );
if( !KIO::NetAccess::upload( _fileName,
if( !TDEIO::NetAccess::upload( _fileName,
saveURL,
static_cast<TQWidget*>( 0 ) ) ) {
// TODO: Proper error dialog

+ 2
- 2
kghostview/kgvshell.cpp View File

@@ -173,7 +173,7 @@ void KGVShell::slotReset()
}

void
KGVShell::readProperties( KConfig *config )
KGVShell::readProperties( TDEConfig *config )
{
KURL url = KURL::fromPathOrURL( config->readPathEntry( "URL" ) );
if ( url.isValid() ) {
@@ -184,7 +184,7 @@ KGVShell::readProperties( KConfig *config )
}

void
KGVShell::saveProperties( KConfig* config )
KGVShell::saveProperties( TDEConfig* config )
{
config->writePathEntry( "URL", m_gvpart->url().prettyURL() );
config->writeEntry( "Display Options", DisplayOptions::toString( m_gvpart->miniWidget()->displayOptions() ) );

+ 3
- 3
kghostview/kgvshell.h View File

@@ -29,7 +29,7 @@ class KRecentFilesAction;
class ScrollBox;
class KGVPart;
class KAction;
class KConfig;
class TDEConfig;
class KTempFile;
class KPopupMenu;
class DisplayOptions;
@@ -64,8 +64,8 @@ protected slots:

protected:
// session management
virtual void saveProperties( KConfig *config );
virtual void readProperties( KConfig *config );
virtual void saveProperties( TDEConfig *config );
virtual void readProperties( TDEConfig *config );
void readSettings();
void writeSettings();

+ 2
- 2
kiconedit/kicon.cpp View File

@@ -84,7 +84,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)
}
else
{
if(!KIO::NetAccess::download( url, filename, (TQWidget*)parent() ))
if(!TDEIO::NetAccess::download( url, filename, (TQWidget*)parent() ))
{
TQString msg = i18n("There was an error loading:\n%1\n").arg(url.prettyURL());
KMessageBox::error((TQWidget*)parent(), msg);
@@ -96,7 +96,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)

if(!url.isLocalFile())
{
KIO::NetAccess::removeTempFile( filename );
TDEIO::NetAccess::removeTempFile( filename );
}

if(!loadedOk)

+ 3
- 3
kiconedit/kiconedit.cpp View File

@@ -192,7 +192,7 @@ bool KIconEdit::queryClose()
}

// this is for exit by request of the session manager
void KIconEdit::saveProperties(KConfig *config )
void KIconEdit::saveProperties(TDEConfig *config )
{
kdDebug(4640) << "KIconEdit::saveProperties" << endl;

@@ -200,7 +200,7 @@ void KIconEdit::saveProperties(KConfig *config )
}

// this is for instances opened by the session manager
void KIconEdit::readProperties(KConfig *config)
void KIconEdit::readProperties(TDEConfig *config)
{
kdDebug(4640) << "KIconEdit::readProperties" << endl;

@@ -214,7 +214,7 @@ void KIconEdit::readProperties(KConfig *config)
*/
void KIconEdit::writeConfig()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
m_actRecent->saveEntries( kapp->config() );

KIconEditProperties::self()->save();

+ 2
- 2
kiconedit/kiconedit.h View File

@@ -72,8 +72,8 @@ signals:
void newname(const TQString &);

public slots:
virtual void saveProperties(KConfig*);
virtual void readProperties(KConfig*);
virtual void saveProperties(TDEConfig*);
virtual void readProperties(TDEConfig*);
void updateProperties();

protected slots:

+ 2
- 2
kiconedit/knew.cpp View File

@@ -71,7 +71,7 @@ void createStandardTemplates(KIconTemplateContainer *list)

void KIconTemplateContainer::save()
{
KConfig *k = kapp->config();
TDEConfig *k = kapp->config();
k->setGroup("Templates");
TQStringList names;
@@ -91,7 +91,7 @@ void KIconTemplateContainer::save()
KIconTemplateContainer::KIconTemplateContainer() : TQValueList<KIconTemplate>()
{
TQStrList names;
KConfig *k = kapp->config();
TDEConfig *k = kapp->config();
k->setGroup("Templates");
k->readListEntry("Names", names);
for(int i = 0; i < (int)names.count(); i++)

+ 2
- 2
kiconedit/properties.cpp View File

@@ -35,7 +35,7 @@ KIconEditProperties* KIconEditProperties::self()

KIconEditProperties::KIconEditProperties() : TQObject()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();

config->setGroup( "Appearance" );

@@ -92,7 +92,7 @@ KIconEditProperties::~KIconEditProperties()

void KIconEditProperties::save()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();

config->setGroup( "Appearance" );


+ 1
- 1
kmrml/kmrml/kcontrol/kcmkmrml.cpp View File

@@ -44,7 +44,7 @@ typedef KGenericFactory<KCMKMrml, TQWidget> MrmlFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kmrml, MrmlFactory("kmrml") )

KCMKMrml::KCMKMrml(TQWidget *parent, const char *name, const TQStringList & ):
KCModule(MrmlFactory::instance(), parent, name)
TDECModule(MrmlFactory::instance(), parent, name)
{
TDEAboutData* ab = new TDEAboutData(
"kcmkmrml",

+ 1
- 1
kmrml/kmrml/kcontrol/kcmkmrml.h View File

@@ -28,7 +28,7 @@ namespace KMrmlConfig
{
class MainPage;

class KCMKMrml : public KCModule
class KCMKMrml : public TDECModule
{
Q_OBJECT

+ 1
- 1
kmrml/kmrml/kcontrol/mainpage.cpp View File

@@ -176,7 +176,7 @@ void MainPage::save()
"kcmkmrml_no_directories_specified" );

if ( m_config->sync() )
KIO::SlaveConfig::self()->reset();
TDEIO::SlaveConfig::self()->reset();

processIndexDirs( removedDirs );
}

+ 4
- 4
kmrml/kmrml/lib/kmrml_config.cpp View File

@@ -54,13 +54,13 @@ const int DEFAULT_PORT = 12789;

Config::Config()
{
m_ownConfig = new KConfig( "kio_mrmlrc", false, false );
m_ownConfig = new TDEConfig( "kio_mrmlrc", false, false );
m_config = m_ownConfig;

init();
}

Config::Config( KConfig *config )
Config::Config( TDEConfig *config )
: m_config( config ),
m_ownConfig( 0L )
{
@@ -98,7 +98,7 @@ bool Config::sync()
// mrmlsearch binary can also use this class)
// tell the ioslaves about the new configuration
// if ( notifySlaves )
// KIO::SlaveConfig::self()->reset();
// TDEIO::SlaveConfig::self()->reset();
}

void Config::setDefaultHost( const TQString& host )
@@ -117,7 +117,7 @@ ServerSettings Config::settingsForLocalHost() const

ServerSettings Config::settingsForHost( const TQString& host ) const
{
KConfigGroup config( m_config, settingsGroup( host ) );
TDEConfigGroup config( m_config, settingsGroup( host ) );
ServerSettings settings;

settings.host = host;

+ 4
- 4
kmrml/kmrml/lib/kmrml_config.h View File

@@ -19,7 +19,7 @@
#ifndef KMRML_CONFIG_H
#define KMRML_CONFIG_H

class KConfig;
class TDEConfig;

#include <tqstringlist.h>
#include <kurl.h>
@@ -57,7 +57,7 @@ namespace KMrml
{
public:
Config();
Config( KConfig *config ); // does not take ownership of KConfig
Config( TDEConfig *config ); // does not take ownership of TDEConfig
~Config();

bool sync();
@@ -115,8 +115,8 @@ namespace KMrml
TQString m_defaultHost;
TQStringList m_hostList;

KConfig *m_config;
KConfig *m_ownConfig;
TDEConfig *m_config;
TDEConfig *m_ownConfig;
};
}


+ 10
- 10
kmrml/kmrml/loader.cpp View File

@@ -58,21 +58,21 @@ void Loader::requestDownload( const KURL& url )
return;
}

KIO::TransferJob *job = KIO::get( url, false, false );
KIO::Scheduler::scheduleJob(job);
TDEIO::TransferJob *job = TDEIO::get( url, false, false );
TDEIO::Scheduler::scheduleJob(job);

connect( job , TQT_SIGNAL( data( KIO::Job *, const TQByteArray& )),
TQT_SLOT( slotData( KIO::Job *, const TQByteArray& )));
connect( job , TQT_SIGNAL( result( KIO::Job * )),
TQT_SLOT( slotResult( KIO::Job * )));
connect( job , TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray& )),
TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray& )));
connect( job , TQT_SIGNAL( result( TDEIO::Job * )),
TQT_SLOT( slotResult( TDEIO::Job * )));

Download *d = new Download();
m_downloads.insert( job, d );
}

void Loader::slotData( KIO::Job *job, const TQByteArray& data )
void Loader::slotData( TDEIO::Job *job, const TQByteArray& data )
{
DownloadIterator it = m_downloads.find( static_cast<KIO::TransferJob*>(job) );
DownloadIterator it = m_downloads.find( static_cast<TDEIO::TransferJob*>(job) );
if ( it != m_downloads.end() ) {
TQBuffer& buffer = it.data()->m_buffer;
if ( !buffer.isOpen() )
@@ -86,9 +86,9 @@ void Loader::slotData( KIO::Job *job, const TQByteArray& data )
}
}

void Loader::slotResult( KIO::Job *job )
void Loader::slotResult( TDEIO::Job *job )
{
KIO::TransferJob *tjob = static_cast<KIO::TransferJob*>( job );
TDEIO::TransferJob *tjob = static_cast<TDEIO::TransferJob*>( job );

DownloadIterator it = m_downloads.find( tjob );
if ( it != m_downloads.end() ) {

+ 4
- 4
kmrml/kmrml/loader.h View File

@@ -57,14 +57,14 @@ signals:
void finished( const KURL& url, const TQByteArray& );

private slots:
void slotData( KIO::Job *, const TQByteArray& );
void slotResult( KIO::Job * );
void slotData( TDEIO::Job *, const TQByteArray& );
void slotResult( TDEIO::Job * );

private:
Loader();

TQMap<KIO::TransferJob*,Download*> m_downloads;
typedef TQMapIterator<KIO::TransferJob*,Download*> DownloadIterator;
TQMap<TDEIO::TransferJob*,Download*> m_downloads;
typedef TQMapIterator<TDEIO::TransferJob*,Download*> DownloadIterator;

static Loader *s_self;


+ 4
- 4
kmrml/kmrml/mrml.cpp View File

@@ -92,7 +92,7 @@ void Mrml::get( const KURL& url )

if ( !checkLocalServer( url ) )
{
error( KIO::ERR_SLAVE_DEFINED, i18n("Unable to start the Indexing Server. "
error( TDEIO::ERR_SLAVE_DEFINED, i18n("Unable to start the Indexing Server. "
"Aborting the query.") );
return;
}
@@ -117,7 +117,7 @@ tryConnect:
TQString meta = metaData( MrmlShared::mrml_data() );
if ( meta.isEmpty() ) {
closeDescriptor();
error( KIO::ERR_SLAVE_DEFINED, i18n("No MRML data is available.") );
error( TDEIO::ERR_SLAVE_DEFINED, i18n("No MRML data is available.") );
return;
}

@@ -148,7 +148,7 @@ tryConnect:
return;
}

error( KIO::ERR_COULD_NOT_CONNECT,
error( TDEIO::ERR_COULD_NOT_CONNECT,
i18n("Could not connect to GIFT server.") );
return;
}
@@ -263,5 +263,5 @@ void Mrml::mimetype( const KURL& url )
finished();
}
else
KIO::TCPSlaveBase::mimetype( url );
TDEIO::TCPSlaveBase::mimetype( url );
}

+ 1
- 1
kmrml/kmrml/mrml.h View File

@@ -26,7 +26,7 @@
#include <kmrml_config.h>
#include "mrml_shared.h"

class Mrml : public KIO::TCPSlaveBase
class Mrml : public TDEIO::TCPSlaveBase
{
public:
Mrml( const TQCString&, const TQCString& );

+ 18
- 18
kmrml/kmrml/mrml_part.cpp View File

@@ -123,7 +123,7 @@ MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */,
setName( "MRML Part" );
m_browser = new Browser( this, "mrml browserextension");
setInstance( PartFactory::instance(), true ); // do load plugins :)
KConfig *config = PartFactory::instance()->config();
TDEConfig *config = PartFactory::instance()->config();
config->setGroup("MRML Settings");

TQVBox *box = new TQVBox( parentWidget, "main mrml box" );
@@ -341,10 +341,10 @@ void MrmlPart::downloadReferenceFiles( const KURL::List& downloadList )
KURL destURL;
destURL.setPath( tmpFile.name() );

KIO::FileCopyJob *job = KIO::file_copy( *it, destURL, -1,
TDEIO::FileCopyJob *job = TDEIO::file_copy( *it, destURL, -1,
true /* overwrite tmpfile */ );
connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
TQT_SLOT( slotDownloadResult( KIO::Job * ) ));
connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
TQT_SLOT( slotDownloadResult( TDEIO::Job * ) ));
m_downloadJobs.append( job );
// ### should this be only called for one job?
emit started( job );
@@ -361,7 +361,7 @@ bool MrmlPart::closeURL()
m_view->stopDownloads();
m_view->clear();

TQPtrListIterator<KIO::FileCopyJob> it( m_downloadJobs );
TQPtrListIterator<TDEIO::FileCopyJob> it( m_downloadJobs );
for ( ; it.current(); ++it )
it.current()->kill();
m_downloadJobs.clear();
@@ -381,18 +381,18 @@ bool MrmlPart::closeURL()
return true;
}

KIO::TransferJob * MrmlPart::transferJob( const KURL& url )
TDEIO::TransferJob * MrmlPart::transferJob( const KURL& url )
{
KIO::TransferJob *job = KIO::get( url, true, false ); // reload, no gui
TDEIO::TransferJob *job = TDEIO::get( url, true, false ); // reload, no gui
job->setAutoErrorHandlingEnabled( true, m_view );
connect( job, TQT_SIGNAL( result( KIO::Job * )),
TQT_SLOT( slotResult( KIO::Job * )));
connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray& )),
TQT_SLOT( slotData( KIO::Job *, const TQByteArray& )));
connect( job, TQT_SIGNAL( result( TDEIO::Job * )),
TQT_SLOT( slotResult( TDEIO::Job * )));
connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray& )),
TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray& )));

// ###
// connect( job, TQT_SIGNAL( infoMessage( KIO::Job *, const TQString& )),
// TQT_SLOT( slotResult( KIO::Job *, const TQString& )));
// connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *, const TQString& )),
// TQT_SLOT( slotResult( TDEIO::Job *, const TQString& )));

job->setWindow( widget() );
if ( !m_sessionId.isEmpty() )
@@ -405,7 +405,7 @@ KIO::TransferJob * MrmlPart::transferJob( const KURL& url )
return job;
}

void MrmlPart::slotResult( KIO::Job *job )
void MrmlPart::slotResult( TDEIO::Job *job )
{
if ( job == m_job )
m_job = 0L;
@@ -435,10 +435,10 @@ void MrmlPart::slotResult( KIO::Job *job )
}

// ### when user cancels download, we crash :(
void MrmlPart::slotDownloadResult( KIO::Job *job )
void MrmlPart::slotDownloadResult( TDEIO::Job *job )
{
assert( job->inherits( "KIO::FileCopyJob" ) );
KIO::FileCopyJob *copyJob = static_cast<KIO::FileCopyJob*>( job );
assert( job->inherits( "TDEIO::FileCopyJob" ) );
TDEIO::FileCopyJob *copyJob = static_cast<TDEIO::FileCopyJob*>( job );

if ( !copyJob->error() )
m_queryList.append( copyJob->destURL() );
@@ -457,7 +457,7 @@ void MrmlPart::slotDownloadResult( KIO::Job *job )
}

// mrml-document in the bytearray
void MrmlPart::slotData( KIO::Job *, const TQByteArray& data )
void MrmlPart::slotData( TDEIO::Job *, const TQByteArray& data )
{
if ( data.isEmpty() )
return;

+ 7
- 7
kmrml/kmrml/mrml_part.h View File

@@ -38,7 +38,7 @@ class TDEAboutData;
class KComboBox;
class KIntNumInput;

namespace KIO {
namespace TDEIO {
class FileCopyJob;
class TransferJob;
}
@@ -94,10 +94,10 @@ private slots:
void slotSetStatusBar( const KURL& url ) { slotSetStatusBar( url.prettyURL() ); }
void slotHostComboActivated( const TQString& );

void slotResult( KIO::Job * );
void slotData( KIO::Job *, const TQByteArray& );
void slotResult( TDEIO::Job * );
void slotData( TDEIO::Job *, const TQByteArray& );

void slotDownloadResult( KIO::Job * );
void slotDownloadResult( TDEIO::Job * );

void slotConfigureAlgorithm();
void slotApplyAlgoConfig();
@@ -111,7 +111,7 @@ private:
void parseMrml( TQDomDocument& doc );
void parseQueryResult( TQDomElement& );
void enableExtensionActions( const KURL& url, bool enable );
KIO::TransferJob * transferJob( const KURL& url );
TDEIO::TransferJob * transferJob( const KURL& url );

void initHostCombo();
void enableServerDependentWidgets( bool enable );
@@ -121,7 +121,7 @@ private:
void contactServer( const KURL& url );
void downloadReferenceFiles( const KURL::List& downloadList );

KIO::TransferJob *m_job;
TDEIO::TransferJob *m_job;
MrmlView *m_view;
Config m_config;
KIntNumInput * m_resultSizeInput;
@@ -134,7 +134,7 @@ private:
AlgorithmDialog *m_algoConfig;
KComboBox *m_hostCombo;

TQPtrList<KIO::FileCopyJob> m_downloadJobs;
TQPtrList<TDEIO::FileCopyJob> m_downloadJobs;
TQStringList m_tempFiles;

TQString m_sessionId;

+ 4
- 4
kolourpaint/kpcommandhistory.cpp View File

@@ -413,8 +413,8 @@ void kpCommandHistoryBase::readConfig ()
#if DEBUG_KP_COMMAND_HISTORY
kdDebug () << "kpCommandHistoryBase::readConfig()" << endl;
#endif
KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupUndoRedo);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupUndoRedo);
TDEConfigBase *cfg = cfgGroupSaver.config ();

setUndoMinLimit (cfg->readNumEntry (kpSettingUndoMinLimit, undoMinLimit ()));
setUndoMaxLimit (cfg->readNumEntry (kpSettingUndoMaxLimit, undoMaxLimit ()));
@@ -430,8 +430,8 @@ void kpCommandHistoryBase::writeConfig ()
#if DEBUG_KP_COMMAND_HISTORY
kdDebug () << "kpCommandHistoryBase::writeConfig()" << endl;
#endif
KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupUndoRedo);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupUndoRedo);
TDEConfigBase *cfg = cfgGroupSaver.config ();

cfg->writeEntry (kpSettingUndoMinLimit, undoMinLimit ());
cfg->writeEntry (kpSettingUndoMaxLimit, undoMaxLimit ());

+ 9
- 9
kolourpaint/kpdocument.cpp View File

@@ -247,7 +247,7 @@ TQPixmap kpDocument::getPixmapFromFile (const KURL &url, bool suppressDoesntExis


TQString tempFile;
if (url.isEmpty () || !KIO::NetAccess::download (url, tempFile, parent))
if (url.isEmpty () || !TDEIO::NetAccess::download (url, tempFile, parent))
{
if (!suppressDoesntExistDialog)
{
@@ -262,7 +262,7 @@ TQPixmap kpDocument::getPixmapFromFile (const KURL &url, bool suppressDoesntExis

TQImage image;

// sync: remember to "KIO::NetAccess::removeTempFile (tempFile)" in all exit paths
// sync: remember to "TDEIO::NetAccess::removeTempFile (tempFile)" in all exit paths
{
TQString detectedMimeType = KImageIO::mimeType (tempFile);
if (saveOptions)
@@ -280,13 +280,13 @@ TQPixmap kpDocument::getPixmapFromFile (const KURL &url, bool suppressDoesntExis
KMessageBox::sorry (parent,
i18n ("Could not open \"%1\" - unknown mimetype.")
.arg (kpDocument::prettyFilenameForURL (url)));
KIO::NetAccess::removeTempFile (tempFile);
TDEIO::NetAccess::removeTempFile (tempFile);
return TQPixmap ();
}


image = TQImage (tempFile);
KIO::NetAccess::removeTempFile (tempFile);
TDEIO::NetAccess::removeTempFile (tempFile);
}


@@ -394,7 +394,7 @@ bool kpDocument::open (const KURL &url, bool newDocSameNameIfNotExist)
{
if (!url.isEmpty () &&
// not just a permission error?
!KIO::NetAccess::exists (url, true/*open*/, m_mainWindow))
!TDEIO::NetAccess::exists (url, true/*open*/, m_mainWindow))
{
openNew (url);
}
@@ -619,7 +619,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
bool lossyPrompt,
TQWidget *parent)
{
// TODO: Use KIO::NetAccess:mostLocalURL() for accessing home:/ (and other
// TODO: Use TDEIO::NetAccess:mostLocalURL() for accessing home:/ (and other
// such local URLs) for efficiency and because only local writes
// are atomic.
#if DEBUG_KP_DOCUMENT
@@ -632,7 +632,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
metaInfo.printDebug (TQString::fromLatin1 ("\tmetaInfo"));
#endif

if (overwritePrompt && KIO::NetAccess::exists (url, false/*write*/, parent))
if (overwritePrompt && TDEIO::NetAccess::exists (url, false/*write*/, parent))
{
int result = KMessageBox::warningContinueCancel (parent,
i18n ("A document called \"%1\" already exists.\n"
@@ -773,7 +773,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
// TODO: No one seems to know how to do this atomically
// [http://lists.kde.org/?l=kde-core-devel&m=117845162728484&w=2].
// At least, fish:// (ssh) is definitely not atomic.
if (!KIO::NetAccess::upload (filename, url, parent))
if (!TDEIO::NetAccess::upload (filename, url, parent))
{
#if DEBUG_KP_DOCUMENT
kdDebug () << "\treturning false because could not upload" << endl;
@@ -849,7 +849,7 @@ bool kpDocument::isFromURL (bool checkURLStillExists) const
return true;

return (!m_url.isEmpty () &&
KIO::NetAccess::exists (m_url, true/*open*/, m_mainWindow));
TDEIO::NetAccess::exists (m_url, true/*open*/, m_mainWindow));
}



+ 12
- 12
kolourpaint/kpdocumentsaveoptions.cpp View File

@@ -243,14 +243,14 @@ bool kpDocumentSaveOptions::qualityIsInvalid () const


// public static
TQString kpDocumentSaveOptions::defaultMimeType (KConfigBase *config)
TQString kpDocumentSaveOptions::defaultMimeType (TDEConfigBase *config)
{
return config->readEntry (kpSettingForcedMimeType,
TQString::fromLatin1 ("image/png"));
}

// public static
void kpDocumentSaveOptions::saveDefaultMimeType (KConfigBase *config,
void kpDocumentSaveOptions::saveDefaultMimeType (TDEConfigBase *config,
const TQString &mimeType)
{
config->writeEntry (kpSettingForcedMimeType, mimeType);
@@ -258,7 +258,7 @@ void kpDocumentSaveOptions::saveDefaultMimeType (KConfigBase *config,


// public static
int kpDocumentSaveOptions::defaultColorDepth (KConfigBase *config)
int kpDocumentSaveOptions::defaultColorDepth (TDEConfigBase *config)
{
int colorDepth =
config->readNumEntry (kpSettingForcedColorDepth, -1);
@@ -273,27 +273,27 @@ int kpDocumentSaveOptions::defaultColorDepth (KConfigBase *config)
}

// public static
void kpDocumentSaveOptions::saveDefaultColorDepth (KConfigBase *config, int colorDepth)
void kpDocumentSaveOptions::saveDefaultColorDepth (TDEConfigBase *config, int colorDepth)
{
config->writeEntry (kpSettingForcedColorDepth, colorDepth);
}


// public static
int kpDocumentSaveOptions::defaultDither (KConfigBase *config)
int kpDocumentSaveOptions::defaultDither (TDEConfigBase *config)
{
return config->readBoolEntry (kpSettingForcedDither, initialDither ());
}

// public static
void kpDocumentSaveOptions::saveDefaultDither (KConfigBase *config, bool dither)
void kpDocumentSaveOptions::saveDefaultDither (TDEConfigBase *config, bool dither)
{
config->writeEntry (kpSettingForcedDither, dither);
}


// public static
int kpDocumentSaveOptions::defaultQuality (KConfigBase *config)
int kpDocumentSaveOptions::defaultQuality (TDEConfigBase *config)
{
int val = config->readNumEntry (kpSettingForcedQuality, -1);
if (qualityIsInvalid (val))
@@ -303,14 +303,14 @@ int kpDocumentSaveOptions::defaultQuality (KConfigBase *config)
}

// public static
void kpDocumentSaveOptions::saveDefaultQuality (KConfigBase *config, int quality)
void kpDocumentSaveOptions::saveDefaultQuality (TDEConfigBase *config, int quality)
{
config->writeEntry (kpSettingForcedQuality, quality);
}


// public static
kpDocumentSaveOptions kpDocumentSaveOptions::defaultDocumentSaveOptions (KConfigBase *config)
kpDocumentSaveOptions kpDocumentSaveOptions::defaultDocumentSaveOptions (TDEConfigBase *config)
{
kpDocumentSaveOptions saveOptions;
saveOptions.setMimeType (defaultMimeType (config));
@@ -326,7 +326,7 @@ kpDocumentSaveOptions kpDocumentSaveOptions::defaultDocumentSaveOptions (KConfig
}

// public static
bool kpDocumentSaveOptions::saveDefaultDifferences (KConfigBase *config,
bool kpDocumentSaveOptions::saveDefaultDifferences (TDEConfigBase *config,
const kpDocumentSaveOptions &oldDocInfo,
const kpDocumentSaveOptions &newDocInfo)
{
@@ -371,9 +371,9 @@ static TQStringList mimeTypesSupportingProperty (const TQString &property,
{
TQStringList mimeTypeList;

KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
kpSettingsGroupMimeTypeProperties);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigBase *cfg = cfgGroupSaver.config ();

if (cfg->hasKey (property))
{

+ 12
- 12
kolourpaint/kpdocumentsaveoptions.h View File

@@ -33,7 +33,7 @@
class TQPixmap;
class TQString;

class KConfigBase;
class TDEConfigBase;


class kpDocumentSaveOptions
@@ -84,24 +84,24 @@ public:


// (All assume that <config>'s group has been set)
// (None of them call KConfigBase::reparseConfig() nor KConfigBase::sync())
// (None of them call TDEConfigBase::reparseConfig() nor TDEConfigBase::sync())

static TQString defaultMimeType (KConfigBase *config);
static void saveDefaultMimeType (KConfigBase *config, const TQString &mimeType);
static TQString defaultMimeType (TDEConfigBase *config);
static void saveDefaultMimeType (TDEConfigBase *config, const TQString &mimeType);

static int defaultColorDepth (KConfigBase *config);
static void saveDefaultColorDepth (KConfigBase *config, int colorDepth);
static int defaultColorDepth (TDEConfigBase *config);
static void saveDefaultColorDepth (TDEConfigBase *config, int colorDepth);

static int defaultDither (KConfigBase *config);
static void saveDefaultDither (KConfigBase *config, bool dither);
static int defaultDither (TDEConfigBase *config);
static void saveDefaultDither (TDEConfigBase *config, bool dither);

static int defaultQuality (KConfigBase *config);
static void saveDefaultQuality (KConfigBase *config, int quality);
static int defaultQuality (TDEConfigBase *config);
static void saveDefaultQuality (TDEConfigBase *config, int quality);


static kpDocumentSaveOptions defaultDocumentSaveOptions (KConfigBase *config);
static kpDocumentSaveOptions defaultDocumentSaveOptions (TDEConfigBase *config);
// (returns true if it encountered a difference (and saved it to <config>))
static bool saveDefaultDifferences (KConfigBase *config,
static bool saveDefaultDifferences (TDEConfigBase *config,
const kpDocumentSaveOptions &oldDocInfo,
const kpDocumentSaveOptions &newDocInfo);


+ 6
- 6
kolourpaint/kpdocumentsaveoptionswidget.cpp View File

@@ -742,8 +742,8 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
this, TQT_SLOT (hidePreview ()));


KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave);
TDEConfigBase *cfg = cfgGroupSaver.config ();

if (cfg->hasKey (kpSettingPreviewSaveUpdateDelay))
{
@@ -769,8 +769,8 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET
kdDebug () << "\tread cfg preview dialog last rel geometry" << endl;
#endif
KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave);
TDEConfigBase *cfg = cfgGroupSaver.config ();

m_previewDialogLastRelativeGeometry = cfg->readRectEntry (
kpSettingPreviewSaveGeometry);
@@ -845,8 +845,8 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
{
m_updatePreviewDialogLastRelativeGeometryTimer->stop ();

KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave);
TDEConfigBase *cfg = cfgGroupSaver.config ();

cfg->writeEntry (kpSettingPreviewSaveGeometry, m_previewDialogLastRelativeGeometry);
cfg->sync ();

+ 11
- 11
kolourpaint/kpmainwindow.cpp View File

@@ -103,8 +103,8 @@ double kpMainWindow::configColorSimilarity () const
// public
void kpMainWindow::configSetColorSimilarity (double val)
{
KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
TDEConfigBase *cfg = cfgGroupSaver.config ();

cfg->writeEntry (kpSettingColorSimilarity, m_configColorSimilarity = val);
cfg->sync ();
@@ -118,8 +118,8 @@ void kpMainWindow::readGeneralSettings ()
kdDebug () << "\tkpMainWindow(" << name () << ")::readGeneralSettings()" << endl;
#endif

KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
TDEConfigBase *cfg = cfgGroupSaver.config ();

m_configFirstTime = cfg->readBoolEntry (kpSettingFirstTime, true);
m_configShowGrid = cfg->readBoolEntry (kpSettingShowGrid, false);
@@ -147,8 +147,8 @@ void kpMainWindow::readThumbnailSettings ()
kdDebug () << "\tkpMainWindow(" << name () << ")::readThumbnailSettings()" << endl;
#endif

KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail);
TDEConfigBase *cfg = cfgGroupSaver.config ();

m_configThumbnailShown = cfg->readBoolEntry (kpSettingThumbnailShown, false);
m_configThumbnailGeometry = cfg->readRectEntry (kpSettingThumbnailGeometry);
@@ -206,7 +206,7 @@ void kpMainWindow::init ()
// read config
//

// KConfig::readEntry() does not actually reread from disk, hence doesn't
// TDEConfig::readEntry() does not actually reread from disk, hence doesn't
// realise what other processes have done e.g. Settings / Show Path
kapp->config ()->reparseConfiguration ();
#if DEBUG_KP_MAIN_WINDOW
@@ -298,8 +298,8 @@ void kpMainWindow::init ()
m_toolToolBar->setBarPos (KToolBar::Left);
m_colorToolBar->setBarPos (KToolBar::Bottom);

KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
TDEConfigBase *cfg = cfgGroupSaver.config ();

cfg->writeEntry (kpSettingFirstTime, m_configFirstTime = false);
cfg->sync ();
@@ -312,7 +312,7 @@ void kpMainWindow::init ()


// private virtual [base KMainWindow]
void kpMainWindow::readProperties (KConfig *cfg)
void kpMainWindow::readProperties (TDEConfig *cfg)
{
#if DEBUG_KP_MAIN_WINDOW
kdDebug () << "kpMainWindow<" << this << ">::readProperties()" << endl;
@@ -366,7 +366,7 @@ void kpMainWindow::readProperties (KConfig *cfg)
// private virtual [base KMainWindow]
// WARNING: KMainWindow API Doc says "No user interaction is allowed
// in this function!"
void kpMainWindow::saveProperties (KConfig *cfg)
void kpMainWindow::saveProperties (TDEConfig *cfg)
{
#if DEBUG_KP_MAIN_WINDOW
kdDebug () << "kpMainWindow<" << this << ">::saveProperties()" << endl;

+ 2
- 2
kolourpaint/kpmainwindow.h View File

@@ -124,11 +124,11 @@ private:
// (only called for restoring a previous session e.g. starting KDE with
// a previously saved session; it's not called on normal KolourPaint
// startup)
virtual void readProperties (KConfig *cfg);
virtual void readProperties (TDEConfig *cfg);
// (only called for saving the current session e.g. logging out of KDE
// with the KolourPaint window open; it's not called on normal KolourPaint
// exit)
virtual void saveProperties (KConfig *cfg);
virtual void saveProperties (TDEConfig *cfg);

public:
~kpMainWindow ();

+ 15
- 15
kolourpaint/kpmainwindow_file.cpp View File

@@ -146,9 +146,9 @@ void kpMainWindow::addRecentURL (const KURL &url)
return;


KConfig *cfg = kapp->config ();
TDEConfig *cfg = kapp->config ();

// KConfig::readEntry() does not actually reread from disk, hence doesn't
// TDEConfig::readEntry() does not actually reread from disk, hence doesn't
// realise what other processes have done e.g. Settings / Show Path
cfg->reparseConfiguration ();

@@ -230,12 +230,12 @@ void kpMainWindow::slotNew ()
// private
TQSize kpMainWindow::defaultDocSize () const
{
// KConfig::readEntry() does not actually reread from disk, hence doesn't
// TDEConfig::readEntry() does not actually reread from disk, hence doesn't
// realise what other processes have done e.g. Settings / Show Path
kapp->config ()->reparseConfiguration ();

KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
TDEConfigBase *cfg = cfgGroupSaver.config ();

TQSize docSize = cfg->readSizeEntry (kpSettingLastDocSize);

@@ -261,8 +261,8 @@ void kpMainWindow::saveDefaultDocSize (const TQSize &size)
kdDebug () << "\tCONFIG: saving Last Doc Size = " << size << endl;
#endif

KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
TDEConfigBase *cfg = cfgGroupSaver.config ();

cfg->writeEntry (kpSettingLastDocSize, size);
cfg->sync ();
@@ -599,7 +599,7 @@ KURL kpMainWindow::askForSaveURL (const TQString &caption,

bool reparsedConfiguration = false;

// KConfig::readEntry() does not actually reread from disk, hence doesn't
// TDEConfig::readEntry() does not actually reread from disk, hence doesn't
// realise what other processes have done e.g. Settings / Show Path
// so reparseConfiguration() must be called
#define SETUP_READ_CFG() \
@@ -609,8 +609,8 @@ KURL kpMainWindow::askForSaveURL (const TQString &caption,
reparsedConfiguration = true; \
} \
\
KConfigGroupSaver cfgGroupSaver (kapp->config (), forcedSaveOptionsGroup); \
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), forcedSaveOptionsGroup); \
TDEConfigBase *cfg = cfgGroupSaver.config ();


if (chosenSaveOptions)
@@ -715,8 +715,8 @@ KURL kpMainWindow::askForSaveURL (const TQString &caption,
newSaveOptions.printDebug ("\tnewSaveOptions");
#endif

KConfigGroupSaver cfgGroupSaver (kapp->config (), forcedSaveOptionsGroup);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), forcedSaveOptionsGroup);
TDEConfigBase *cfg = cfgGroupSaver.config ();

// Save options user forced - probably want to use them in future
kpDocumentSaveOptions::saveDefaultDifferences (cfg,
@@ -921,7 +921,7 @@ bool kpMainWindow::slotReload ()

// If it's _supposed to_ come from a URL or it exists
if (m_document->isFromURL (false/*don't bother checking exists*/) ||
(!oldURL.isEmpty () && KIO::NetAccess::exists (oldURL, true/*open*/, this)))
(!oldURL.isEmpty () && TDEIO::NetAccess::exists (oldURL, true/*open*/, this)))
{
#if DEBUG_KP_MAIN_WINDOW
kdDebug () << "kpMainWindow::slotReload() reloading from disk!" << endl;
@@ -997,9 +997,9 @@ static bool shouldPrintImageCenteredOnPage ()
#endif
bool ret;

KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
kpSettingsGroupGeneral);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigBase *cfg = cfgGroupSaver.config ();

if (cfg->hasKey (kpSettingPrintImageCenteredOnPage))
{

+ 2
- 2
kolourpaint/kpmainwindow_help.cpp View File

@@ -73,8 +73,8 @@ void kpMainWindow::enableHelpMenuDocumentActions (bool /*enable*/)
// SYNC: tdebase/twin/twinbindings.cpp
static TQString printScreenShortcutString ()
{
KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), "Global Shortcuts");
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), "Global Shortcuts");
TDEConfigBase *cfg = cfgGroupSaver.config ();

// TODO: i18n() entry name? twinbindings.cpp seems to but it doesn't
// make sense.

+ 4
- 4
kolourpaint/kpmainwindow_image.cpp View File

@@ -317,8 +317,8 @@ void kpMainWindow::slotResizeScale ()
{
d->m_resizeScaleDialogLastKeepAspect = dialog.keepAspectRatio ();

KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
TDEConfigBase *cfg = cfgGroupSaver.config ();

cfg->writeEntry (kpSettingResizeScaleLastKeepAspect,
d->m_resizeScaleDialogLastKeepAspect);
@@ -464,8 +464,8 @@ void kpMainWindow::slotMoreEffects ()
{
d->m_moreEffectsDialogLastEffect = dialog.selectedEffect ();

KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
TDEConfigBase *cfg = cfgGroupSaver.config ();

cfg->writeEntry (kpSettingMoreEffectsLastEffect,
d->m_moreEffectsDialogLastEffect);

+ 2
- 2
kolourpaint/kpmainwindow_settings.cpp View File

@@ -116,8 +116,8 @@ void kpMainWindow::slotShowPathToggled ()
slotUpdateCaption ();


KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
TDEConfigBase *cfg = cfgGroupSaver.config ();

cfg->writeEntry (kpSettingShowPath, m_configShowPath);
cfg->sync ();

+ 14
- 14
kolourpaint/kpmainwindow_text.cpp View File

@@ -77,8 +77,8 @@ void kpMainWindow::setupTextToolBarActions ()
// private
void kpMainWindow::readAndApplyTextSettings ()
{
KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
TDEConfigBase *cfg = cfgGroupSaver.config ();

m_actionTextFontFamily->setFont (cfg->readEntry (kpSettingFontFamily, TQString::fromLatin1 ("Times")));
m_actionTextFontSize->setFontSize (cfg->readNumEntry (kpSettingFontSize, 14));
@@ -141,8 +141,8 @@ void kpMainWindow::slotTextFontFamilyChanged ()
if (m_mainView)
m_mainView->setFocus ();

KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
TDEConfigBase *cfg = cfgGroupSaver.config ();
cfg->writeEntry (kpSettingFontFamily, m_actionTextFontFamily->font ());
cfg->sync ();

@@ -174,8 +174,8 @@ void kpMainWindow::slotTextFontSizeChanged ()
if (m_mainView)
m_mainView->setFocus ();

KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
TDEConfigBase *cfg = cfgGroupSaver.config ();
cfg->writeEntry (kpSettingFontSize, m_actionTextFontSize->fontSize ());
cfg->sync ();

@@ -199,8 +199,8 @@ void kpMainWindow::slotTextBoldChanged ()
if (m_toolText && m_toolText->hasBegun ())
m_toolText->slotBoldChanged (m_actionTextBold->isChecked ());

KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
TDEConfigBase *cfg = cfgGroupSaver.config ();
cfg->writeEntry (kpSettingBold, m_actionTextBold->isChecked ());
cfg->sync ();
}
@@ -222,8 +222,8 @@ void kpMainWindow::slotTextItalicChanged ()
if (m_toolText && m_toolText->hasBegun ())
m_toolText->slotItalicChanged (m_actionTextItalic->isChecked ());

KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
TDEConfigBase *cfg = cfgGroupSaver.config ();
cfg->writeEntry (kpSettingItalic, m_actionTextItalic->isChecked ());
cfg->sync ();
}
@@ -245,8 +245,8 @@ void kpMainWindow::slotTextUnderlineChanged ()
if (m_toolText && m_toolText->hasBegun ())
m_toolText->slotUnderlineChanged (m_actionTextUnderline->isChecked ());

KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
TDEConfigBase *cfg = cfgGroupSaver.config ();
cfg->writeEntry (kpSettingUnderline, m_actionTextUnderline->isChecked ());
cfg->sync ();
}
@@ -268,8 +268,8 @@ void kpMainWindow::slotTextStrikeThruChanged ()
if (m_toolText && m_toolText->hasBegun ())
m_toolText->slotStrikeThruChanged (m_actionTextStrikeThru->isChecked ());

KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
TDEConfigBase *cfg = cfgGroupSaver.config ();
cfg->writeEntry (kpSettingStrikeThru, m_actionTextStrikeThru->isChecked ());
cfg->sync ();
}

+ 4
- 4
kolourpaint/kpmainwindow_tools.cpp View File

@@ -392,8 +392,8 @@ void kpMainWindow::slotToolSelected (kpTool *tool)
// private
void kpMainWindow::readLastTool ()
{
KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
TDEConfigBase *cfg = cfgGroupSaver.config ();

m_lastToolNumber = cfg->readNumEntry (kpSettingLastTool, -1);
}
@@ -424,8 +424,8 @@ void kpMainWindow::saveLastTool ()
return;


KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
TDEConfigBase *cfg = cfgGroupSaver.config ();

cfg->writeEntry (kpSettingLastTool, number);
cfg->sync ();

+ 10
- 10
kolourpaint/kpmainwindow_view.cpp View File

@@ -729,8 +729,8 @@ void kpMainWindow::slotShowGridToggled ()
updateMainViewGrid ();


KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
TDEConfigBase *cfg = cfgGroupSaver.config ();

cfg->writeEntry (kpSettingShowGrid, m_configShowGrid = m_actionShowGrid->isChecked ());
cfg->sync ();
@@ -853,8 +853,8 @@ void kpMainWindow::slotSaveThumbnailGeometry ()
<< endl;
#endif

KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail);
TDEConfigBase *cfg = cfgGroupSaver.config ();

cfg->writeEntry (kpSettingThumbnailGeometry, m_configThumbnailGeometry);
cfg->sync ();
@@ -869,8 +869,8 @@ void kpMainWindow::slotShowThumbnailToggled ()

m_configThumbnailShown = m_actionShowThumbnail->isChecked ();

KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail);
TDEConfigBase *cfg = cfgGroupSaver.config ();

cfg->writeEntry (kpSettingThumbnailShown, m_configThumbnailShown);
cfg->sync ();
@@ -904,8 +904,8 @@ void kpMainWindow::slotZoomedThumbnailToggled ()

m_configZoomedThumbnail = m_actionZoomedThumbnail->isChecked ();

KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail);
TDEConfigBase *cfg = cfgGroupSaver.config ();

cfg->writeEntry (kpSettingThumbnailZoomed, m_configZoomedThumbnail);
cfg->sync ();
@@ -923,8 +923,8 @@ void kpMainWindow::slotThumbnailShowRectangleToggled ()

d->m_configThumbnailShowRectangle = d->m_actionShowThumbnailRectangle->isChecked ();

KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail);
TDEConfigBase *cfg = cfgGroupSaver.config ();

cfg->writeEntry (kpSettingThumbnailShowRectangle, d->m_configThumbnailShowRectangle);
cfg->sync ();

+ 4
- 4
kolourpaint/pixmapfx/kpeffectflatten.cpp View File

@@ -137,8 +137,8 @@ kpEffectFlattenWidget::kpEffectFlattenWidget (bool actOnSelection,
{
if (!s_lastColor1.isValid () || !s_lastColor2.isValid ())
{
KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupFlattenEffect);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupFlattenEffect);
TDEConfigBase *cfg = cfgGroupSaver.config ();

s_lastColor1 = cfg->readColorEntry (kpSettingFlattenEffectColor1);
if (!s_lastColor1.isValid ())
@@ -183,8 +183,8 @@ kpEffectFlattenWidget::~kpEffectFlattenWidget ()
s_lastColor2 = color2 ();


KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupFlattenEffect);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupFlattenEffect);
TDEConfigBase *cfg = cfgGroupSaver.config ();

cfg->writeEntry (kpSettingFlattenEffectColor1, s_lastColor1);
cfg->writeEntry (kpSettingFlattenEffectColor2, s_lastColor2);

+ 2
- 2
kolourpaint/pixmapfx/kppixmapfx.cpp View File

@@ -492,9 +492,9 @@ TQPixmap kpPixmapFX::convertToPixmapAsLosslessAsPossible (const TQImage &image,

int configDitherIfNumColorsGreaterThan = 323;

KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
kpSettingsGroupGeneral);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigBase *cfg = cfgGroupSaver.config ();

if (cfg->hasKey (kpSettingDitherOnOpen))
{

+ 2
- 2
kolourpaint/widgets/kptooltoolbar.cpp View File

@@ -175,9 +175,9 @@ int kpToolToolBar::defaultIconSize ()
#endif


KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
kpSettingsGroupTools);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigBase *cfg = cfgGroupSaver.config ();

if (cfg->hasKey (kpSettingToolBoxIconSize))
{

+ 4
- 4
kolourpaint/widgets/kptoolwidgetbase.cpp View File

@@ -172,8 +172,8 @@ TQPair <int, int> kpToolWidgetBase::defaultSelectedRowAndCol () const

if (name ())
{
KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
TDEConfigBase *cfg = cfgGroupSaver.config ();

TQString nameString = TQString::fromLatin1 (name ());

@@ -215,8 +215,8 @@ void kpToolWidgetBase::saveSelectedAsDefault () const
if (!name ())
return;

KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
KConfigBase *cfg = cfgGroupSaver.config ();
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
TDEConfigBase *cfg = cfgGroupSaver.config ();

TQString nameString = TQString::fromLatin1 (name ());
cfg->writeEntry (nameString + TQString::fromLatin1 (" Row"), m_selectedRow);

+ 1
- 1
kooka/CHANGES View File

@@ -17,7 +17,7 @@ scanned with about 150 dpi.

* Reworked the ocr integration: Nice start- and finish-dialog,
animated status image, opening a text editor with the result text
via mime mechanism of KDE (KRun). OCR-Parameter get stored via KConfig.
via mime mechanism of KDE (KRun). OCR-Parameter get stored via TDEConfig.
OCR may be performed on the entire image or the selection.

* Reworked the save assistant: New layout and fully KDE2-Compliant.

+ 10
- 10
kooka/img_saver.cpp View File

@@ -269,11 +269,11 @@ void ImgSaver::createDir( const TQString& dir )
{
KURL url( dir );

if( ! KIO::NetAccess::exists(url, false, 0) )
if( ! TDEIO::NetAccess::exists(url, false, 0) )
{
kdDebug(28000) << "Wrn: Directory <" << dir << "> does not exist -> try to create !" << endl;
// if( mkdir( TQFile::encodeName( dir ), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH ) != 0 )
if( KIO::mkdir( KURL(dir)))
if( TDEIO::mkdir( KURL(dir)))
{
KMessageBox::sorry(0, i18n("The folder\n%1\n does not exist and could not be created;\n"
"please check the permissions.").arg(dir));
@@ -335,7 +335,7 @@ ImgSaveStat ImgSaver::saveImage( TQImage *image )
kdDebug(28000) << "saveImage: Directory is " << directory << endl;
TQString filename = createFilename( format );

KConfig *konf = TDEGlobal::config ();
TDEConfig *konf = TDEGlobal::config ();
konf->setGroup( OP_FILE_GROUP );

if( konf->readBoolEntry( OP_ASK_FILENAME, false ) )
@@ -425,7 +425,7 @@ ImgSaveStat ImgSaver::saveImage( TQImage *image, const KURL& filename, const TQS
TQString ImgSaver::findFormat( picType type )
{
TQString format;
KConfig *konf = TDEGlobal::config ();
TDEConfig *konf = TDEGlobal::config ();
konf->setGroup( OP_FILE_GROUP );

if( type == PT_THUMBNAIL )
@@ -552,7 +552,7 @@ bool ImgSaver::isRememberedFormat( picType type, TQString format ) const

TQString ImgSaver::getFormatForType( picType type ) const
{
KConfig *konf = TDEGlobal::config ();
TDEConfig *konf = TDEGlobal::config ();
TQ_CHECK_PTR( konf );
konf->setGroup( OP_FILE_GROUP );

@@ -582,7 +582,7 @@ TQString ImgSaver::getFormatForType( picType type ) const

void ImgSaver::storeFormatForType( picType type, TQString format, bool ask )
{
KConfig *konf = TDEGlobal::config ();
TDEConfig *konf = TDEGlobal::config ();
TQ_CHECK_PTR( konf );
konf->setGroup( OP_FILE_GROUP );

@@ -691,7 +691,7 @@ ImgSaveStat ImgSaver::save( TQImage *image, const TQString &filename,
void ImgSaver::readConfig( void )
{

KConfig *konf = TDEGlobal::config ();