diff options
Diffstat (limited to 'kview')
22 files changed, 78 insertions, 78 deletions
diff --git a/kview/ChangeLog b/kview/ChangeLog index e24c55e2..dab7dc80 100644 --- a/kview/ChangeLog +++ b/kview/ChangeLog @@ -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> diff --git a/kview/config/kviewconfmodules.cpp b/kview/config/kviewconfmodules.cpp index 2b0a8537..f36da30c 100644 --- a/kview/config/kviewconfmodules.cpp +++ b/kview/config/kviewconfmodules.cpp @@ -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; diff --git a/kview/config/kviewconfmodules.h b/kview/config/kviewconfmodules.h index 20217233..3cb495a3 100644 --- a/kview/config/kviewconfmodules.h +++ b/kview/config/kviewconfmodules.h @@ -23,7 +23,7 @@ class TQVButtonGroup; -class KViewGeneralConfig : public KCModule +class KViewGeneralConfig : public TDECModule { Q_OBJECT diff --git a/kview/config/kviewgeneralconfig.desktop b/kview/config/kviewgeneralconfig.desktop index 04bc1106..ec6a3912 100644 --- a/kview/config/kviewgeneralconfig.desktop +++ b/kview/config/kviewgeneralconfig.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=kview Type=Service -ServiceTypes=KCModule +ServiceTypes=TDECModule X-TDE-ModuleType=Library X-TDE-Library=kviewgeneralconfig diff --git a/kview/config/plugins/kviewpluginsconfig.desktop b/kview/config/plugins/kviewpluginsconfig.desktop index 38977149..c4f1d0e3 100644 --- a/kview/config/plugins/kviewpluginsconfig.desktop +++ b/kview/config/plugins/kviewpluginsconfig.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=plugin Type=Service -ServiceTypes=KCModule +ServiceTypes=TDECModule X-TDE-ModuleType=Library X-TDE-Library=kviewpluginsconfig diff --git a/kview/config/plugins/kviewpluginsconfig.h b/kview/config/plugins/kviewpluginsconfig.h index 9b53dc05..99ac995b 100644 --- a/kview/config/plugins/kviewpluginsconfig.h +++ b/kview/config/plugins/kviewpluginsconfig.h @@ -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 diff --git a/kview/kview.cpp b/kview/kview.cpp index e48885ac..ee2cf3b5 100644 --- a/kview/kview.cpp +++ b/kview/kview.cpp @@ -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" ); diff --git a/kview/kview.h b/kview/kview.h index e1d9ecf9..aed0a54f 100644 --- a/kview/kview.h +++ b/kview/kview.h @@ -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(); diff --git a/kview/kviewcanvas/ChangeLog b/kview/kviewcanvas/ChangeLog index 9ec3ee84..73d74094 100644 --- a/kview/kviewcanvas/ChangeLog +++ b/kview/kviewcanvas/ChangeLog @@ -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. diff --git a/kview/kviewcanvas/config/confmodules.cpp b/kview/kviewcanvas/config/confmodules.cpp index 4ecf07b9..84f897c4 100644 --- a/kview/kviewcanvas/config/confmodules.cpp +++ b/kview/kviewcanvas/config/confmodules.cpp @@ -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 ) ); diff --git a/kview/kviewcanvas/config/confmodules.h b/kview/kviewcanvas/config/confmodules.h index 0c6df7a1..62980957 100644 --- a/kview/kviewcanvas/config/confmodules.h +++ b/kview/kviewcanvas/config/confmodules.h @@ -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; }; diff --git a/kview/kviewcanvas/config/kviewcanvasconfig.desktop b/kview/kviewcanvas/config/kviewcanvasconfig.desktop index a3633284..692d3ad7 100644 --- a/kview/kviewcanvas/config/kviewcanvasconfig.desktop +++ b/kview/kviewcanvas/config/kviewcanvasconfig.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=kview Type=Service -ServiceTypes=KCModule +ServiceTypes=TDECModule X-TDE-ModuleType=Library X-TDE-Library=kviewcanvasconfig diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp index cffce25e..4411d752 100644 --- a/kview/kviewcanvas/kimagecanvas.cpp +++ b/kview/kviewcanvas/kimagecanvas.cpp @@ -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(); diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.desktop b/kview/kviewviewer/config/kviewviewerpluginsconfig.desktop index 6957269e..9942f106 100644 --- a/kview/kviewviewer/config/kviewviewerpluginsconfig.desktop +++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=plugin Type=Service -ServiceTypes=KCModule +ServiceTypes=TDECModule X-TDE-ModuleType=Library X-TDE-Library=kviewviewerpluginsconfig diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.h b/kview/kviewviewer/config/kviewviewerpluginsconfig.h index 5d849cee..08f95b52 100644 --- a/kview/kviewviewer/config/kviewviewerpluginsconfig.h +++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.h @@ -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 diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp index 521e5d8c..7db68102 100644 --- a/kview/kviewviewer/kviewviewer.cpp +++ b/kview/kviewviewer/kviewviewer.cpp @@ -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(); diff --git a/kview/kviewviewer/kviewviewer.h b/kview/kviewviewer/kviewviewer.h index 06fb17bc..54f08e88 100644 --- a/kview/kviewviewer/kviewviewer.h +++ b/kview/kviewviewer/kviewviewer.h @@ -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; diff --git a/kview/modules/presenter/config/kviewpresenterconfig.cpp b/kview/modules/presenter/config/kviewpresenterconfig.cpp index e44889ed..7ed447c2 100644 --- a/kview/modules/presenter/config/kviewpresenterconfig.cpp +++ b/kview/modules/presenter/config/kviewpresenterconfig.cpp @@ -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 ); diff --git a/kview/modules/presenter/config/kviewpresenterconfig.desktop b/kview/modules/presenter/config/kviewpresenterconfig.desktop index e57ea16a..f71b6bdd 100644 --- a/kview/modules/presenter/config/kviewpresenterconfig.desktop +++ b/kview/modules/presenter/config/kviewpresenterconfig.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=kpresenter Type=Service -ServiceTypes=KCModule +ServiceTypes=TDECModule X-TDE-ModuleType=Library X-TDE-Library=kviewpresenterconfig diff --git a/kview/modules/presenter/config/kviewpresenterconfig.h b/kview/modules/presenter/config/kviewpresenterconfig.h index f21b5778..3bc7457b 100644 --- a/kview/modules/presenter/config/kviewpresenterconfig.h +++ b/kview/modules/presenter/config/kviewpresenterconfig.h @@ -23,7 +23,7 @@ class TQCheckBox; -class KViewPresenterConfig : public KCModule +class KViewPresenterConfig : public TDECModule { Q_OBJECT diff --git a/kview/modules/presenter/imagelistitem.cpp b/kview/modules/presenter/imagelistitem.cpp index 441568ad..313cd75b 100644 --- a/kview/modules/presenter/imagelistitem.cpp +++ b/kview/modules/presenter/imagelistitem.cpp @@ -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 ); } } diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp index 7335f1af..534b305c 100644 --- a/kview/modules/presenter/kviewpresenter.cpp +++ b/kview/modules/presenter/kviewpresenter.cpp @@ -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 ); } } } |