TDE
/
tdegraphics
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 6adb71382c
commit 3c5631f74d
173 changed files with 681 additions and 681 deletions
Show Stats Download Patch File Download Diff File

2
kamera/kcontrol/kamera.cpp
Unescape 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);

4
kamera/kcontrol/kamera.h
Unescape 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();

4
kamera/kcontrol/kameradevice.cpp
Unescape 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);

8
kamera/kcontrol/kameradevice.h
Unescape 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;

46
kamera/kioslave/kamera.cpp
Unescape 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;
}

8
kamera/kioslave/kamera.h
Unescape 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);

4
kcoloredit/kcoloredit.h
Unescape 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;

6
kdvi/dviRenderer.cpp
Unescape 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();

2
kdvi/infodialog.cpp
Unescape 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.")));

2
kdvi/kdvi_multipage.cpp
Unescape View File

@ -198,7 +198,7 @@ TQStringList KDVIMultiPage::fileFormats() const
}
void KDVIMultiPage::addConfigDialogs(KConfigDialog* configDialog)
void KDVIMultiPage::addConfigDialogs(TDEConfigDialog* configDialog)
{
static optionDialogFontsWidget* fontConfigWidget = 0;

2
kdvi/kdvi_multipage.h
Unescape 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();

6
kfax/kfax.cpp
Unescape 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 );
}
}

4
kfax/kfax.h
Unescape 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;

12
kgamma/kcmkgamma/kgamma.cpp
Unescape 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);

2
kgamma/kcmkgamma/kgamma.h
Unescape View File

@ -25,7 +25,7 @@ class TQComboBox;
class XVidExtWrap;
class TDEProcess;
class KGamma: public KCModule
class KGamma: public TDECModule
{
Q_OBJECT

2
kghostview/displayoptions.h
Unescape View File

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

4
kghostview/kghostview.upd
Unescape 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

26
kghostview/kgv_view.cpp
Unescape 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;
}

6
kghostview/kgv_view.h
Unescape 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;

4
kghostview/kgvconfigdialog.cpp
Unescape 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" ) );

2
kghostview/kgvdocument.cpp
Unescape 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

4
kghostview/kgvshell.cpp
Unescape 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() ) );

6
kghostview/kgvshell.h
Unescape 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();

4
kiconedit/kicon.cpp
Unescape 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)

6
kiconedit/kiconedit.cpp
Unescape 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();

4
kiconedit/kiconedit.h
Unescape 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:

4
kiconedit/knew.cpp
Unescape 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++)

4
kiconedit/properties.cpp
Unescape 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" );

2
kmrml/kmrml/kcontrol/kcmkmrml.cpp
Unescape 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",

2
kmrml/kmrml/kcontrol/kcmkmrml.h
Unescape View File

@ -28,7 +28,7 @@ namespace KMrmlConfig
{
class MainPage;
class KCMKMrml : public KCModule
class KCMKMrml : public TDECModule
{
Q_OBJECT

2
kmrml/kmrml/kcontrol/mainpage.cpp
Unescape 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 );
}

8
kmrml/kmrml/lib/kmrml_config.cpp
Unescape 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;

8
kmrml/kmrml/lib/kmrml_config.h
Unescape 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;
};
}

20
kmrml/kmrml/loader.cpp
Unescape 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() ) {

8
kmrml/kmrml/loader.h
Unescape 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;

8
kmrml/kmrml/mrml.cpp
Unescape 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 );
}

2
kmrml/kmrml/mrml.h
Unescape 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& );

36
kmrml/kmrml/mrml_part.cpp
Unescape 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;

14
kmrml/kmrml/mrml_part.h
Unescape 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;

8
kolourpaint/kpcommandhistory.cpp
Unescape 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 ());

18
kolourpaint/kpdocument.cpp
Unescape 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));
}

24
kolourpaint/kpdocumentsaveoptions.cpp
Unescape 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))
{

24
kolourpaint/kpdocumentsaveoptions.h
Unescape 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);

12
kolourpaint/kpdocumentsaveoptionswidget.cpp
Unescape 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 ();

22
kolourpaint/kpmainwindow.cpp
Unescape 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;

4
kolourpaint/kpmainwindow.h
Unescape 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 ();

30
kolourpaint/kpmainwindow_file.cpp
Unescape 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))
{

4
kolourpaint/kpmainwindow_help.cpp
Unescape 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.

8
kolourpaint/kpmainwindow_image.cpp
Unescape 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);

4
kolourpaint/kpmainwindow_settings.cpp
Unescape 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 ();

28
kolourpaint/kpmainwindow_text.cpp
Unescape 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 ();
}

8
kolourpaint/kpmainwindow_tools.cpp
Unescape 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 ();

20
kolourpaint/kpmainwindow_view.cpp
Unescape 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 ();

8
kolourpaint/pixmapfx/kpeffectflatten.cpp
Unescape 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);

4
kolourpaint/pixmapfx/kppixmapfx.cpp
Unescape 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))
{

4
kolourpaint/widgets/kptooltoolbar.cpp
Unescape 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))
{

8
kolourpaint/widgets/kptoolwidgetbase.cpp
Unescape 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);

2
kooka/CHANGES
Unescape 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.

20
kooka/img_saver.cpp
Unescape 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 ();
TDEConfig *konf = TDEGlobal::config ();
TQ_CHECK_PTR( konf );
konf->setGroup( OP_FILE_GROUP );
ask_for_format = konf->readBoolEntry( OP_FILE_ASK_FORMAT, true );
@ -794,13 +794,13 @@ bool ImgSaver::renameImage( const KURL& fromUrl, KURL& toUrl, bool askExt, TQWi
bool success = false;
if( KIO::NetAccess::exists( targetUrl, false,0 ) )
if( TDEIO::NetAccess::exists( targetUrl, false,0 ) )
{
kdDebug(28000)<< "Target already exists - can not copy" << endl;
}
else
{
if( KIO::file_move(fromUrl, targetUrl) )
if( TDEIO::file_move(fromUrl, targetUrl) )
{
success = true;
}
@ -886,7 +886,7 @@ bool ImgSaver::copyImage( const KURL& fromUrl, const KURL& toUrl, TQWidget *over
}
}
KIO::Job *copyjob = KIO::copy( fromUrl, targetUrl, false );
TDEIO::Job *copyjob = TDEIO::copy( fromUrl, targetUrl, false );
return( copyjob ? true : false );
}

18
kooka/kocrbase.cpp
Unescape View File

@ -81,8 +81,8 @@ KOCRBase::KOCRBase( TQWidget *parent, KSpellConfig *spellConfig,
kdDebug(28000) << "OCR Base Dialog!" << endl;
// Layout-Boxes
KConfig *konf = TDEGlobal::config ();
KConfigGroupSaver gs( konf, CFG_OCR_KSPELL );
TDEConfig *konf = TDEGlobal::config ();
TDEConfigGroupSaver gs( konf, CFG_OCR_KSPELL );
m_userWantsSpellCheck = konf->readBoolEntry(CFG_WANT_KSPELL, true);
/* Connect signals which disable the fields and store the configuration */
@ -237,16 +237,16 @@ void KOCRBase::introduceImage( KookaImage* img)
/* Start to create a preview job for the thumb */
KURL::List li(img->url());
KIO::Job *m_job = KIO::filePreview(li, m_previewSize.width(),
TDEIO::Job *m_job = TDEIO::filePreview(li, m_previewSize.width(),
m_previewSize.height());
if( m_job )
{
connect( m_job, TQT_SIGNAL( result( KIO::Job * )),
this, TQT_SLOT( slPreviewResult( KIO::Job * )));
connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )),
this, TQT_SLOT( slPreviewResult( TDEIO::Job * )));
connect( m_job, TQT_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )),
TQT_SLOT( slGotPreview( const KFileItem*, const TQPixmap& ) ));
/* KIO::Jo result is called in any way: Success, Failed, Error,
/* TDEIO::Jo result is called in any way: Success, Failed, Error,
* thus connecting the failed is not really necessary.
*/
}
@ -289,7 +289,7 @@ void KOCRBase::introduceImage( KookaImage* img)
m_metaBox->show();
}
void KOCRBase::slPreviewResult(KIO::Job *job )
void KOCRBase::slPreviewResult(TDEIO::Job *job )
{
// nothing
if( job && job->error() > 0 )
@ -359,8 +359,8 @@ void KOCRBase::slWantSpellcheck( bool wantIt )
}
m_userWantsSpellCheck = wantIt;
KConfig *konf = TDEGlobal::config ();
KConfigGroupSaver gs( konf, CFG_OCR_KSPELL );
TDEConfig *konf = TDEGlobal::config ();
TDEConfigGroupSaver gs( konf, CFG_OCR_KSPELL );
konf->writeEntry( CFG_WANT_KSPELL, wantIt );
}

2
kooka/kocrbase.h
Unescape View File

@ -134,7 +134,7 @@ protected slots:
virtual void slWantSpellcheck( bool wantIt );
private slots:
virtual void slPreviewResult( KIO::Job* );
virtual void slPreviewResult( TDEIO::Job* );
virtual void slGotPreview( const KFileItem*, const TQPixmap& );
private:

4
kooka/kocrgocr.cpp
Unescape View File

@ -93,7 +93,7 @@ EngineError KGOCRDialog::setupGui()
TQVBox *page = ocrPage();
TQ_CHECK_PTR( page );
KConfig *conf = TDEGlobal::config ();
TDEConfig *conf = TDEGlobal::config ();
conf->setGroup( CFG_GROUP_OCR_DIA );
//Qt::Horizontal line
@ -179,7 +179,7 @@ KGOCRDialog::~KGOCRDialog()
void KGOCRDialog::writeConfig( void )
{
KConfig *conf = TDEGlobal::config ();
TDEConfig *conf = TDEGlobal::config ();
conf->setGroup( CFG_GROUP_OCR_DIA );
conf->writeEntry( CFG_GOCR_BINARY, TQString(getOCRCmd()));

8
kooka/kocrkadmos.cpp
Unescape View File

@ -236,8 +236,8 @@ EngineError KadmosDialog::findClassifierPath()
KStandardDirs stdDir;
EngineError err = ENG_OK;
KConfig *conf = TDEGlobal::config ();
KConfigGroupSaver gs( conf, CFG_GROUP_KADMOS );
TDEConfig *conf = TDEGlobal::config ();
TDEConfigGroupSaver gs( conf, CFG_GROUP_KADMOS );
m_customClassifierPath = conf->readPathEntry( CFG_KADMOS_CLASSIFIER_PATH );
#if 0
@ -341,8 +341,8 @@ void KadmosDialog::slFontChanged( int id )
{
m_cbLang->clear();
KConfig *conf = TDEGlobal::config ();
KConfigGroupSaver gs( conf, CFG_GROUP_KADMOS );
TDEConfig *conf = TDEGlobal::config ();
TDEConfigGroupSaver gs( conf, CFG_GROUP_KADMOS );

2
kooka/kocrkadmos.h
Unescape View File

@ -41,7 +41,7 @@
class KScanCombo;
class TQWidget;
class TQButtonGroup;
class KConfig;
class TDEConfig;
class TQCheckBox;
class KSpellConfig;
class TQRadioButton;

4
kooka/kocrocrad.cpp
Unescape View File

@ -104,7 +104,7 @@ EngineError ocradDialog::setupGui()
TQVBox *page = ocrPage();
TQ_CHECK_PTR( page );
KConfig *conf = TDEGlobal::config ();
TDEConfig *conf = TDEGlobal::config ();
conf->setGroup( CFG_GROUP_OCR_DIA );
//Qt::Horizontal line
@ -177,7 +177,7 @@ ocradDialog::~ocradDialog()
void ocradDialog::writeConfig( void )
{
KConfig *conf = TDEGlobal::config ();
TDEConfig *conf = TDEGlobal::config ();
conf->setGroup( CFG_GROUP_OCR_DIA );
conf->writeEntry( CFG_OCRAD_BINARY, TQString(getOCRCmd()));

8
kooka/kooka.cpp
Unescape View File

@ -75,7 +75,7 @@ Kooka::Kooka( const TQCString& deviceToUse)
setXMLFile( "kookaui.rc", true );
setAcceptDrops(false); // Waba: Not (yet?) supported
KConfig *konf = TDEGlobal::config ();
TDEConfig *konf = TDEGlobal::config ();
readDockConfig ( konf, DOCK_SIZES );
// then, setup our actions
@ -109,7 +109,7 @@ void Kooka::createMyGUI( KParts::Part *part )
Kooka::~Kooka()
{
KConfig *konf = TDEGlobal::config ();
TDEConfig *konf = TDEGlobal::config ();
m_view->slCloseScanDevice();
writeDockConfig ( konf, DOCK_SIZES );
delete m_printer;
@ -271,7 +271,7 @@ actionCollection());
}
void Kooka::saveProperties(KConfig *config)
void Kooka::saveProperties(TDEConfig *config)
{
// the 'config' object points to the session managed
// config file. anything you write here will be available
@ -285,7 +285,7 @@ void Kooka::saveProperties(KConfig *config)
m_view->saveProperties( config );
}
void Kooka::readProperties(KConfig *config)
void Kooka::readProperties(TDEConfig *config)
{
(void) config;
// the 'config' object points to the session managed

6
kooka/kooka.h
Unescape View File

@ -84,14 +84,14 @@ protected:
* This function is called when it is time for the app to save its
* properties for session management purposes.
*/
void saveProperties(KConfig *);
void saveProperties(TDEConfig *);
/**
* This function is called when this app is restored. The KConfig
* This function is called when this app is restored. The TDEConfig
* object points to the session management config file that was saved
* with @ref saveProperties
*/
void readProperties(KConfig *);
void readProperties(TDEConfig *);
private slots:

2
kooka/kookapref.cpp
Unescape View File

@ -200,7 +200,7 @@ TQString KookaPreferences::tryFindBinary( const TQString& bin, const TQString& c
{
/* First check the config files for an entry */
KConfig *cfg = TDEGlobal::config();
TDEConfig *cfg = TDEGlobal::config();
cfg->setGroup(CFG_GROUP_OCR_DIA);
TQString res = cfg->readPathEntry( configKey /* CFG_GOCR_BINARY */, "notFound" );

4
kooka/kookapref.h
Unescape View File

@ -29,7 +29,7 @@
#include <kdialogbase.h>
#include <tqframe.h>
class KConfig;
class TDEConfig;
class TQLabel;
class KIntNumInput;
class KColorButton;
@ -78,7 +78,7 @@ private:
TQCheckBox *cbSkipFormatAsk;
TQCheckBox *cbFilenameAsk;
TQCheckBox *cbShowScannerSelection;
KConfig *konf;
TDEConfig *konf;
TQCheckBox *cbReadStartupImage;
KIntNumInput *m_thumbWidth;

4
kooka/kookaview.cpp
Unescape View File

@ -438,7 +438,7 @@ void KookaView::loadStartupImage( void )
kdDebug( 28000) << "Starting to load startup image" << endl;
/* Now set the configured stuff */
KConfig *konf = TDEGlobal::config ();
TDEConfig *konf = TDEGlobal::config ();
if( konf )
{
konf->setGroup(GROUP_STARTUP);
@ -939,7 +939,7 @@ void KookaView::updateCurrImage( TQImage& img )
}
void KookaView::saveProperties(KConfig *config)
void KookaView::saveProperties(TDEConfig *config)
{
kdDebug(28000) << "Saving Properties for KookaView !" << endl;
config->setGroup( GROUP_STARTUP );

4
kooka/kookaview.h
Unescape View File

@ -48,7 +48,7 @@
class KDockWidget;
class TQPainter;
class KSANEOCR;
class KConfig;
class TDEConfig;
class KPrinter;
class KComboBox;
class KAction;
@ -153,7 +153,7 @@ public slots:
void startOCR( KookaImage* );
void slCloseScanDevice();
void saveProperties( KConfig* );
void saveProperties( TDEConfig* );
/**
* slot to select the scanner device. Does all the work with selection

8
kooka/ksaneocr.cpp
Unescape View File

@ -68,7 +68,7 @@
* thread save unfortunately. See slotKadmosResult-comments for more information
*/
KSANEOCR::KSANEOCR( TQWidget*, KConfig *cfg ):
KSANEOCR::KSANEOCR( TQWidget*, TDEConfig *cfg ):
m_ocrProcessDia(0L),
daemon(0L),
visibleOCRRunning(false),
@ -85,7 +85,7 @@ KSANEOCR::KSANEOCR( TQWidget*, KConfig *cfg ):
m_applyFilter(false),
m_unlinkORF(true)
{
KConfig *konf = TDEGlobal::config ();
TDEConfig *konf = TDEGlobal::config ();
m_ocrEngine = OCRAD;
m_img = 0L;
m_tmpFile = 0L;
@ -403,8 +403,8 @@ void KSANEOCR::startOCRAD( )
*daemon << TQString("-l");
*daemon << TQString::number( ocrDia->layoutDetectionMode());
KConfig *konf = TDEGlobal::config ();
KConfigGroupSaver( konf, CFG_GROUP_OCRAD );
TDEConfig *konf = TDEGlobal::config ();
TDEConfigGroupSaver( konf, CFG_GROUP_OCRAD );
TQString format = konf->readEntry( CFG_OCRAD_FORMAT, "utf8");
*daemon << TQString("-F");

4
kooka/ksaneocr.h
Unescape View File

@ -59,7 +59,7 @@ class TQStringList;
class KSpell;
class KSpellConfig;
class ImageCanvas;
class KConfig;
class TDEConfig;
// class ocrWord;
// class ocrPage;
@ -79,7 +79,7 @@ class KSANEOCR : public TQObject
public:
enum OCREngines{ GOCR, OCRAD, KADMOS };
KSANEOCR( TQWidget*, KConfig *);
KSANEOCR( TQWidget*, TDEConfig *);
~KSANEOCR();
bool startOCRVisible( TQWidget* parent=0);

12
kooka/scanpackager.cpp
Unescape View File

@ -255,7 +255,7 @@ void ScanPackager::slotDecorate( KFileTreeViewItem* item )
item->setPixmap( 0, m_floppyPixmap );
if ( kfi )
{
item->setText(1, KIO::convertSize( kfi->size() ));
item->setText(1, TDEIO::convertSize( kfi->size() ));
}
}
@ -1050,13 +1050,13 @@ void ScanPackager::slotUrlsDropped( TQWidget*, TQDropEvent* ev, KURL::List& urls
}
if ( ev->action() == TQDropEvent::Move )
copyjob = KIO::move( urls, copyTo, true );
copyjob = TDEIO::move( urls, copyTo, true );
else
copyjob = KIO::copy( urls, copyTo, true );
copyjob = TDEIO::copy( urls, copyTo, true );
}
}
void ScanPackager::slotCanceled( KIO::Job* )
void ScanPackager::slotCanceled( TDEIO::Job* )
{
kdDebug(28000) << i18n("Canceled by user") << endl;
}
@ -1145,7 +1145,7 @@ void ScanPackager::slotDeleteItems( )
/* Since we are currently talking about local files here, NetAccess is OK */
if( result == KMessageBox::Continue )
{
if( KIO::NetAccess::del( urlToDel, 0 ))
if( TDEIO::NetAccess::del( urlToDel, 0 ))
{
if( nextToSelect )
setSelected( nextToSelect, true );
@ -1193,7 +1193,7 @@ void ScanPackager::slotCreateFolder( )
*/
slotSetNextUrlToSelect( url );
if( ! KIO::NetAccess::mkdir( url, 0, -1 ))
if( ! TDEIO::NetAccess::mkdir( url, 0, -1 ))
{
kdDebug(28000) << "ERR: creation of " << url.prettyURL() << " failed !" << endl;
}

10
kooka/scanpackager.h
Unescape View File

@ -59,15 +59,15 @@ class JobDescription
public:
enum JobType { NoJob, ImportJob, RenameJob, ExportJob };
JobDescription():jobType( NoJob ), kioJob(0L), pitem(0L) {}
JobDescription( KIO::Job* kiojob, KFileTreeViewItem *new_item, JobType type ) :
JobDescription( TDEIO::Job* kiojob, KFileTreeViewItem *new_item, JobType type ) :
jobType(type), kioJob(kiojob), pitem(new_item) {}
JobType type( void ) { return( jobType ); }
KFileTreeViewItem *item( void ) { return( pitem ); }
KIO::Job* job( void ){ return( kioJob ); }
TDEIO::Job* job( void ){ return( kioJob ); }
private:
JobType jobType;
KIO::Job* kioJob;
TDEIO::Job* kioJob;
KFileTreeViewItem* pitem;
};
@ -95,7 +95,7 @@ public slots:
void slotExportFile( );
void slotImportFile();
void slotCanceled(KIO::Job*);
void slotCanceled(TDEIO::Job*);
void slotCurrentImageChanged( TQImage* );
void slotDecorate( KFileTreeViewItem* );
@ -149,7 +149,7 @@ private:
TQString m_currImportDir;
TQString m_currCopyDir;
TQString currSelectedDir;
KIO::Job *copyjob;
TDEIO::Job *copyjob;
int img_counter;
TQPopupMenu *m_contextMenu;

14
kooka/thumbview.cpp
Unescape View File

@ -86,7 +86,7 @@ ThumbView::~ThumbView()
bool ThumbView::readSettings()
{
KConfig *cfg = TDEGlobal::config();
TDEConfig *cfg = TDEGlobal::config();
cfg->setGroup( THUMB_GROUP );
bool dirty = false;
@ -385,18 +385,18 @@ void ThumbView::slNewFileItems( const KFileItemList& items )
m_cntJobsStarted = 0;
/* start a preview-job */
m_job = KIO::filePreview(m_pendingJobs, m_pixWidth, m_pixHeight );
m_job = TDEIO::filePreview(m_pendingJobs, m_pixWidth, m_pixHeight );
if( m_job )
{
connect( m_job, TQT_SIGNAL( result( KIO::Job * )),
this, TQT_SLOT( slPreviewResult( KIO::Job * )));
connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )),
this, TQT_SLOT( slPreviewResult( TDEIO::Job * )));
connect( m_job, TQT_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )),
TQT_SLOT( slGotPreview( const KFileItem*, const TQPixmap& ) ));
m_pendingJobs.clear();
/* KIO::Jo result is called in any way: Success, Failed, Error,
/* TDEIO::Jo result is called in any way: Success, Failed, Error,
* thus connecting the failed is not really necessary.
*/
// connect( job, TQT_SIGNAL( failed( const KFileItem* )),
@ -424,7 +424,7 @@ void ThumbView::slGotPreview( const KFileItem* newFileItem, const TQPixmap& newP
}
void ThumbView::slPreviewResult( KIO::Job *job )
void ThumbView::slPreviewResult( TDEIO::Job *job )
{
if( job && job->error() > 0 )
{
@ -481,7 +481,7 @@ void ThumbView::clear()
void ThumbView::saveConfig()
{
KConfig *cfg = TDEGlobal::config();
TDEConfig *cfg = TDEGlobal::config();
cfg->setGroup( THUMB_GROUP );
cfg->writeEntry( MARGIN_COLOR1, m_marginColor1 );

8
kooka/thumbview.h
Unescape View File

@ -41,7 +41,7 @@
#include <kfileitem.h>
#include <kfileiconview.h>
/* KConfig group definitions */
/* TDEConfig group definitions */
#define MARGIN_COLOR1 "MarginColor1"
#define MARGIN_COLOR2 "MarginColor2"
#define PIXMAP_WIDTH "pixmapWidth"
@ -54,7 +54,7 @@
class TQPixmap;
class TQListViewItem;
class KProgress;
class KIO::PreviewJob;
class TDEIO::PreviewJob;
class ThumbView: public TQVBox /* KIconView */
{
@ -99,7 +99,7 @@ public slots:
void slNewFileItems( const KFileItemList& );
void slGotPreview( const KFileItem*, const TQPixmap& );
void slPreviewResult( KIO::Job* );
void slPreviewResult( TDEIO::Job* );
/**
* This connects to the IconView's executed signal and tells the packager
@ -146,7 +146,7 @@ private:
TQColor m_marginColor2;
TQString m_bgImg;
int m_cntJobsStarted;
KIO::PreviewJob *m_job;
TDEIO::PreviewJob *m_job;
KFileItemList m_pendingJobs;
};

2
kpdf/TODO
Unescape View File

@ -139,7 +139,7 @@ Done (newest features come first):
-> ADD: gfx capturing tool
-> ADD: composited renderer framework (in addition to a fast light one)
-> FIX: pageview repaint done internally (speed boost and reduced memory consumption)
-> ADD: KConfigXT settings framework and Accessibility config (acc. code mostly not done)
-> ADD: TDEConfigXT settings framework and Accessibility config (acc. code mostly not done)
-> FIX: workaround for scrollview bug 1/2 (painting hidden widgets under certain circumstances)
-> ADD: zoom into a rect defined by mouse (aka zoom to window)
-> FIX: sheet rotation in landscape case

4
kpdf/conf/preferencesdialog.cpp
Unescape View File

@ -18,8 +18,8 @@
// reimplementing this
#include "preferencesdialog.h"
PreferencesDialog::PreferencesDialog( TQWidget * parent, KConfigSkeleton * skeleton )
: KConfigDialog( parent, "preferences", skeleton )
PreferencesDialog::PreferencesDialog( TQWidget * parent, TDEConfigSkeleton * skeleton )
: TDEConfigDialog( parent, "preferences", skeleton )
{
m_general = new DlgGeneral(0);
m_performance = new DlgPerformance(0);

6
kpdf/conf/preferencesdialog.h
Unescape View File

@ -14,18 +14,18 @@
#include "conf/settings.h"
class TQWidget;
class KConfigSkeleton;
class TDEConfigSkeleton;
class DlgGeneral;
class DlgPerformance;
class DlgAccessibility;
class DlgPresentation;
class PreferencesDialog : public KConfigDialog
class PreferencesDialog : public TDEConfigDialog
{
public:
PreferencesDialog( TQWidget * parent, KConfigSkeleton * config );
PreferencesDialog( TQWidget * parent, TDEConfigSkeleton * config );
protected:
// void updateSettings(); // Called when OK/Apply is pressed.

16
kpdf/part.cpp
Unescape View File

@ -120,7 +120,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
m_actionsSearched(false), m_searchStarted(false)
{
// connect the started signal to tell the job the mimetypes we like
connect(this, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(setMimeTypes(KIO::Job *)));
connect(this, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(setMimeTypes(TDEIO::Job *)));
// connect the completed signal so we can put the window caption when loading remote files
connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(emitWindowCaption()));
@ -522,16 +522,16 @@ bool Part::openURL(const KURL &url)
return b;
}
void Part::setMimeTypes(KIO::Job *job)
void Part::setMimeTypes(TDEIO::Job *job)
{
if (job)
{
job->addMetaData("accept", "application/pdf, */*;q=0.5");
connect(job, TQT_SIGNAL(mimetype(KIO::Job*,const TQString&)), this, TQT_SLOT(readMimeType(KIO::Job*,const TQString&)));
connect(job, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&)), this, TQT_SLOT(readMimeType(TDEIO::Job*,const TQString&)));
}
}
void Part::readMimeType(KIO::Job *, const TQString &mime)
void Part::readMimeType(TDEIO::Job *, const TQString &mime)
{
m_jobMime = mime;
}
@ -809,13 +809,13 @@ void Part::slotSaveFileAs()
KMessageBox::information( widget(), i18n("You are trying to overwrite \"%1\" with itself. This is not allowed. Please save it in another location.").arg(saveURL.filename()) );
return;
}
if ( KIO::NetAccess::exists( saveURL, false, widget() ) )
if ( TDEIO::NetAccess::exists( saveURL, false, widget() ) )
{
if (KMessageBox::warningContinueCancel( widget(), i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(saveURL.filename()), TQString(), i18n("Overwrite")) != KMessageBox::Continue)
return;
}
if ( !KIO::NetAccess::file_copy( m_file, saveURL, -1, true ) )
if ( !TDEIO::NetAccess::file_copy( m_file, saveURL, -1, true ) )
KMessageBox::information( 0, i18n("File could not be saved in '%1'. Try to save it to another location.").arg( saveURL.prettyURL() ) );
}
}
@ -1065,7 +1065,7 @@ void Part::doPrint(KPrinter &printer)
}
}
void Part::restoreDocument(KConfig* config)
void Part::restoreDocument(TDEConfig* config)
{
KURL url ( config->readPathEntry( "URL" ) );
if ( url.isValid() )
@ -1076,7 +1076,7 @@ void Part::restoreDocument(KConfig* config)
}
}
void Part::saveDocumentRestoreInfo(KConfig* config)
void Part::saveDocumentRestoreInfo(TDEConfig* config)
{
config->writePathEntry( "URL", url().url() );
config->writeEntry( "Viewport", m_document->viewport().toString() );

10
kpdf/part.h
Unescape View File

@ -29,7 +29,7 @@ class TQToolBox;
class KURL;
class KAction;
class KConfig;
class TDEConfig;
class KDirWatch;
class KToggleAction;
class KSelectAction;
@ -121,15 +121,15 @@ protected slots:
void psTransformEnded();
void cannotQuit();
void saveSplitterSize();
void setMimeTypes(KIO::Job *job);
void readMimeType(KIO::Job *job, const TQString &mime);
void setMimeTypes(TDEIO::Job *job);
void readMimeType(TDEIO::Job *job, const TQString &mime);
void emitWindowCaption();
public slots:
// connected to Shell action (and browserExtension), not local one
void slotPrint();
void restoreDocument(KConfig* config);
void saveDocumentRestoreInfo(KConfig* config);
void restoreDocument(TDEConfig* config);
void saveDocumentRestoreInfo(TDEConfig* config);
void slotFileDirty( const TQString& );
void slotDoFileDirty();

8
kpdf/shell/shell.cpp
Unescape View File

@ -87,8 +87,8 @@ void Shell::init()
m_part = 0;
return;
}
connect( this, TQT_SIGNAL( restoreDocument(KConfig*) ),m_part, TQT_SLOT( restoreDocument(KConfig*)));
connect( this, TQT_SIGNAL( saveDocumentRestoreInfo(KConfig*) ), m_part, TQT_SLOT( saveDocumentRestoreInfo(KConfig*)));
connect( this, TQT_SIGNAL( restoreDocument(TDEConfig*) ),m_part, TQT_SLOT( restoreDocument(TDEConfig*)));
connect( this, TQT_SIGNAL( saveDocumentRestoreInfo(TDEConfig*) ), m_part, TQT_SLOT( saveDocumentRestoreInfo(TDEConfig*)));
connect( m_part, TQT_SIGNAL( enablePrintAction(bool) ), m_printAction, TQT_SLOT( setEnabled(bool)));
readSettings();
@ -161,7 +161,7 @@ void Shell::setupActions()
m_fullScreenAction = KStdAction::fullScreen( TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen() ), actionCollection(), this );
}
void Shell::saveProperties(KConfig* config)
void Shell::saveProperties(TDEConfig* config)
{
// the 'config' object points to the session managed
// config file. anything you write here will be available
@ -169,7 +169,7 @@ void Shell::saveProperties(KConfig* config)
emit saveDocumentRestoreInfo(config);
}
void Shell::readProperties(KConfig* config)
void Shell::readProperties(TDEConfig* config)
{
// the 'config' object points to the session managed
// config file. this function is automatically called whenever

10
kpdf/shell/shell.h
Unescape View File

@ -59,14 +59,14 @@ namespace KPDF
* This method is called when it is time for the app to save its
* properties for session management purposes.
*/
void saveProperties(KConfig*);
void saveProperties(TDEConfig*);
/**
* This method is called when this app is restored. The KConfig
* This method is called when this app is restored. The TDEConfig
* object points to the session management config file that was saved
* with @ref saveProperties
*/
void readProperties(KConfig*);
void readProperties(TDEConfig*);
void readSettings();
void writeSettings();
void setFullScreen( bool );
@ -86,8 +86,8 @@ namespace KPDF
void delayedOpen();
signals:
void restoreDocument(KConfig* config);
void saveDocumentRestoreInfo(KConfig* config);
void restoreDocument(TDEConfig* config);
void saveDocumentRestoreInfo(TDEConfig* config);
private:

4
kpovmodeler/pmcontrolpoint.cpp
Unescape View File

@ -82,7 +82,7 @@ void PMControlPoint::setRotateGrid( double d )
kdError( PMArea ) << "Grid has to be greater than 0\n";
}
void PMControlPoint::saveConfig( KConfig* cfg )
void PMControlPoint::saveConfig( TDEConfig* cfg )
{
cfg->setGroup( "Grid" );
cfg->writeEntry( "MoveGrid", s_moveGrid );
@ -90,7 +90,7 @@ void PMControlPoint::saveConfig( KConfig* cfg )
cfg->writeEntry( "ScaleGrid", s_scaleGrid );
}
void PMControlPoint::restoreConfig( KConfig* cfg )
void PMControlPoint::restoreConfig( TDEConfig* cfg )
{
cfg->setGroup( "Grid" );
s_moveGrid = cfg->readDoubleNumEntry( "MoveGrid", c_defaultMoveGrid );

6
kpovmodeler/pmcontrolpoint.h
Unescape View File

@ -28,7 +28,7 @@
#include <tqptrlist.h>
#include <tqstring.h>
class KConfig;
class TDEConfig;
/**
* Interface between the graphical views and the PMObject.
@ -153,8 +153,8 @@ public:
*/
static void setScaleGrid( double d );
static void saveConfig( KConfig* cfg );
static void restoreConfig( KConfig* cfg );
static void saveConfig( TDEConfig* cfg );
static void restoreConfig( TDEConfig* cfg );
protected:
/**

4
kpovmodeler/pmdialogeditbase.cpp
Unescape View File

@ -274,7 +274,7 @@ void PMDialogEditBase::setPreviewAADepth( int d )
s_previewAADepth = d;
}
void PMDialogEditBase::saveConfig( KConfig* cfg )
void PMDialogEditBase::saveConfig( TDEConfig* cfg )
{
cfg->setGroup( "TexturePreview" );
cfg->writeEntry( "Size", s_previewSize );
@ -293,7 +293,7 @@ void PMDialogEditBase::saveConfig( KConfig* cfg )
cfg->writeEntry( "Gamma", s_previewGamma );
}
void PMDialogEditBase::restoreConfig( KConfig* cfg )
void PMDialogEditBase::restoreConfig( TDEConfig* cfg )
{
cfg->setGroup( "TexturePreview" );
setPreviewSize( cfg->readNumEntry( "Size", s_previewSize ) );

6
kpovmodeler/pmdialogeditbase.h
Unescape View File

@ -34,7 +34,7 @@ class TQCheckBox;
class TQLayout;
class TQPushButton;
class TQVBox;
class KConfig;
class TDEConfig;
class PMPart;
class PMPovrayRenderWidget;
class PMPovrayOutputWidget;
@ -262,8 +262,8 @@ public:
*/
static void setPreviewGamma( double g ) { s_previewGamma = g; }
static void saveConfig( KConfig* cfg );
static void restoreConfig( KConfig* cfg );
static void saveConfig( TDEConfig* cfg );
static void restoreConfig( TDEConfig* cfg );
protected:
/**
* Sets the help topic

16
kpovmodeler/pmdockwidget.cpp
Unescape View File

@ -299,12 +299,12 @@ void PMDockMainWindow::readDockConfig(TQDomElement &base)
}
#ifndef NO_KDE2
void PMDockMainWindow::writeDockConfig( KConfig* c, TQString group )
void PMDockMainWindow::writeDockConfig( TDEConfig* c, TQString group )
{
dockManager->writeConfig( c, group );
}
void PMDockMainWindow::readDockConfig( KConfig* c, TQString group )
void PMDockMainWindow::readDockConfig( TDEConfig* c, TQString group )
{
dockManager->readConfig( c, group );
}
@ -457,12 +457,12 @@ void PMDockWidgetHeader::setDragEnabled(bool b)
}
#ifndef NO_KDE2
void PMDockWidgetHeader::saveConfig( KConfig* c )
void PMDockWidgetHeader::saveConfig( TDEConfig* c )
{
c->writeEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), stayButton->isOn() );
}
void PMDockWidgetHeader::loadConfig( KConfig* c )
void PMDockWidgetHeader::loadConfig( TDEConfig* c )
{
setDragEnabled( !c->readBoolEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), false ) );
}
@ -2000,7 +2000,7 @@ void PMDockManager::readConfig(TQDomElement &base)
#ifndef NO_KDE2
void PMDockManager::writeConfig( KConfig* c, TQString group )
void PMDockManager::writeConfig( TDEConfig* c, TQString group )
{
//debug("BEGIN Write Config");
if ( !c ) c = TDEGlobal::config();
@ -2119,7 +2119,7 @@ void PMDockManager::writeConfig( KConfig* c, TQString group )
//debug("END Write Config");
}
#include <tqmessagebox.h>
void PMDockManager::readConfig( KConfig* c, TQString group )
void PMDockManager::readConfig( TDEConfig* c, TQString group )
{
if ( !c ) c = TDEGlobal::config();
if ( group.isEmpty() ) group = "dock_setting_default";
@ -2497,12 +2497,12 @@ void PMDockArea::resizeEvent(TQResizeEvent *rsize)
}
#ifndef NO_KDE2
void PMDockArea::writeDockConfig( KConfig* c, TQString group )
void PMDockArea::writeDockConfig( TDEConfig* c, TQString group )
{
dockManager->writeConfig( c, group );
}
void PMDockArea::readDockConfig( KConfig* c, TQString group )
void PMDockArea::readDockConfig( TDEConfig* c, TQString group )
{
dockManager->readConfig( c, group );
}

32
kpovmodeler/pmdockwidget.h
Unescape View File

@ -94,7 +94,7 @@ class TQPixmap;
#ifndef NO_KDE2
class KToolBar;
class KConfig;
class TDEConfig;
#else
class TQToolBar;
#endif
@ -134,12 +134,12 @@ public:
/**
* Provides saving the current configuration. Must be overridden by an inheriting class.
*/
virtual void saveConfig( KConfig* ){};
virtual void saveConfig( TDEConfig* ){};
/**
* Provides loading the current configuration. Must be overridden by an inheriting class
*/
virtual void loadConfig( KConfig* ){};
virtual void loadConfig( TDEConfig* ){};
#endif
protected:
@ -286,14 +286,14 @@ public:
*
* @param c the configuration safe
*/
virtual void saveConfig( KConfig* c);
virtual void saveConfig( TDEConfig* c);
/**
* Loads the current button state from a KDE config container object.
*
* @param c the configuration safe
*/
virtual void loadConfig( KConfig* );
virtual void loadConfig( TDEConfig* );
#endif
protected slots:
@ -821,7 +821,7 @@ private:
* that can be called within a @ref PMDockMainWindow or a @ref PMDockWidget .
*
* An important feature is the ability to read or save the current state of all things concerning to
* dockwidgets to @ref KConfig .
* dockwidgets to @ref TDEConfig .
*
* The dockmanager is also often used when a certain dockwidget or a child of such dockwidget must be found.
*
@ -860,9 +860,9 @@ public:
* last but not least some necessary things for recovering the dockmainwindow state.
*
* @param c the KDE configuration saver
* @param group the name of the section in KConfig
* @param group the name of the section in TDEConfig
*/
void writeConfig( KConfig* c = 0L, TQString group = TQString() );
void writeConfig( TDEConfig* c = 0L, TQString group = TQString() );
/**
* Like writeConfig but reads the whole stuff in.
@ -878,9 +878,9 @@ public:
* to work, each widget must have a unique name.
*
* @param c the KDE configuration saver
* @param group the name of the section in KConfig
* @param group the name of the section in TDEConfig
*/
void readConfig ( KConfig* c = 0L, TQString group = TQString() );
void readConfig ( TDEConfig* c = 0L, TQString group = TQString() );
#endif
/**
@ -1284,20 +1284,20 @@ public:
#ifndef NO_KDE2
/**
* It writes the current dock state in the given section of KConfig.
* It writes the current dock state in the given section of TDEConfig.
*
* @param c KDE class for saving configurations
* @param group name of section to write to
*/
void writeDockConfig( KConfig* c = 0L, TQString group = TQString() );
void writeDockConfig( TDEConfig* c = 0L, TQString group = TQString() );
/**
* It reads the current dock state from the given section of KConfig.
* It reads the current dock state from the given section of TDEConfig.
*
* @param c KDE class for saving configurations
* @param group name of section to read from
*/
void readDockConfig ( KConfig* c = 0L, TQString group = TQString() );
void readDockConfig ( TDEConfig* c = 0L, TQString group = TQString() );
#endif
/**
@ -1443,8 +1443,8 @@ public:
void readDockConfig(TQDomElement &base);
#ifndef NO_KDE2
void writeDockConfig( KConfig* c = 0L, TQString group = TQString() );
void readDockConfig ( KConfig* c = 0L, TQString group = TQString() );
void writeDockConfig( TDEConfig* c = 0L, TQString group = TQString() );
void readDockConfig ( TDEConfig* c = 0L, TQString group = TQString() );
#endif

4
kpovmodeler/pmdocumentationmap.cpp
Unescape View File

@ -70,14 +70,14 @@ PMDocumentationMap::~PMDocumentationMap( )
m_maps.clear( );
}
void PMDocumentationMap::saveConfig( KConfig* cfg )
void PMDocumentationMap::saveConfig( TDEConfig* cfg )
{
cfg->setGroup( "Povray" );
cfg->writePathEntry( "DocumentationPath", m_documentationPath );
cfg->writeEntry( "DocumentationVersion", m_currentVersion );
}
void PMDocumentationMap::restoreConfig( KConfig* cfg )
void PMDocumentationMap::restoreConfig( TDEConfig* cfg )
{
cfg->setGroup( "Povray" );
m_documentationPath = cfg->readPathEntry( "DocumentationPath" );

6
kpovmodeler/pmdocumentationmap.h
Unescape View File

@ -29,7 +29,7 @@
#include <tqvaluelist.h>
#include <kstaticdeleter.h>
class KConfig;
class TDEConfig;
class TQDomElement;
/**
@ -113,8 +113,8 @@ public:
*/
TQString documentation( const TQString& objectName );
void saveConfig( KConfig* cfg );
void restoreConfig( KConfig* cfg );
void saveConfig( TDEConfig* cfg );
void restoreConfig( TDEConfig* cfg );
private:

4
kpovmodeler/pmerrordialog.cpp
Unescape View File

@ -115,13 +115,13 @@ void PMErrorDialog::displayMessages( )
m_pTextView->setText( text );
}
void PMErrorDialog::saveConfig( KConfig* cfg )
void PMErrorDialog::saveConfig( TDEConfig* cfg )
{
cfg->setGroup( "Appearance" );
cfg->writeEntry( "ErrorDialogSize", s_size );
}
void PMErrorDialog::restoreConfig( KConfig* cfg )
void PMErrorDialog::restoreConfig( TDEConfig* cfg )
{
cfg->setGroup( "Appearance" );

6
kpovmodeler/pmerrordialog.h
Unescape View File

@ -29,7 +29,7 @@
#include <tqptrdict.h>
#include <tqptrlist.h>
class KConfig;
class TDEConfig;
class TQTextEdit;
class PMObject;
@ -56,8 +56,8 @@ public:
PMErrorDialog( const PMMessageList& messages, int errorFlags,
TQWidget* parent = 0, const char* name = 0 );
static void saveConfig( KConfig* cfg );
static void restoreConfig( KConfig* cfg );
static void saveConfig( TDEConfig* cfg );
static void restoreConfig( TDEConfig* cfg );
protected:
virtual void resizeEvent( TQResizeEvent* ev );

4
kpovmodeler/pmglview.cpp
Unescape View File

@ -1526,11 +1526,11 @@ TQString PMGLView::viewTypeAsString( PMViewType t )
return str;
}
void PMGLView::saveConfig( KConfig* /*cfg*/ )
void PMGLView::saveConfig( TDEConfig* /*cfg*/ )
{
}
void PMGLView::restoreConfig( KConfig* /*cfg*/ )
void PMGLView::restoreConfig( TDEConfig* /*cfg*/ )
{
}

6
kpovmodeler/pmglview.h
Unescape View File

@ -42,7 +42,7 @@ const int controlPointSize = 7;
class PMObject;
class PMPart;
class PMCamera;
class KConfig;
class TDEConfig;
class TQComboBox;
/**
@ -152,11 +152,11 @@ public:
/**
* Saves the configuration
*/
static void saveConfig( KConfig* cfg );
static void saveConfig( TDEConfig* cfg );
/**
* Restores the configuration
*/
static void restoreConfig( KConfig* cfg );
static void restoreConfig( TDEConfig* cfg );
/**
* Returns true if the glx stuff was initialized successfully

6
kpovmodeler/pmlibrarybrowser.cpp
Unescape View File

@ -227,8 +227,8 @@ void PMLibraryBrowserViewWidget::slotDeleteClicked( )
{
case PMLibraryHandle::Ok:
{
KIO::Job *job = KIO::del( sel->path() );
connect( job, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( slotJobResult( KIO::Job * ) ) );
TDEIO::Job *job = TDEIO::del( sel->path() );
connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
}
break;
case PMLibraryHandle::ReadOnlyLib:
@ -289,7 +289,7 @@ void PMLibraryBrowserViewWidget::slotNewSubLibraryClicked( )
}
}
void PMLibraryBrowserViewWidget::slotJobResult( KIO::Job * job )
void PMLibraryBrowserViewWidget::slotJobResult( TDEIO::Job * job )
{
if( job->error( ) )
job->showErrorDialog( this );

6
kpovmodeler/pmlibrarybrowser.h
Unescape View File

@ -32,13 +32,13 @@
class TQComboBox;
class TQIconViewItem;
class TQPushButton;
class KConfig;
class TDEConfig;
class KDirOperator;
class PMLibraryIconView;
class PMLibraryEntryPreview;
class PMLibraryHandle;
class PMPart;
namespace KIO{ class Job; }
namespace TDEIO{ class Job; }
typedef TQDict<TQString> TQStringDict;
@ -81,7 +81,7 @@ private slots:
void slotNewObjectClicked( );
void slotNewSubLibraryClicked( );
void slotJobResult( KIO::Job * );
void slotJobResult( TDEIO::Job * );
// These slots provide delayed activity on the IconView
void slotIconViewRefresh( );

4
kpovmodeler/pmlibraryhandleedit.cpp
Unescape View File

@ -99,13 +99,13 @@ void PMLibraryHandleEdit::slotDescriptionChanged( )
enableButtonOK( true );
}
void PMLibraryHandleEdit::saveConfig( KConfig* cfg )
void PMLibraryHandleEdit::saveConfig( TDEConfig* cfg )
{
cfg->setGroup( "Appearance" );
cfg->writeEntry( "LibraryHandleEditSize", s_size );
}
void PMLibraryHandleEdit::restoreConfig( KConfig* cfg )
void PMLibraryHandleEdit::restoreConfig( TDEConfig* cfg )
{
cfg->setGroup( "Appearance" );

4
kpovmodeler/pmlibraryhandleedit.h
Unescape View File

@ -45,8 +45,8 @@ public:
*/
PMLibraryHandleEdit( PMLibraryHandle* lib, TQWidget *parent = NULL, const char* name = NULL );
static void saveConfig( KConfig* cfg );
static void restoreConfig( KConfig* cfg );
static void saveConfig( TDEConfig* cfg );
static void restoreConfig( TDEConfig* cfg );
static TQSize s_size;
private slots:

4
kpovmodeler/pmlibraryiconview.cpp
Unescape View File

@ -244,7 +244,7 @@ void PMLibraryIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDra
if( newParentLib.addSubLibrary( newpath, lib.name() ) == PMLibraryHandle::Ok )
{
lib.changeParentLibrary( m_path );
KIO::move( path, newpath );
TDEIO::move( path, newpath );
}
else
{
@ -263,7 +263,7 @@ void PMLibraryIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDra
PMLibraryObject obj = PMLibraryObject( path );
if( newParentLib.addObject( newpath, obj.name() ) == PMLibraryHandle::Ok )
{
KIO::move( path, newpath );
TDEIO::move( path, newpath );
}
else
{

4
kpovmodeler/pmlibrarymanager.cpp
Unescape View File

@ -51,11 +51,11 @@ PMLibraryManager::~PMLibraryManager( )
m_libraries.clear( );
}
void PMLibraryManager::saveConfig( KConfig* /*cfg*/ )
void PMLibraryManager::saveConfig( TDEConfig* /*cfg*/ )
{
}
void PMLibraryManager::restoreConfig( KConfig* /*cfg*/ )
void PMLibraryManager::restoreConfig( TDEConfig* /*cfg*/ )
{
}

6
kpovmodeler/pmlibrarymanager.h
Unescape View File

@ -31,7 +31,7 @@
#include "pmlibraryhandle.h"
class KConfig;
class TDEConfig;
class TQDomElement;
/**
@ -76,8 +76,8 @@ public:
*/
void refresh( );
void saveConfig( KConfig* cfg );
void restoreConfig( KConfig* cfg );
void saveConfig( TDEConfig* cfg );
void restoreConfig( TDEConfig* cfg );
private:

6
kpovmodeler/pmpart.cpp
Unescape View File

@ -742,7 +742,7 @@ void PMPart::initView( TQWidget* parent, const char* name )
}
}
void PMPart::saveConfig( KConfig* cfg )
void PMPart::saveConfig( TDEConfig* cfg )
{
if( m_pView )
m_pView->saveConfig( cfg );
@ -788,7 +788,7 @@ void PMPart::saveConfig( KConfig* cfg )
cfg->writeEntry( "DirectRendering", PMGLView::isDirectRenderingEnabled( ) );
}
void PMPart::restoreConfig( KConfig* cfg )
void PMPart::restoreConfig( TDEConfig* cfg )
{
if( m_pView )
m_pView->restoreConfig( cfg );
@ -958,7 +958,7 @@ bool PMPart::exportPovray( const KURL& url )
if( tempFile )
{
tempFile->close( );
ok = KIO::NetAccess::upload( tempFile->name( ), url, (TQWidget*) 0 );
ok = TDEIO::NetAccess::upload( tempFile->name( ), url, (TQWidget*) 0 );
tempFile->unlink( );
file = 0;
}

4
kpovmodeler/pmpart.h
Unescape View File

@ -120,11 +120,11 @@ public:
/**
* saves settings
*/
void saveConfig( KConfig* cfg );
void saveConfig( TDEConfig* cfg );
/**
* loads settings
*/
void restoreConfig( KConfig* cfg );
void restoreConfig( TDEConfig* cfg );
/**
* Updates the sorted list of selected objects if necessary and

4
kpovmodeler/pmpluginmanager.cpp
Unescape View File

@ -47,7 +47,7 @@ public:
PMPluginManager::PMPluginManager( )
{
// find installed plugins
KConfigGroup cfgGroup( PMFactory::instance( )->config( ),
TDEConfigGroup cfgGroup( PMFactory::instance( )->config( ),
"KParts Plugins" );
TQValueList<Plugin::PluginInfo> plugins
= PMPluginWorkaround::installedPlugins( PMFactory::instance( ) );
@ -95,7 +95,7 @@ void PMPluginManager::removePart( PMPart* p )
void PMPluginManager::updatePlugins( )
{
KConfigGroup cfgGroup( PMFactory::instance( )->config( ),
TDEConfigGroup cfgGroup( PMFactory::instance( )->config( ),
"KParts Plugins" );
TQPtrListIterator<PMPluginInfo> pit( m_plugins );
for( ; *pit; ++pit )

4
kpovmodeler/pmpovrayoutputwidget.cpp
Unescape View File

@ -93,13 +93,13 @@ void PMPovrayOutputWidget::slotClose( )
}
void PMPovrayOutputWidget::saveConfig( KConfig* cfg )
void PMPovrayOutputWidget::saveConfig( TDEConfig* cfg )
{
cfg->setGroup( "Appearance" );
cfg->writeEntry( "PovrayOutputWidgetSize", s_size );
}
void PMPovrayOutputWidget::restoreConfig( KConfig* cfg )
void PMPovrayOutputWidget::restoreConfig( TDEConfig* cfg )
{
cfg->setGroup( "Appearance" );

6
kpovmodeler/pmpovrayoutputwidget.h
Unescape View File

@ -26,7 +26,7 @@
#include <kdialog.h>
class TQTextEdit;
class KConfig;
class TDEConfig;
/**
* Widget to display the povray text output
@ -45,8 +45,8 @@ public:
*/
~PMPovrayOutputWidget( );
static void saveConfig( KConfig* cfg );
static void restoreConfig( KConfig* cfg );
static void saveConfig( TDEConfig* cfg );
static void restoreConfig( TDEConfig* cfg );
public slots:
/**

4
kpovmodeler/pmpovrayrenderwidget.cpp
Unescape View File

@ -404,7 +404,7 @@ TQSize PMPovrayRenderWidget::sizeHint( ) const
return s.expandedTo( minimumSize( ) );
}
void PMPovrayRenderWidget::saveConfig( KConfig* cfg )
void PMPovrayRenderWidget::saveConfig( TDEConfig* cfg )
{
cfg->setGroup( "Povray" );
#if ( ( TDE_VERSION_MAJOR == 3 ) && ( TDE_VERSION_MINOR <= 1 ) )
@ -416,7 +416,7 @@ void PMPovrayRenderWidget::saveConfig( KConfig* cfg )
#endif
}
void PMPovrayRenderWidget::restoreConfig( KConfig* cfg )
void PMPovrayRenderWidget::restoreConfig( TDEConfig* cfg )
{
cfg->setGroup( "Povray" );
#if ( ( TDE_VERSION_MAJOR == 3 ) && ( TDE_VERSION_MINOR <= 1 ) )

6
kpovmodeler/pmpovrayrenderwidget.h
Unescape View File

@ -32,7 +32,7 @@
#include "pmdragwidget.h"
class TDEProcess;
class KConfig;
class TDEConfig;
class KURL;
class KTempFile;
@ -71,8 +71,8 @@ public:
*/
TQImage image( ) const { return m_image; }
static void saveConfig( KConfig* cfg );
static void restoreConfig( KConfig* cfg );
static void saveConfig( TDEConfig* cfg );
static void restoreConfig( TDEConfig* cfg );
/**
* Returns the povray command

2
kpovmodeler/pmpovraywidget.cpp
Unescape View File

@ -294,7 +294,7 @@ void PMPovrayWidget::slotSave( )
if( tempFile )
{
tempFile->close( );
ok = KIO::NetAccess::upload( tempFile->name( ), url );
ok = TDEIO::NetAccess::upload( tempFile->name( ), url );
tempFile->unlink( );
file = 0;
}

4
kpovmodeler/pmrendermanager.cpp
Unescape View File

@ -1592,7 +1592,7 @@ void PMRenderManager::slotRenderingSettingsChanged( )
emit renderingSettingsChanged( );
}
void PMRenderManager::saveConfig( KConfig* cfg )
void PMRenderManager::saveConfig( TDEConfig* cfg )
{
cfg->setGroup( "Rendering" );
cfg->writeEntry( "BackgroundColor", m_backgroundColor );
@ -1609,7 +1609,7 @@ void PMRenderManager::saveConfig( KConfig* cfg )
cfg->writeEntry( "HighDetailCameraViews", m_highDetailCameraView );
}
void PMRenderManager::restoreConfig( KConfig* cfg )
void PMRenderManager::restoreConfig( TDEConfig* cfg )
{
cfg->setGroup( "Rendering" );

6
kpovmodeler/pmrendermanager.h
Unescape View File

@ -39,7 +39,7 @@
class PMGLView;
class PMCamera;
class PMPoint;
class KConfig;
class TDEConfig;
class TQString;
/**
@ -215,11 +215,11 @@ public:
/**
* Saves the configuration
*/
void saveConfig( KConfig* cfg );
void saveConfig( TDEConfig* cfg );
/**
* Restores the configuration
*/
void restoreConfig( KConfig* cfg );
void restoreConfig( TDEConfig* cfg );
/**
* Returns true if the glx extension is available

8
kpovmodeler/pmrendermodesdialog.cpp
Unescape View File

@ -124,13 +124,13 @@ void PMRenderModesDialog::checkButtons( )
}
}
void PMRenderModesDialog::saveConfig( KConfig* cfg )
void PMRenderModesDialog::saveConfig( TDEConfig* cfg )
{
cfg->setGroup( "Appearance" );
cfg->writeEntry( "RenderModesDialogSize", s_size );
}
void PMRenderModesDialog::restoreConfig( KConfig* cfg )
void PMRenderModesDialog::restoreConfig( TDEConfig* cfg )
{
cfg->setGroup( "Appearance" );
@ -390,13 +390,13 @@ PMRenderModeDialog::PMRenderModeDialog( PMRenderMode* mode, TQWidget* parent, co
connect( m_pAlphaBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotToggled( bool ) ) );
}
void PMRenderModeDialog::saveConfig( KConfig* cfg )
void PMRenderModeDialog::saveConfig( TDEConfig* cfg )
{
cfg->setGroup( "Appearance" );
cfg->writeEntry( "RenderModeDialogSize", s_size );
}
void PMRenderModeDialog::restoreConfig( KConfig* cfg )
void PMRenderModeDialog::restoreConfig( TDEConfig* cfg )
{
cfg->setGroup( "Appearance" );

10
kpovmodeler/pmrendermodesdialog.h
Unescape View File

@ -28,7 +28,7 @@ class TQLineEdit;
class TQListBox;
class TQPushButton;
class TQTabWidget;
class KConfig;
class TDEConfig;
class PMIntEdit;
class PMFloatEdit;
@ -46,8 +46,8 @@ public:
*/
PMRenderModesDialog( PMRenderModeList* modes, TQWidget* parent = 0, const char* name = 0 );
static void saveConfig( KConfig* cfg );
static void restoreConfig( KConfig* cfg );
static void saveConfig( TDEConfig* cfg );
static void restoreConfig( TDEConfig* cfg );
protected slots:
/**
@ -115,8 +115,8 @@ public:
*/
PMRenderModeDialog( PMRenderMode* mode, TQWidget* parent = 0, const char* name = 0 );
static void saveConfig( KConfig* cfg );
static void restoreConfig( KConfig* cfg );
static void saveConfig( TDEConfig* cfg );
static void restoreConfig( TDEConfig* cfg );
protected:
virtual void resizeEvent( TQResizeEvent* ev );

4
kpovmodeler/pmsettingsdialog.cpp
Unescape View File

@ -200,13 +200,13 @@ void PMSettingsDialog::saveSettings( )
}
}
void PMSettingsDialog::saveConfig( KConfig* cfg )
void PMSettingsDialog::saveConfig( TDEConfig* cfg )
{
cfg->setGroup( "Appearance" );
cfg->writeEntry( "SettingsDialogSize", s_size );
}
void PMSettingsDialog::restoreConfig( KConfig* cfg )
void PMSettingsDialog::restoreConfig( TDEConfig* cfg )
{
cfg->setGroup( "Appearance" );

6
kpovmodeler/pmsettingsdialog.h
Unescape View File

@ -35,7 +35,7 @@ class TQListView;
class TQButtonGroup;
class TQComboBox;
class KColorButton;
class KConfig;
class TDEConfig;
class PMIntEdit;
class PMFloatEdit;
class PMPart;
@ -141,8 +141,8 @@ public:
*/
void registerPage( TQWidget* topPage, PMSettingsDialogPage* page );
static void saveConfig( KConfig* cfg );
static void restoreConfig( KConfig* cfg );
static void saveConfig( TDEConfig* cfg );
static void restoreConfig( TDEConfig* cfg );
protected:
virtual void resizeEvent( TQResizeEvent* ev );

6
kpovmodeler/pmshell.cpp
Unescape View File

@ -73,7 +73,7 @@ PMShell::PMShell( const KURL& url )
m_pStatusBar->insertItem( " ", c_statusBarInfo, 1 );
m_pStatusBar->insertItem( "" , c_statusBarControlPoints );
KConfig* config = instance( )->config( );
TDEConfig* config = instance( )->config( );
config->setGroup( "Appearance" );
applyMainWindowSettings( config );
@ -558,7 +558,7 @@ void PMShell::updateGUI( )
void PMShell::saveOptions( )
{
kdDebug( PMArea ) << "Saving configuration" << endl;
KConfig* config = TDEGlobal::config( );
TDEConfig* config = TDEGlobal::config( );
// set group
config->setGroup( "Appearance" );
@ -574,7 +574,7 @@ void PMShell::saveOptions( )
void PMShell::restoreOptions( )
{
KConfig* config = instance( )->config( );
TDEConfig* config = instance( )->config( );
// set group
config->setGroup( "Appearance" );

4
kpovmodeler/pmview.cpp
Unescape View File

@ -88,7 +88,7 @@ void PMView::print( TQPrinter* pPrinter )
printpainter.end( );
}
void PMView::saveConfig( KConfig* cfg )
void PMView::saveConfig( TDEConfig* cfg )
{
cfg->setGroup( "Appearance" );
@ -96,7 +96,7 @@ void PMView::saveConfig( KConfig* cfg )
cfg->writeEntry( "TreeEditSplitter", m_pTreeEditSplitter->sizes( ) );
}
void PMView::restoreConfig( KConfig* cfg )
void PMView::restoreConfig( TDEConfig* cfg )
{
cfg->setGroup( "Appearance" );

6
kpovmodeler/pmview.h
Unescape View File

@ -31,7 +31,7 @@ class PMTreeView;
class PMDialogView;
class PMPart;
class TQSplitter;
class KConfig;
class TDEConfig;
/**
* The PMView class provides the view widget for the PMPart document class.
@ -61,11 +61,11 @@ public:
/**
* saves settings
*/
void saveConfig( KConfig* cfg );
void saveConfig( TDEConfig* cfg );
/**
* loads settings
*/
void restoreConfig( KConfig* cfg );
void restoreConfig( TDEConfig* cfg );
private:
PMTreeView* m_pTreeView;
PMPart* m_pPart;

2
kpovmodeler/pmviewlayoutmanager.h
Unescape View File

@ -35,7 +35,7 @@
#include "pmdockwidget.h"
#include "pmviewbase.h"
class KConfig;
class TDEConfig;
class TQDomElement;
class TQLineEdit;
class PMShell;

8
kruler/klineal.cpp
Unescape View File

@ -94,7 +94,7 @@ KLineal::KLineal(TQWidget*parent,const char* name):KMainWindow(parent,name){
mCurrentCursor = mNorthCursor;
setMinimumSize(60,60);
setMaximumSize(8000,8000);
KConfig *cfg = kapp->config();
TDEConfig *cfg = kapp->config();
TQColor defaultColor = DEFAULT_RULER_COLOR;
TQFont defaultFont(TDEGlobalSettings::generalFont().family(), 8);
defaultFont.setPixelSize(8);
@ -420,7 +420,7 @@ void KLineal::setColor(const TQColor &color) {
* save the ruler color to the config file
*/
void KLineal::saveSettings() {
KConfig *cfg = kapp->config(); // new KConfig(locateLocal("config", kapp->name()+"rc"));
TDEConfig *cfg = kapp->config(); // new TDEConfig(locateLocal("config", kapp->name()+"rc"));
if (cfg) {
TQColor color = mColor;
cfg->setGroup(CFG_GROUP_SETTINGS);
@ -747,14 +747,14 @@ void KLineal::paintEvent(TQPaintEvent * /*inEvent*/) {
painter.end();
}
void KLineal::readProperties(KConfig *cfg) {
void KLineal::readProperties(TDEConfig *cfg) {
mOrientation = cfg->readNumEntry("Orientation", South);
setupCursor();
setupBackground();
repaint();
}
void KLineal::saveProperties(KConfig* cfg) {
void KLineal::saveProperties(TDEConfig* cfg) {
cfg->writeEntry("Orientation", mOrientation);
}

4
kruler/klineal.h
Unescape View File

@ -56,8 +56,8 @@ protected:
void setupBackground();
// session management
virtual void saveProperties( KConfig *config );
virtual void readProperties( KConfig *config );
virtual void saveProperties( TDEConfig *config );
virtual void readProperties( TDEConfig *config );
private:
void drawScale(TQPainter &painter);

10
ksnapshot/ksnapshot.cpp
Unescape View File

@ -94,7 +94,7 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name, bool grabCurrent)
grabber->releaseMouse();
grabber->hide();
KConfig *conf=TDEGlobal::config();
TDEConfig *conf=TDEGlobal::config();
conf->setGroup("GENERAL");
mainWidget->setDelay(conf->readNumEntry("delay",0));
mainWidget->setMode( conf->readNumEntry( "mode", 0 ) );
@ -102,7 +102,7 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name, bool grabCurrent)
filename = KURL::fromPathOrURL( conf->readPathEntry( "filename", TQDir::currentDirPath()+"/"+i18n("snapshot")+"1.png" ));
// Make sure the name is not already being used
while(KIO::NetAccess::exists( filename, false, this )) {
while(TDEIO::NetAccess::exists( filename, false, this )) {
autoincFilename();
}
@ -160,7 +160,7 @@ bool KSnapshot::save( const TQString &filename )
bool KSnapshot::save( const KURL& url )
{
if ( KIO::NetAccess::exists( url, false, this ) ) {
if ( TDEIO::NetAccess::exists( url, false, this ) ) {
const TQString title = i18n( "File Exists" );
const TQString text = i18n( "<qt>Do you really want to overwrite <b>%1</b>?</qt>" ).arg(url.prettyURL());
if (KMessageBox::Continue != KMessageBox::warningContinueCancel( this, text, title, i18n("Overwrite") ) )
@ -188,7 +188,7 @@ bool KSnapshot::save( const KURL& url )
if ( tmpFile.status() == 0 ) {
if ( snapshot.save( tmpFile.file(), type.latin1() ) ) {
if ( tmpFile.close() )
ok = KIO::NetAccess::upload( tmpFile.name(), url, this );
ok = TDEIO::NetAccess::upload( tmpFile.name(), url, this );
}
}
}
@ -361,7 +361,7 @@ void KSnapshot::slotWindowGrabbed( const TQPixmap &pix )
void KSnapshot::closeEvent( TQCloseEvent * e )
{
KConfig *conf=TDEGlobal::config();
TDEConfig *conf=TDEGlobal::config();
conf->setGroup("GENERAL");
conf->writeEntry("delay",mainWidget->delay());
conf->writeEntry("mode",mainWidget->mode());

32
ksvg/core/KSVGLoader.cpp
Unescape View File

@ -49,14 +49,14 @@ KSVGLoader::~KSVGLoader()
TQString KSVGLoader::loadXML(::KURL url)
{
TQString tmpFile;
if(KIO::NetAccess::download(url, tmpFile, 0))
if(TDEIO::NetAccess::download(url, tmpFile, 0))
{
TQIODevice *dev = KFilterDev::deviceForFile(tmpFile, "application/x-gzip", true);
TQByteArray contents;
if(dev->open(IO_ReadOnly))
contents = dev->readAll();
delete dev;
KIO::NetAccess::removeTempFile(tmpFile);
TDEIO::NetAccess::removeTempFile(tmpFile);
return TQString(contents);
}
@ -68,12 +68,12 @@ void KSVGLoader::getSVGContent(::KURL url)
if(!url.prettyURL().isEmpty())
{
if(m_job == 0)
m_job = KIO::get(url, false, false);
m_job = TDEIO::get(url, false, false);
m_job->setAutoErrorHandlingEnabled(true);
connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
connect(m_job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotResult(KIO::Job *)));
connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *)));
}
}
@ -89,14 +89,14 @@ void KSVGLoader::newImageJob(SVGImageElementImpl *image, ::KURL baseURL)
map->data = new TQByteArray();
map->imageElement = image;
KIO::TransferJob *imageJob = KIO::get(::KURL(baseURL, map->imageElement->fileName()), false, false);
connect(imageJob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
connect(imageJob, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotResult(KIO::Job *)));
TDEIO::TransferJob *imageJob = TDEIO::get(::KURL(baseURL, map->imageElement->fileName()), false, false);
connect(imageJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
connect(imageJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *)));
m_imageJobs.insert(imageJob, map);
}
void KSVGLoader::slotData(KIO::Job *job, const TQByteArray &data)
void KSVGLoader::slotData(TDEIO::Job *job, const TQByteArray &data)
{
if(job == m_job)
{
@ -105,7 +105,7 @@ void KSVGLoader::slotData(KIO::Job *job, const TQByteArray &data)
}
else
{
TQMap<KIO::TransferJob *, ImageStreamMap *>::Iterator it;
TQMap<TDEIO::TransferJob *, ImageStreamMap *>::Iterator it;
for(it = m_imageJobs.begin(); it != m_imageJobs.end(); ++it)
{
if(it.key() == job)
@ -118,13 +118,13 @@ void KSVGLoader::slotData(KIO::Job *job, const TQByteArray &data)
}
}
void KSVGLoader::slotResult(KIO::Job *job)
void KSVGLoader::slotResult(TDEIO::Job *job)
{
if(job == m_job)
{
if(m_job->error() == 0)
{
TQString check = static_cast<KIO::TransferJob *>(job)->url().prettyURL();
TQString check = static_cast<TDEIO::TransferJob *>(job)->url().prettyURL();
if(check.contains(".svgz") || check.contains(".svg.gz"))
{
// decode the gzipped svg and emit it
@ -151,7 +151,7 @@ void KSVGLoader::slotResult(KIO::Job *job)
}
else
{
TQMap<KIO::TransferJob *, ImageStreamMap *>::Iterator it;
TQMap<TDEIO::TransferJob *, ImageStreamMap *>::Iterator it;
for(it = m_imageJobs.begin(); it != m_imageJobs.end(); ++it)
{
if(it.key() == job)
@ -184,7 +184,7 @@ void KSVGLoader::slotResult(KIO::Job *job)
(streamMap->data)->resize(0);
m_imageJobs.remove(static_cast<KIO::TransferJob *>(job));
m_imageJobs.remove(static_cast<TDEIO::TransferJob *>(job));
emit imageReady(streamMap->imageElement);
break;
@ -204,7 +204,7 @@ TQString KSVGLoader::getUrl(::KURL url, bool local)
void KSVGLoader::postUrl(::KURL url, const TQByteArray &data, const TQString &mimeType, KJS::ExecState *exec, KJS::Object &callBackFunction, KJS::Object &status)
{
KIO::TransferJob *job = KIO::http_post(url, data, false);
TDEIO::TransferJob *job = TDEIO::http_post(url, data, false);
job->addMetaData("content-type", mimeType);
m_postUrlData.job = job;
@ -212,7 +212,7 @@ void KSVGLoader::postUrl(::KURL url, const TQByteArray &data, const TQString &mi
m_postUrlData.status = &status;
m_postUrlData.callBackFunction = &callBackFunction;
connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *)));
connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
}
class CharacterDataSearcher : public TQXmlDefaultHandler

12
ksvg/core/KSVGLoader.h
Unescape View File

@ -25,7 +25,7 @@
class KURL;
namespace KIO
namespace TDEIO
{
class Job;
class TransferJob;
@ -44,7 +44,7 @@ struct ImageStreamMap;
typedef struct
{
KIO::Job *job;
TDEIO::Job *job;
KJS::ExecState *exec;
KJS::Object *callBackFunction, *status;
} PostUrlData;
@ -73,8 +73,8 @@ signals:
void imageReady(SVGImageElementImpl *);
private slots:
void slotData(KIO::Job *, const TQByteArray &);
void slotResult(KIO::Job *);
void slotData(TDEIO::Job *, const TQByteArray &);
void slotResult(TDEIO::Job *);
private:
static TQString loadXML(::KURL);
@ -82,8 +82,8 @@ private:
PostUrlData m_postUrlData;
TQByteArray m_data;
KIO::TransferJob *m_job;
TQMap<KIO::TransferJob *, ImageStreamMap *> m_imageJobs;
TDEIO::TransferJob *m_job;
TQMap<TDEIO::TransferJob *, ImageStreamMap *> m_imageJobs;
};
}

4
ksvg/impl/SVGColorProfileElementImpl.cc
Unescape View File

@ -186,7 +186,7 @@ bool SVGColorProfileElementImpl::canLoad(bool remote, bool &tempFile, TQString &
{
if(remote)
{
if(KIO::NetAccess::download(file, open, 0))
if(TDEIO::NetAccess::download(file, open, 0))
tempFile = true;
}
}
@ -218,7 +218,7 @@ bool SVGColorProfileElementImpl::loadColorProfile()
m_loaded = true;
if(tempFile)
KIO::NetAccess::removeTempFile(open);
TDEIO::NetAccess::removeTempFile(open);
return true;
}

10
ksvg/impl/SVGScriptElementImpl.cc
Unescape View File

@ -73,20 +73,20 @@ void SVGScriptElementImpl::setAttributes()
KURL url(ownerDoc()->baseUrl(), href);
if(m_job == 0)
m_job = KIO::get(url, false, false);
m_job = TDEIO::get(url, false, false);
connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
connect(m_job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotResult(KIO::Job *)));
connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *)));
}
}
void SVGScriptElementImpl::slotData(KIO::Job *, const TQByteArray &data)
void SVGScriptElementImpl::slotData(TDEIO::Job *, const TQByteArray &data)
{
TQDataStream dataStream(m_data, IO_WriteOnly | IO_Append);
dataStream.writeRawBytes(data.data(), data.size());
}
void SVGScriptElementImpl::slotResult(KIO::Job *)
void SVGScriptElementImpl::slotResult(TDEIO::Job *)
{
m_job = 0;

6
ksvg/impl/SVGScriptElementImpl.h
Unescape View File

@ -58,11 +58,11 @@ public:
static bool executeScript(DOM::Node node, SVGDocumentImpl *document, const TQString &text);
private slots:
void slotData(KIO::Job *, const TQByteArray &);
void slotResult(KIO::Job *);
void slotData(TDEIO::Job *, const TQByteArray &);
void slotResult(TDEIO::Job *);
private:
KIO::TransferJob *m_job;
TDEIO::TransferJob *m_job;
TQByteArray m_data;
TQString m_text;
bool m_added;

8
kuickshow/src/filefinder.cpp
Unescape View File

@ -51,8 +51,8 @@ FileFinder::FileFinder( TQWidget *parent, const char *name )
setAutoDeleteCompletionObject( true );
setFocusPolicy( TQ_ClickFocus );
KConfig *config = TDEGlobal::config();
KConfigGroupSaver cs( config, "GeneralConfiguration" );
TDEConfig *config = TDEGlobal::config();
TDEConfigGroupSaver cs( config, "GeneralConfiguration" );
setCompletionMode( (TDEGlobalSettings::Completion)
config->readNumEntry( "FileFinderCompletionMode",
TDEGlobalSettings::completionMode()));
@ -60,8 +60,8 @@ FileFinder::FileFinder( TQWidget *parent, const char *name )
FileFinder::~FileFinder()
{
KConfig *config = TDEGlobal::config();
KConfigGroupSaver cs( config, "GeneralConfiguration" );
TDEConfig *config = TDEGlobal::config();
TDEConfigGroupSaver cs( config, "GeneralConfiguration" );
config->writeEntry( "FileFinderCompletionMode", completionMode() );
}

4
kuickshow/src/filewidget.cpp
Unescape View File

@ -229,8 +229,8 @@ bool FileWidget::eventFilter( TQObject *o, TQEvent *e )
}
// KIO::NetAccess::stat() does NOT give us the right mimetype, while
// KIO::NetAccess::mimetype() does. So we have this hacklet to tell
// TDEIO::NetAccess::stat() does NOT give us the right mimetype, while
// TDEIO::NetAccess::mimetype() does. So we have this hacklet to tell
// showImage that the KFileItem is really an image.
#define IS_IMAGE 5
#define MY_TYPE 55

6
kuickshow/src/imagewindow.cpp
Unescape View File

@ -839,10 +839,10 @@ void ImageWindow::dropEvent( TQDropEvent *e )
if ( KURLDrag::decode( e, list ) && !list.isEmpty()) {
TQString tmpFile;
const KURL &url = list.first();
if (KIO::NetAccess::download( url, tmpFile, this ) )
if (TDEIO::NetAccess::download( url, tmpFile, this ) )
{
loadImage( tmpFile );
KIO::NetAccess::removeTempFile( tmpFile );
TDEIO::NetAccess::removeTempFile( tmpFile );
}
updateWidget();
e->accept();
@ -1006,7 +1006,7 @@ bool ImageWindow::saveImage( const KURL& dest, bool keepOriginalSize )
{
if ( isFullscreen() )
toggleFullscreen(); // otherwise upload window would block us invisibly
success = KIO::NetAccess::upload( saveFile, dest, const_cast<ImageWindow*>( this ) );
success = TDEIO::NetAccess::upload( saveFile, dest, const_cast<ImageWindow*>( this ) );
}
Imlib_kill_image( id, saveIm );

4
kuickshow/src/imdata.cpp
Unescape View File

@ -43,7 +43,7 @@ ImData::ImData()
}
void ImData::load( KConfig *kc )
void ImData::load( TDEConfig *kc )
{
ImData def;
@ -68,7 +68,7 @@ void ImData::load( KConfig *kc )
}
void ImData::save( KConfig *kc )
void ImData::save( TDEConfig *kc )
{
kc->setGroup( "ImlibConfiguration" );

6
kuickshow/src/imdata.h
Unescape View File

@ -19,15 +19,15 @@
#ifndef IMBLIBCONFIG_H
#define IMBLIBCONFIG_H
class KConfig;
class TDEConfig;
class ImData
{
public:
ImData();
~ImData() {};
void load( KConfig *kc );
void save( KConfig *kc );
void load( TDEConfig *kc );
void save( TDEConfig *kc );
// new stuff..........

4
kuickshow/src/kuickdata.cpp
Unescape View File

@ -70,7 +70,7 @@ KuickData::~KuickData()
void KuickData::load()
{
KConfig *kc = TDEGlobal::config();
TDEConfig *kc = TDEGlobal::config();
KuickData def;
@ -134,7 +134,7 @@ void KuickData::load()
void KuickData::save()
{
KConfig *kc = TDEGlobal::config();
TDEConfig *kc = TDEGlobal::config();
kc->setGroup( "GeneralConfiguration" );
kc->writeEntry( "FileFilter", fileFilter );

2
kuickshow/src/kuickdata.h
Unescape View File

@ -24,7 +24,7 @@
#include "imdata.h"
class KConfig;
class TDEConfig;
// values are also used as combobox index defaultswidget.*
enum Rotation { ROT_0=0, ROT_90=1, ROT_180=2, ROT_270=3 };

18
kuickshow/src/kuickfile.cpp
Unescape View File

@ -22,7 +22,7 @@ KuickFile::KuickFile(const KURL& url)
if ( m_url.isLocalFile())
m_localFile = m_url.path();
else {
const KURL& mostLocal = KIO::NetAccess::mostLocalURL( m_url, 0L );
const KURL& mostLocal = TDEIO::NetAccess::mostLocalURL( m_url, 0L );
if ( mostLocal.isValid() && mostLocal.isLocalFile() )
m_localFile = mostLocal.path();
}
@ -84,10 +84,10 @@ bool KuickFile::download()
KURL destURL;
destURL.setPath( tempFile.name() );
m_job = KIO::file_copy( m_url, destURL, -1, true, false, false ); // handling progress ourselves
m_job = TDEIO::file_copy( m_url, destURL, -1, true, false, false ); // handling progress ourselves
m_job->setAutoErrorHandlingEnabled( true );
connect( m_job, TQT_SIGNAL( result( KIO::Job * )), TQT_SLOT( slotResult( KIO::Job * ) ));
connect( m_job, TQT_SIGNAL( percent( KIO::Job *, unsigned long )), TQT_SLOT( slotProgress( KIO::Job *, unsigned long ) ));
connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )), TQT_SLOT( slotResult( TDEIO::Job * ) ));
connect( m_job, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long )), TQT_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ));
// TODO: generify background/foreground downloading?
@ -136,7 +136,7 @@ KuickFile::DownloadStatus KuickFile::waitForDownload( TQWidget *parent )
return OK;
}
void KuickFile::slotResult( KIO::Job *job )
void KuickFile::slotResult( TDEIO::Job *job )
{
if (job != m_job) { // huh?
return;
@ -147,15 +147,15 @@ void KuickFile::slotResult( KIO::Job *job )
if ( job->error() != 0 ) {
m_currentProgress = 0;
if ( job->error() != KIO::ERR_USER_CANCELED )
if ( job->error() != TDEIO::ERR_USER_CANCELED )
kdWarning() << "ERROR: KuickFile::slotResult: " << job->errorString() << endl;
TQString canceledFile = static_cast<KIO::FileCopyJob*>(job)->destURL().path();
TQString canceledFile = static_cast<TDEIO::FileCopyJob*>(job)->destURL().path();
TQFile::remove( canceledFile );
m_progress->topLevelWidget()->hide();
}
else {
m_localFile = static_cast<KIO::FileCopyJob*>(job)->destURL().path();
m_localFile = static_cast<TDEIO::FileCopyJob*>(job)->destURL().path();
emit downloaded( this ); // before closing the progress dialog
if ( m_progress ) {
@ -168,7 +168,7 @@ void KuickFile::slotResult( KIO::Job *job )
}
}
void KuickFile::slotProgress( KIO::Job *job, unsigned long percent )
void KuickFile::slotProgress( TDEIO::Job *job, unsigned long percent )
{
if (job != m_job) { // huh?
return;

8
kuickshow/src/kuickfile.h
Unescape View File

@ -16,7 +16,7 @@
#include <kurl.h>
#include <kprogress.h>
namespace KIO {
namespace TDEIO {
class Job;
class FileCopyJob;
}
@ -83,13 +83,13 @@ signals:
void downloaded( KuickFile * );
private slots:
void slotResult( KIO::Job *job );
void slotProgress( KIO::Job *job, unsigned long percent );
void slotResult( TDEIO::Job *job );
void slotProgress( TDEIO::Job *job, unsigned long percent );
private:
KURL m_url;
TQString m_localFile;
KIO::FileCopyJob *m_job;
TDEIO::FileCopyJob *m_job;
KProgress *m_progress;
int m_currentProgress;

18
kuickshow/src/kuickshow.cpp
Unescape View File

@ -114,7 +114,7 @@ KuickShow::KuickShow( const char *name )
connect( m_slideTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( nextSlide() ));
KConfig *kc = TDEGlobal::config();
TDEConfig *kc = TDEGlobal::config();
bool isDir = false; // true if we get a directory on the commandline
@ -166,7 +166,7 @@ KuickShow::KuickShow( const char *name )
KMimeType::Ptr mime = KMimeType::findByURL( url );
TQString name = mime->name();
if ( name == "application/octet-stream" ) // unknown -> stat()
name = KIO::NetAccess::mimetype( url, this );
name = TDEIO::NetAccess::mimetype( url, this );
// text/* is a hack for bugs.kde.org-attached-images urls.
// The real problem here is that NetAccess::mimetype does a HTTP HEAD, which doesn't
@ -374,7 +374,7 @@ void KuickShow::initGUI( const KURL& startDir )
fileWidget->setFocus();
KConfig *kc = TDEGlobal::config();
TDEConfig *kc = TDEGlobal::config();
kc->setGroup("SessionSettings");
bool oneWindow = kc->readBoolEntry("OpenImagesInActiveWindow", true );
oneWindowAction->setChecked( oneWindow );
@ -569,7 +569,7 @@ bool KuickShow::showImage( const KFileItem *fi,
// file->waitForDownload( this );
// TQString filename;
// KIO::NetAccess::download(fi->url(), filename, this);
// TDEIO::NetAccess::download(fi->url(), filename, this);
if ( !safeViewer->showNextImage( fi->url() ) ) {
m_viewer = safeViewer;
@ -856,7 +856,7 @@ void KuickShow::slotAdvanceImage( ImageWindow *view, int steps )
if ( FileWidget::isImage( item ) ) {
// TQString filename;
// KIO::NetAccess::download(item->url(), filename, this);
// TDEIO::NetAccess::download(item->url(), filename, this);
view->showNextImage( item->url() );
if (m_slideTimer->isActive() && kdata->slideDelay)
m_slideTimer->start( kdata->slideDelay );
@ -1019,7 +1019,7 @@ bool KuickShow::eventFilter( TQObject *o, TQEvent *e )
if ( FileWidget::isImage( item ) ) {
// TQString filename;
// KIO::NetAccess::download(item->url(), filename, this);
// TDEIO::NetAccess::download(item->url(), filename, this);
m_viewer->showNextImage( item->url() );
if ( kdata->preloadImage && item_next ) { // preload next image
@ -1143,7 +1143,7 @@ void KuickShow::about()
}
// ------ sessionmanagement - load / save current directory -----
void KuickShow::readProperties( KConfig *kc )
void KuickShow::readProperties( TDEConfig *kc )
{
assert( fileWidget ); // from SM, we should always have initGUI on startup
TQString dir = kc->readPathEntry( "CurrentDirectory" );
@ -1173,7 +1173,7 @@ void KuickShow::readProperties( KConfig *kc )
show();
}
void KuickShow::saveProperties( KConfig *kc )
void KuickShow::saveProperties( TDEConfig *kc )
{
kc->writeEntry( "Browser visible", fileWidget && fileWidget->isVisible() );
if (fileWidget)
@ -1197,7 +1197,7 @@ void KuickShow::saveProperties( KConfig *kc )
void KuickShow::saveSettings()
{
KConfig *kc = TDEGlobal::config();
TDEConfig *kc = TDEGlobal::config();
kc->setGroup("SessionSettings");
if ( oneWindowAction )

6
kuickshow/src/kuickshow.h
Unescape View File

@ -38,7 +38,7 @@ class ImData;
class KuickConfigDialog;
class KAccel;
class KConfig;
class TDEConfig;
class KToggleAction;
class AboutWidget;
@ -97,7 +97,7 @@ public:
protected:
virtual void readProperties( KConfig * );
virtual void readProperties( TDEConfig * );
void initImlibParams( ImData *, ImlibInitParams * );
void tryShowNextImage();
@ -145,7 +145,7 @@ private:
void initGUI( const KURL& startDir );
bool eventFilter( TQObject *, TQEvent * );
void initImlib();
void saveProperties( KConfig * );
void saveProperties( TDEConfig * );
void saveSettings();
bool haveBrowser() const;
void delayedRepeatEvent( ImageWindow *, TQKeyEvent * );

2
kview/ChangeLog
Unescape View File

@ -7,7 +7,7 @@
2003-09-27 Matthias Kretz <kretz@kde.org>
* config/kviewconfmodules.cpp:
Call sync() in save() on the KConfig object.
Call sync() in save() on the TDEConfig object.
2003-08-19 Matthias Kretz <kretz@kde.org>

6
kview/config/kviewconfmodules.cpp
Unescape View File

@ -33,7 +33,7 @@ typedef KGenericFactory<KViewGeneralConfig, TQWidget> KViewGeneralConfigFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kviewgeneralconfig, KViewGeneralConfigFactory( "kcm_kviewgeneralconfig" ) )
KViewGeneralConfig::KViewGeneralConfig( TQWidget * parent, const char * /*name*/, const TQStringList & args )
: KCModule( KViewGeneralConfigFactory::instance(), parent, args )
: TDECModule( KViewGeneralConfigFactory::instance(), parent, args )
{
TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
@ -57,7 +57,7 @@ KViewGeneralConfig::~KViewGeneralConfig()
void KViewGeneralConfig::save()
{
KConfigGroup cfgGroup( TDEGlobal::config(), "KView General" );
TDEConfigGroup cfgGroup( TDEGlobal::config(), "KView General" );
m_savedPosition = m_pResizeGroup->id( m_pResizeGroup->selected() );
cfgGroup.writeEntry( "Resize Mode", m_savedPosition );
emit changed( false );
@ -66,7 +66,7 @@ void KViewGeneralConfig::save()
void KViewGeneralConfig::load()
{
KConfigGroup cfgGroup( TDEGlobal::config(), "KView General" );
TDEConfigGroup cfgGroup( TDEGlobal::config(), "KView General" );
int m_savedPosition = cfgGroup.readNumEntry( "Resize Mode", 2 );
if( m_savedPosition < 0 || m_savedPosition > 3 )
m_savedPosition = 2;

2
kview/config/kviewconfmodules.h
Unescape View File

@ -23,7 +23,7 @@
class TQVButtonGroup;
class KViewGeneralConfig : public KCModule
class KViewGeneralConfig : public TDECModule
{
Q_OBJECT

2
kview/config/kviewgeneralconfig.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=kview
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kviewgeneralconfig

2
kview/config/plugins/kviewpluginsconfig.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=plugin
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kviewpluginsconfig

4
kview/config/plugins/kviewpluginsconfig.h
Unescape View File

@ -21,7 +21,7 @@
#include <ksettings/pluginpage.h>
class KConfig;
class TDEConfig;
class KViewPluginsConfig : public KSettings::PluginPage
{
@ -31,7 +31,7 @@ class KViewPluginsConfig : public KSettings::PluginPage
KViewPluginsConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() );
~KViewPluginsConfig();
private:
KConfig * m_config;
TDEConfig * m_config;
};
// vim: sw=4 ts=4 noet

34
kview/kview.cpp
Unescape View File

@ -92,8 +92,8 @@ KView::KView()
connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
TQT_SLOT( clipboardDataChanged() ) );
connect( m_pViewer, TQT_SIGNAL( started( KIO::Job * ) ),
this, TQT_SLOT( jobStarted( KIO::Job * ) ) );
connect( m_pViewer, TQT_SIGNAL( started( TDEIO::Job * ) ),
this, TQT_SLOT( jobStarted( TDEIO::Job * ) ) );
connect( m_pViewer, TQT_SIGNAL( completed() ),
this, TQT_SLOT( jobCompleted() ) );
connect( m_pViewer, TQT_SIGNAL( completed( bool ) ),
@ -120,7 +120,7 @@ KView::KView()
// create status bar (hidden by default)
statusBar()->insertItem( "", STATUSBAR_SPEED_ID, 0, true );
statusBar()->setItemFixed( STATUSBAR_SPEED_ID,
8 + fontMetrics().width( i18n( "%1/s" ).arg( KIO::convertSize( 999000 ) ) ) );
8 + fontMetrics().width( i18n( "%1/s" ).arg( TDEIO::convertSize( 999000 ) ) ) );
statusBar()->insertItem( "", STATUSBAR_CURSOR_ID, 0, true );
statusBar()->setItemFixed( STATUSBAR_CURSOR_ID, 8 + fontMetrics().width( "8888, 8888" ) );
statusBar()->insertItem( "", STATUSBAR_SIZE_ID, 0, true );
@ -167,7 +167,7 @@ void KView::load( const KURL & url )
// would do:
TQString directory = url.directory();
TQString key = TQString::fromLatin1( "load_image" );
KConfig * config = TDEGlobal::config();
TDEConfig * config = TDEGlobal::config();
config->setGroup( TQString::fromLatin1( "Recent Dirs" ) );
TQStringList result = config->readPathListEntry( key );
@ -220,30 +220,30 @@ bool KView::queryClose()
return m_pViewer->closeURL();
}
void KView::saveProperties( KConfig * /*config*/ )
void KView::saveProperties( TDEConfig * /*config*/ )
{
// save session data:
// What URL is currently open
// somehow the plugins have to get a chance to store their data
}
void KView::readProperties( KConfig * /*config*/ )
void KView::readProperties( TDEConfig * /*config*/ )
{
// read session data
}
void KView::saveSettings( KConfig * config )
void KView::saveSettings( TDEConfig * config )
{
// write settings to config/kviewrc
kdDebug( 4600 ) << k_funcinfo << endl;
m_paRecent->saveEntries( config );
}
void KView::readSettings() // KConfig * config )
void KView::readSettings() // TDEConfig * config )
{
// read settings from config/kviewrc
kdDebug( 4600 ) << k_funcinfo << endl;
KConfigGroup cfgGroup( TDEGlobal::config(), "KView General" );
TDEConfigGroup cfgGroup( TDEGlobal::config(), "KView General" );
m_nResizeMode = cfgGroup.readNumEntry( "Resize Mode", 2 );
kdDebug( 4600 ) << "m_nResizeMode = " << m_nResizeMode << endl;
loadPlugins();
@ -377,7 +377,7 @@ void KView::slotPreferences()
if( ! dlg )
{
dlg = new KSettings::Dialog( this );
//dlg = new KConfigureDialog( KConfigureDialog::Configurable, this );
//dlg = new TDEConfigureDialog( TDEConfigureDialog::Configurable, this );
//dlg->addPluginInfos( KPluginInfo::fromKPartsInstanceName( instance()->instanceName(), TDEGlobal::config(), "KParts Plugins" ) );
}
dlg->show();
@ -418,13 +418,13 @@ void KView::clipboardDataChanged()
m_paPaste->setEnabled( hasImage );
}
void KView::jobStarted( KIO::Job * job )
void KView::jobStarted( TDEIO::Job * job )
{
if( job )
{
connect( job, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), this, TQT_SLOT( loadingProgress( KIO::Job *, unsigned long ) ) );
connect( job, TQT_SIGNAL( speed( KIO::Job *, unsigned long ) ), this, TQT_SLOT( speedProgress( KIO::Job *, unsigned long ) ) );
//connect( job, TQT_SIGNAL( infoMessage( KIO::Job *, const TQString & ) ), this, TQT_SLOT() );
connect( job, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), this, TQT_SLOT( loadingProgress( TDEIO::Job *, unsigned long ) ) );
connect( job, TQT_SIGNAL( speed( TDEIO::Job *, unsigned long ) ), this, TQT_SLOT( speedProgress( TDEIO::Job *, unsigned long ) ) );
//connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), this, TQT_SLOT() );
loadingProgress( job, 0 );
speedProgress( job, 0 );
}
@ -447,7 +447,7 @@ void KView::jobCanceled( const TQString & errorMsg )
jobCompleted();
}
void KView::loadingProgress( KIO::Job *, unsigned long percent )
void KView::loadingProgress( TDEIO::Job *, unsigned long percent )
{
if( percent > 100 )
{
@ -461,12 +461,12 @@ void KView::loadingProgress( KIO::Job *, unsigned long percent )
m_pProgressBar->setValue( percent );
}
void KView::speedProgress( KIO::Job *, unsigned long bytesPerSecond )
void KView::speedProgress( TDEIO::Job *, unsigned long bytesPerSecond )
{
TQString sizeStr;
if( bytesPerSecond > 0 )
sizeStr = i18n( "%1/s" ).arg( KIO::convertSize( bytesPerSecond ) );
sizeStr = i18n( "%1/s" ).arg( TDEIO::convertSize( bytesPerSecond ) );
else
sizeStr = i18n( "Stalled" );

14
kview/kview.h
Unescape View File

@ -54,14 +54,14 @@ class KView : public KParts::MainWindow
protected:
bool queryClose();
void saveProperties( KConfig * );
void readProperties( KConfig * );
void saveSettings( KConfig * );
void saveProperties( TDEConfig * );
void readProperties( TDEConfig * );
void saveSettings( TDEConfig * );
virtual bool eventFilter( TQObject *, TQEvent * );
protected slots:
void readSettings(); //KConfig * );
void readSettings(); //TDEConfig * );
void imageSizeChanged( const TQSize & );
void selectionChanged( const TQRect & );
void contextPress( const TQPoint & );
@ -79,12 +79,12 @@ class KView : public KParts::MainWindow
void reloadConfig();
void enableAction( const char *, bool );
void clipboardDataChanged();
void jobStarted( KIO::Job * );
void jobStarted( TDEIO::Job * );
void jobCompleted();
void jobCompleted( bool );
void jobCanceled( const TQString & );
void loadingProgress( KIO::Job *, unsigned long );
void speedProgress( KIO::Job *, unsigned long );
void loadingProgress( TDEIO::Job *, unsigned long );
void speedProgress( TDEIO::Job *, unsigned long );
void slotSetStatusBarText( const TQString & );
void cursorPos( const TQPoint & ); // write the cursor pos to the statusbar
void loadPlugins();

2
kview/kviewcanvas/ChangeLog
Unescape View File

@ -1,7 +1,7 @@
2003-09-27 Matthias Kretz <kretz@kde.org>
* config/confmodules.cpp:
Call m_config->sync() in save() and use a real KConfig object instead of
Call m_config->sync() in save() and use a real TDEConfig object instead of
a KSimpleConfig.
* kimagecanvas.cpp:
Renamed readSettings to loadSettings and call it in the ctor.

12
kview/kviewcanvas/config/confmodules.cpp
Unescape View File

@ -35,8 +35,8 @@ typedef KGenericFactory<KViewCanvasConfig, TQWidget> KViewCanvasConfigFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kviewcanvasconfig, KViewCanvasConfigFactory( "kcm_kviewcanvasconfig" ) )
KViewCanvasConfig::KViewCanvasConfig( TQWidget * parent, const char *, const TQStringList & args )
: KCModule( KViewCanvasConfigFactory::instance(), parent, args )
, m_config( new KConfig( "kviewcanvasrc" ) )
: TDECModule( KViewCanvasConfigFactory::instance(), parent, args )
, m_config( new TDEConfig( "kviewcanvasrc" ) )
{
TQBoxLayout * layout = new TQVBoxLayout( this );
layout->setAutoAdd( true );
@ -77,7 +77,7 @@ KViewCanvasConfig::~KViewCanvasConfig()
void KViewCanvasConfig::save()
{
KConfigGroup cfgGroup( m_config, "Settings" );
TDEConfigGroup cfgGroup( m_config, "Settings" );
cfgGroup.writeEntry( "Smooth Scaling", m_pWidget->m_pSmoothScaling->isChecked() );
cfgGroup.writeEntry( "Keep Aspect Ratio", m_pWidget->m_pKeepRatio->isChecked() );
cfgGroup.writeEntry( "Center Image", m_pWidget->m_pCenterImage->isChecked() );
@ -89,7 +89,7 @@ void KViewCanvasConfig::save()
cfgGroup.writeEntry( "Maximum Width" , m_pWidget->m_pMaxWidth->value() );
cfgGroup.writeEntry( "Maximum Height", m_pWidget->m_pMaxHeight->value() );
KConfigGroup cfgGroup2( m_config, "Blend Effects" );
TDEConfigGroup cfgGroup2( m_config, "Blend Effects" );
TQCheckListItem *item = m_items.first();
for( int i = 1; item; item = m_items.next(), ++i )
cfgGroup2.writeEntry( TQString::number( i ), item->isOn() );
@ -98,7 +98,7 @@ void KViewCanvasConfig::save()
void KViewCanvasConfig::load()
{
KConfigGroup cfgGroup( m_config, "Settings" );
TDEConfigGroup cfgGroup( m_config, "Settings" );
m_pWidget->m_pSmoothScaling->setChecked( cfgGroup.readBoolEntry( "Smooth Scaling", Defaults::smoothScaling ) );
m_pWidget->m_pKeepRatio->setChecked( cfgGroup.readBoolEntry( "Keep Aspect Ratio", Defaults::keepAspectRatio ) );
m_pWidget->m_pCenterImage->setChecked( cfgGroup.readBoolEntry( "Center Image", Defaults::centerImage ) );
@ -110,7 +110,7 @@ void KViewCanvasConfig::load()
m_pWidget->m_pMaxWidth ->setValue( cfgGroup.readNumEntry( "Maximum Width" , Defaults::maxSize.width() ) );
m_pWidget->m_pMaxHeight->setValue( cfgGroup.readNumEntry( "Maximum Height", Defaults::maxSize.height() ) );
KConfigGroup cfgGroup2( m_config, "Blend Effects" );
TDEConfigGroup cfgGroup2( m_config, "Blend Effects" );
TQCheckListItem * item = m_items.first();
for( int i = 1; item; item = m_items.next(), ++i )
item->setOn( cfgGroup2.readBoolEntry( TQString::number( i ), false ) );

6
kview/kviewcanvas/config/confmodules.h
Unescape View File

@ -24,9 +24,9 @@
class GeneralConfigWidget;
class TQCheckListItem;
class KConfig;
class TDEConfig;
class KViewCanvasConfig : public KCModule
class KViewCanvasConfig : public TDECModule
{
Q_OBJECT
@ -42,7 +42,7 @@ class KViewCanvasConfig : public KCModule
void configChanged();
private:
KConfig * m_config;
TDEConfig * m_config;
GeneralConfigWidget * m_pWidget;
TQPtrList<TQCheckListItem> m_items;
};

2
kview/kviewcanvas/config/kviewcanvasconfig.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=kview
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kviewcanvasconfig

4
kview/kviewcanvas/kimagecanvas.cpp
Unescape View File

@ -823,7 +823,7 @@ void KImageCanvas::slotImageChanged()
void KImageCanvas::loadSettings()
{
KConfigGroup cfgGroup( KImageCanvasFactory::instance()->config(),
TDEConfigGroup cfgGroup( KImageCanvasFactory::instance()->config(),
"Settings" );
setFastScale( ! cfgGroup.readBoolEntry( "Smooth Scaling", ! fastScale() ) );
setKeepAspectRatio( cfgGroup.readBoolEntry( "Keep Aspect Ratio",
@ -839,7 +839,7 @@ void KImageCanvas::loadSettings()
maximumImageSize().width() ), cfgGroup.readNumEntry(
"Maximum Height", maximumImageSize().height() ) ) );
KConfigGroup blendConfig( KImageCanvasFactory::instance()->config(),
TDEConfigGroup blendConfig( KImageCanvasFactory::instance()->config(),
"Blend Effects" );
/* TODO
m_vEffects.clear();

2
kview/kviewviewer/config/kviewviewerpluginsconfig.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=plugin
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kviewviewerpluginsconfig

4
kview/kviewviewer/config/kviewviewerpluginsconfig.h
Unescape View File

@ -21,7 +21,7 @@
#include <ksettings/pluginpage.h>
class KConfig;
class TDEConfig;
class KViewViewerPluginsConfig : public KSettings::PluginPage
{
@ -31,7 +31,7 @@ class KViewViewerPluginsConfig : public KSettings::PluginPage
KViewViewerPluginsConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() );
~KViewViewerPluginsConfig();
private:
KConfig * m_config;
TDEConfig * m_config;
};
// vim: sw=4 ts=4 noet

30
kview/kviewviewer/kviewviewer.cpp
Unescape View File

@ -125,7 +125,7 @@ KViewViewer::KViewViewer( TQWidget *parentWidget, const char * /*widgetName*/,
m_popupDoc = KXMLGUIFactory::readConfigFile( "kviewpopup.rc", true, instance() );
KConfigGroup cfgGroup( instance()->config(), "Settings" );
TDEConfigGroup cfgGroup( instance()->config(), "Settings" );
bool hideBars = cfgGroup.readBoolEntry( "hideScrollbars", false );
m_pCanvas->hideScrollbars( hideBars );
m_paShowScrollbars->setChecked( ! hideBars );
@ -200,10 +200,10 @@ bool KViewViewer::saveAs( const KURL & kurl )
{
kdDebug( 4610 ) << "copy image from " << m_file << " to " << kurl.prettyURL() << endl;
KIO::Job * job = KIO::copy( KURL( m_file ), kurl, isProgressInfoEnabled() );
TDEIO::Job * job = TDEIO::copy( KURL( m_file ), kurl, isProgressInfoEnabled() );
emit started( job );
connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
this, TQT_SLOT( slotResultSaveAs( KIO::Job * ) ) );
connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
this, TQT_SLOT( slotResultSaveAs( TDEIO::Job * ) ) );
return true;
}
kdDebug( 4610 ) << "call KParts::ReadWritePart::saveAs( " << kurl.prettyURL() << " )" << endl;
@ -266,10 +266,10 @@ bool KViewViewer::openURL( const KURL & url )
m_pTempFile = new KTempFile( TQString(), extension );
m_file = m_pTempFile->name();
m_pJob = KIO::get( m_url, m_pExtension->urlArgs().reload, isProgressInfoEnabled() );
m_pJob = TDEIO::get( m_url, m_pExtension->urlArgs().reload, isProgressInfoEnabled() );
emit started( m_pJob );
connect( m_pJob, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( slotJobFinished ( KIO::Job * ) ) );
connect( m_pJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) );
connect( m_pJob, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotJobFinished ( TDEIO::Job * ) ) );
connect( m_pJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
return true;
}
}
@ -534,7 +534,7 @@ void KViewViewer::guiActivateEvent( KParts::GUIActivateEvent * event )
void KViewViewer::readSettings()
{
KConfigGroup cfgGroup( instance()->config(), "Settings" );
TDEConfigGroup cfgGroup( instance()->config(), "Settings" );
m_pCanvas->setFastScale( ! cfgGroup.readBoolEntry( "Smooth Scaling", ! m_pCanvas->fastScale() ) );
m_pCanvas->setKeepAspectRatio( cfgGroup.readBoolEntry( "Keep Aspect Ratio", m_pCanvas->keepAspectRatio() ) );
m_pCanvas->setCentered( cfgGroup.readBoolEntry( "Center Image", m_pCanvas->centered() ) );
@ -546,7 +546,7 @@ void KViewViewer::readSettings()
m_pCanvas->setMaximumImageSize( TQSize( cfgGroup.readNumEntry( "Maximum Width", m_pCanvas->maximumImageSize().width() ),
cfgGroup.readNumEntry( "Maximum Height", m_pCanvas->maximumImageSize().height() ) ) );
KConfigGroup blendConfig( instance()->config(), "Blend Effects" );
TDEConfigGroup blendConfig( instance()->config(), "Blend Effects" );
m_vEffects.clear();
for( unsigned int i = 1; i <= m_pCanvas->numOfBlendEffects(); ++i )
{
@ -560,7 +560,7 @@ void KViewViewer::readSettings()
void KViewViewer::writeSettings()
{
KConfigGroup cfgGroup( instance()->config(), "Settings" );
TDEConfigGroup cfgGroup( instance()->config(), "Settings" );
cfgGroup.writeEntry( "hideScrollbars", ! m_paShowScrollbars->isChecked() );
}
@ -571,7 +571,7 @@ void KViewViewer::zoomChanged( double zoom )
updateZoomMenu( zoom );
}
void KViewViewer::slotJobFinished( KIO::Job * job )
void KViewViewer::slotJobFinished( TDEIO::Job * job )
{
assert( job == m_pJob );
m_pJob = 0;
@ -584,7 +584,7 @@ void KViewViewer::slotJobFinished( KIO::Job * job )
}
}
void KViewViewer::slotData( KIO::Job *, const TQByteArray & data )
void KViewViewer::slotData( TDEIO::Job *, const TQByteArray & data )
{
if( ! m_pBuffer )
{
@ -735,7 +735,7 @@ void KViewViewer::slotDel()
if( closeURL() )
{
setModified( false );
KIO::file_delete( urltodel );
TDEIO::file_delete( urltodel );
m_pCanvas->clear();
}
}
@ -763,7 +763,7 @@ void KViewViewer::slotPopupMenu( const TQPoint &pos )
delete popupGUIClient;
}
void KViewViewer::slotResultSaveAs( KIO::Job *job )
void KViewViewer::slotResultSaveAs( TDEIO::Job *job )
{
if ( job->error() )
{
@ -773,7 +773,7 @@ void KViewViewer::slotResultSaveAs( KIO::Job *job )
else
{
emit completed();
KIO::CopyJob * cjob = ::tqqt_cast<KIO::CopyJob*>( job );
TDEIO::CopyJob * cjob = ::tqqt_cast<TDEIO::CopyJob*>( job );
if( cjob )
{
m_url = cjob->destURL();

10
kview/kviewviewer/kviewviewer.h
Unescape View File

@ -28,7 +28,7 @@
#include <kdemacros.h>
namespace KImageViewer { class Canvas; }
namespace KIO { class Job; }
namespace TDEIO { class Job; }
class KTempFile;
class KAction;
@ -81,8 +81,8 @@ class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIf
protected slots:
void readSettings();
void zoomChanged( double );
void slotJobFinished( KIO::Job * );
void slotData( KIO::Job *, const TQByteArray & );
void slotJobFinished( TDEIO::Job * );
void slotData( TDEIO::Job *, const TQByteArray & );
void slotSave();
void slotSaveAs();
@ -98,7 +98,7 @@ class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIf
void slotDel();
void slotPopupMenu( const TQPoint & );
void slotResultSaveAs( KIO::Job * );
void slotResultSaveAs( TDEIO::Job * );
void slotFileDirty( const TQString & );
void slotReloadUnmodified();
@ -112,7 +112,7 @@ class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIf
private:
TQWidget * m_pParentWidget;
KIO::Job * m_pJob;
TDEIO::Job * m_pJob;
KViewKonqExtension * m_pExtension;
KImageViewer::Canvas * m_pCanvas;
KTempFile * m_pTempFile;

2
kview/modules/presenter/config/kviewpresenterconfig.cpp
Unescape View File

@ -32,7 +32,7 @@ typedef KGenericFactory<KViewPresenterConfig, TQWidget> KViewPresenterConfigFact
K_EXPORT_COMPONENT_FACTORY( kcm_kviewpresenterconfig, KViewPresenterConfigFactory( "kcm_kviewpresenterconfig" ) )
KViewPresenterConfig::KViewPresenterConfig( TQWidget * parent, const char *, const TQStringList & args )
: KCModule( KViewPresenterConfigFactory::instance(), parent, args )
: TDECModule( KViewPresenterConfigFactory::instance(), parent, args )
{
TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
layout->setAutoAdd( true );

2
kview/modules/presenter/config/kviewpresenterconfig.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=kpresenter
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kviewpresenterconfig

2
kview/modules/presenter/config/kviewpresenterconfig.h
Unescape View File

@ -23,7 +23,7 @@
class TQCheckBox;
class KViewPresenterConfig : public KCModule
class KViewPresenterConfig : public TDECModule
{
Q_OBJECT

4
kview/modules/presenter/imagelistitem.cpp
Unescape View File

@ -48,7 +48,7 @@ ImageListItem::ImageListItem( KListView * parent, const KURL & url )
m_pTempFile = new KTempFile( TQString(), extension );
m_filename = m_pTempFile->name();
m_pJob = KIO::get( m_url, m_pExtension->urlArgs().reload, false );
m_pJob = TDEIO::get( m_url, m_pExtension->urlArgs().reload, false );
*/
}
}
@ -58,7 +58,7 @@ ImageListItem::~ImageListItem()
if( ! m_url.isLocalFile() )
{
// remove downloaded tempfile
//KIO::NetAccess::removeTempFile( m_filename );
//TDEIO::NetAccess::removeTempFile( m_filename );
}
}

8
kview/modules/presenter/kviewpresenter.cpp
Unescape View File

@ -410,7 +410,7 @@ void KViewPresenter::loadList()
return;
TQString tempfile;
if( ! KIO::NetAccess::download( url, tempfile, m_pViewer->widget() ) )
if( ! TDEIO::NetAccess::download( url, tempfile, m_pViewer->widget() ) )
{
KMessageBox::error( m_pImageList, i18n( "Could not load\n%1" ).arg( url.prettyURL() ) );
return;
@ -446,7 +446,7 @@ void KViewPresenter::loadList()
}
file.close();
}
KIO::NetAccess::removeTempFile( tempfile );
TDEIO::NetAccess::removeTempFile( tempfile );
}
void KViewPresenter::saveList()
@ -482,8 +482,8 @@ void KViewPresenter::saveList()
if( ! url.isLocalFile() )
{
KIO::NetAccess::upload( tempfile, url, m_pViewer->widget() );
KIO::NetAccess::removeTempFile( tempfile );
TDEIO::NetAccess::upload( tempfile, url, m_pViewer->widget() );
TDEIO::NetAccess::removeTempFile( tempfile );
}
}
}

8
kviewshell/kmultipage.cpp
Unescape View File

@ -172,8 +172,8 @@ void KMultiPage::slotSave()
return;
}
KIO::Job *job = KIO::file_copy( KURL( m_file ), KURL( fileName ), 0600, true, false, true );
connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotIOJobFinished ( KIO::Job * ) ) );
TDEIO::Job *job = TDEIO::file_copy( KURL( m_file ), KURL( fileName ), 0600, true, false, true );
connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotIOJobFinished ( TDEIO::Job * ) ) );
return;
}
@ -222,7 +222,7 @@ bool KMultiPage::closeURL()
return true;
}
void KMultiPage::slotIOJobFinished ( KIO::Job *job )
void KMultiPage::slotIOJobFinished ( TDEIO::Job *job )
{
if ( job->error() )
job->showErrorDialog( 0L );
@ -629,7 +629,7 @@ void KMultiPage::handleLocalLink(const TQString &linkText)
gotoPage(anch);
else {
if (linkText[0] != '#' ) {
// We could in principle use KIO::Netaccess::run() here, but
// We could in principle use TDEIO::Netaccess::run() here, but
// it is perhaps not a very good idea to allow a DVI-file to
// specify arbitrary commands, such as "rm -rvf /". Using
// the kfmclient seems to be MUCH safer.

10
kviewshell/kmultipage.h
Unescape View File

@ -14,7 +14,7 @@
class Anchor;
class DocumentWidget;
class KConfigDialog;
class TDEConfigDialog;
class KPrintDialogPage_PageOptions;
class KPrinter;
class PageView;
@ -271,14 +271,14 @@ public:
This method can be re-implemented to add documenttype specific
configuration pages to the central preferences dialog. The
documentation to KConfigDialog explains how to do that.
documentation to TDEConfigDialog explains how to do that.
The default implementation does nothing.
@param configDialog a pointer to the KConfigDialog the dialog to
@param configDialog a pointer to the TDEConfigDialog the dialog to
add pages to
*/
virtual void addConfigDialogs(KConfigDialog* configDialog) { Q_UNUSED(configDialog); }
virtual void addConfigDialogs(TDEConfigDialog* configDialog) { Q_UNUSED(configDialog); }
/* These methods calculate the Zoomfactor needed to fit the pages
@ -440,7 +440,7 @@ public slots:
virtual void slotShowThumbnails(bool);
/* Used internally. */
void slotIOJobFinished ( KIO::Job *job );
void slotIOJobFinished ( TDEIO::Job *job );
/* Switches to fullscreen mode and back. */
virtual void slotSetFullPage(bool fullpage);

10
kviewshell/kviewpart.cpp
Unescape View File

@ -370,7 +370,7 @@ void KViewPart::initializeMultiPage()
connect( this, TQT_SIGNAL(scrollbarStatusChanged(bool)), multiPage, TQT_SLOT(slotShowScrollbars(bool)));
connect( multiPage, TQT_SIGNAL(pageInfo(int, int)), this, TQT_SLOT(pageInfo(int, int)) );
connect( multiPage, TQT_SIGNAL(askingToCheckActions()), this, TQT_SLOT(checkActions()) );
connect( multiPage, TQT_SIGNAL( started( KIO::Job * ) ), this, TQT_SIGNAL( started( KIO::Job * ) ) );
connect( multiPage, TQT_SIGNAL( started( TDEIO::Job * ) ), this, TQT_SIGNAL( started( TDEIO::Job * ) ) );
connect( multiPage, TQT_SIGNAL( completed() ), this, TQT_SIGNAL( completed() ) );
connect( multiPage, TQT_SIGNAL( canceled( const TQString & ) ), this, TQT_SIGNAL( canceled( const TQString & ) ) );
connect( multiPage, TQT_SIGNAL( setStatusBarText( const TQString& ) ), this, TQT_SLOT( setStatusBarTextFromMultiPage( const TQString& ) ) );
@ -441,7 +441,7 @@ void KViewPart::restoreDocument(const KURL &url, int page)
}
void KViewPart::saveDocumentRestoreInfo(KConfig* config)
void KViewPart::saveDocumentRestoreInfo(TDEConfig* config)
{
config->writePathEntry("URL", url().url());
if (multiPage->numberOfPages() > 0)
@ -793,7 +793,7 @@ bool KViewPart::openFile()
writeSettings();
// Delete old config dialog
KConfigDialog* configDialog = KConfigDialog::exists("kviewshell_config");
TDEConfigDialog* configDialog = TDEConfigDialog::exists("kviewshell_config");
delete configDialog;
KMultiPage* oldMultiPage = multiPage;
@ -1447,10 +1447,10 @@ void KViewPart::aboutKViewShell()
void KViewPart::doSettings()
{
if (KConfigDialog::showDialog("kviewshell_config"))
if (TDEConfigDialog::showDialog("kviewshell_config"))
return;
KConfigDialog* configDialog = new KConfigDialog(mainWidget, "kviewshell_config", KVSPrefs::self());
TDEConfigDialog* configDialog = new TDEConfigDialog(mainWidget, "kviewshell_config", KVSPrefs::self());
optionDialogGUIWidget_base* guiWidget = new optionDialogGUIWidget_base(mainWidget);
configDialog->addPage(guiWidget, i18n("User Interface"), "view_choose");

4
kviewshell/kviewpart.h
Unescape View File

@ -13,7 +13,7 @@ class TDEAboutData;
class KAboutDialog;
class KAccel;
class KAction;
class KConfig;
class TDEConfig;
class KDirWatch;
class TDEInstance;
class KMultiPage;
@ -75,7 +75,7 @@ public slots:
void reload();
void restoreDocument(const KURL &url, int page);
void saveDocumentRestoreInfo(KConfig* config);
void saveDocumentRestoreInfo(TDEConfig* config);
protected slots:
void slotShowSidebar();

10
kviewshell/kviewshell.cpp
Unescape View File

@ -99,7 +99,7 @@ KViewShell::KViewShell(const TQString& defaultMimeType)
// Setup session management
connect( this, TQT_SIGNAL( restoreDocument(const KURL &, int) ), view, TQT_SLOT( restoreDocument(const KURL &, int)));
connect( this, TQT_SIGNAL( saveDocumentRestoreInfo(KConfig*) ), view, TQT_SLOT( saveDocumentRestoreInfo(KConfig*)));
connect( this, TQT_SIGNAL( saveDocumentRestoreInfo(TDEConfig*) ), view, TQT_SLOT( saveDocumentRestoreInfo(TDEConfig*)));
setXMLFile( "kviewshell.rc" );
createGUI(view);
@ -168,7 +168,7 @@ void KViewShell::readSettings()
resize(600, 300); // default size if the config file specifies no size
setAutoSaveSettings( "General" ); // apply mainwindow settings (size, toolbars, etc.)
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("General");
recent->loadEntries(config, "Recent Files");
@ -191,7 +191,7 @@ void KViewShell::readSettings()
void KViewShell::writeSettings()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup( "General" );
recent->saveEntries(config, "Recent Files");
@ -199,7 +199,7 @@ void KViewShell::writeSettings()
}
void KViewShell::saveProperties(KConfig* config)
void KViewShell::saveProperties(TDEConfig* config)
{
// the 'config' object points to the session managed
// config file. anything you write here will be available
@ -208,7 +208,7 @@ void KViewShell::saveProperties(KConfig* config)
}
void KViewShell::readProperties(KConfig* config)
void KViewShell::readProperties(TDEConfig* config)
{
// the 'config' object points to the session managed
// config file. this function is automatically called whenever

8
kviewshell/kviewshell.h
Unescape View File

@ -44,7 +44,7 @@ protected slots:
signals:
void restoreDocument(const KURL &url, int page);
void saveDocumentRestoreInfo(KConfig* config);
void saveDocumentRestoreInfo(TDEConfig* config);
protected:
void readSettings();
@ -54,14 +54,14 @@ protected:
* This method is called when it is time for the app to save its
* properties for session management purposes.
*/
void saveProperties(KConfig*);
void saveProperties(TDEConfig*);
/**
* This method is called when this app is restored. The KConfig
* This method is called when this app is restored. The TDEConfig
* object points to the session management config file that was saved
* with @ref saveProperties
*/
void readProperties(KConfig*);
void readProperties(TDEConfig*);
void checkActions();

8
libkscan/devselector.cpp
Unescape View File

@ -69,7 +69,7 @@ DeviceSelector::DeviceSelector( TQWidget *parent, TQStrList& devList,
cbSkipDialog = new TQCheckBox( i18n("&Do not ask on startup again, always use this device"),
page, "CBOX_SKIP_ON_START" );
KConfig *gcfg = TDEGlobal::config();
TDEConfig *gcfg = TDEGlobal::config();
gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP));
bool skipDialog = gcfg->readBoolEntry( STARTUP_SKIP_ASK, false );
cbSkipDialog->setChecked( skipDialog );
@ -80,7 +80,7 @@ DeviceSelector::DeviceSelector( TQWidget *parent, TQStrList& devList,
TQCString DeviceSelector::getDeviceFromConfig( void ) const
{
KConfig *gcfg = TDEGlobal::config();
TDEConfig *gcfg = TDEGlobal::config();
gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP));
bool skipDialog = gcfg->readBoolEntry( STARTUP_SKIP_ASK, false );
@ -125,7 +125,7 @@ TQCString DeviceSelector::getSelectedDevice( void ) const
kdDebug(29000) << "The selected device: <" << dev << ">" << endl;
/* Store scanner selection settings */
KConfig *c = TDEGlobal::config();
TDEConfig *c = TDEGlobal::config();
c->setGroup(TQString::fromLatin1(GROUP_STARTUP));
/* Write both the scan device and the skip-start-dialog flag global. */
c->writeEntry( STARTUP_SCANDEV, dev, true, true );
@ -140,7 +140,7 @@ void DeviceSelector::setScanSources( const TQStrList& sources,
const TQStringList& hrSources )
{
bool default_ok = false;
KConfig *gcfg = TDEGlobal::config();
TDEConfig *gcfg = TDEGlobal::config();
gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP));
TQCString defstr = gcfg->readEntry( STARTUP_SCANDEV, "" ).local8Bit();

2
libkscan/kscandevice.cpp
Unescape View File

@ -187,7 +187,7 @@ KScanDevice::KScanDevice( TQObject *parent )
pixel_y = 0;
scanner_name = 0L;
KConfig *konf = TDEGlobal::config ();
TDEConfig *konf = TDEGlobal::config ();
konf->setGroup( GROUP_STARTUP );
bool netaccess = konf->readBoolEntry( STARTUP_ONLY_LOCAL, false );
kdDebug(29000) << "Query for network scanners " << (netaccess ? "Not enabled" : "Enabled") << endl;

4
libkscan/kscanoptset.cpp
Unescape View File

@ -146,7 +146,7 @@ void KScanOptSet::saveConfig( const TQString& scannerName, const TQString& confi
TQString confFile = SCANNER_DB_FILE;
kdDebug( 29000) << "Creating scan configuration file <" << confFile << ">" << endl;
KConfig *scanConfig = new KConfig( confFile );
TDEConfig *scanConfig = new TDEConfig( confFile );
TQString cfgName = configName;
if( configName.isNull() || configName.isEmpty() )
@ -180,7 +180,7 @@ bool KScanOptSet::load( const TQString& /*scannerName*/ )
kdDebug( 29000) << "** Reading from scan configuration file <" << confFile << ">" << endl;
bool ret = true;
KConfig *scanConfig = new KConfig( confFile, true );
TDEConfig *scanConfig = new TDEConfig( confFile, true );
TQString cfgName = name; /* of the KScanOptSet, given in constructor */
if( cfgName.isNull() || cfgName.isEmpty() )

2
libkscan/previewer.cpp
Unescape View File

@ -125,7 +125,7 @@ Previewer::Previewer(TQWidget *parent, const char *name )
layout->addLayout( left, 2 );
/* Load autoselection values from Config file */
KConfig *cfg = TDEGlobal::config();
TDEConfig *cfg = TDEGlobal::config();
cfg->setGroup( GROUP_STARTUP );
/* Units etc. TODO: get from Config */

10
libkscan/scandialog.cpp
Unescape View File

@ -129,7 +129,7 @@ void ScanDialog::createOptionsTab( void )
/* Read settings for startup behavior */
KConfig *gcfg = TDEGlobal::config();
TDEConfig *gcfg = TDEGlobal::config();
gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP));
bool skipDialog = gcfg->readBoolEntry( STARTUP_SKIP_ASK, false );
bool onlyLocal = gcfg->readBoolEntry( STARTUP_ONLY_LOCAL, false );
@ -153,7 +153,7 @@ void ScanDialog::slotNetworkToggle( bool state)
bool writestate = !state;
kdDebug(29000) << "slotNetworkToggle: Writing state " << writestate << endl;
KConfig *c = TDEGlobal::config();
TDEConfig *c = TDEGlobal::config();
c->setGroup(TQString::fromLatin1(GROUP_STARTUP));
c->writeEntry( STARTUP_ONLY_LOCAL, writestate, true, true );
}
@ -163,7 +163,7 @@ void ScanDialog::slotAskOnStartToggle(bool state)
bool writestate = !state;
kdDebug(29000) << "slotAskOnStartToggle: Writing state " << writestate << endl;
KConfig *c = TDEGlobal::config();
TDEConfig *c = TDEGlobal::config();
c->setGroup(TQString::fromLatin1(GROUP_STARTUP));
c->writeEntry( STARTUP_SKIP_ASK, writestate, true, true );
}
@ -307,7 +307,7 @@ bool ScanDialog::setup()
/* set initial sizes */
setInitialSize( configDialogSize( GROUP_STARTUP ));
KConfig *kfg = TDEGlobal::config();
TDEConfig *kfg = TDEGlobal::config();
if( kfg )
{
TQRect r = TDEGlobalSettings::desktopGeometry(this);
@ -329,7 +329,7 @@ void ScanDialog::slotClose()
if( splitter )
{
KConfig *kfg = TDEGlobal::config();
TDEConfig *kfg = TDEGlobal::config();
if( kfg )
{
TQRect r = TDEGlobalSettings::desktopGeometry(this);

Write Preview
Loading…
Cancel
Save