summaryrefslogtreecommitdiffstats
path: root/kghostview
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:33:36 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:33:36 -0600
commit3c5631f74d1c75204f950140331e10f739082ee9 (patch)
treea2811ff6c81d3c771745cde47734e65b1da3d806 /kghostview
parent6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef (diff)
downloadtdegraphics-3c5631f74d1c75204f950140331e10f739082ee9.tar.gz
tdegraphics-3c5631f74d1c75204f950140331e10f739082ee9.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kghostview')
-rw-r--r--kghostview/displayoptions.h2
-rw-r--r--kghostview/kghostview.upd4
-rw-r--r--kghostview/kgv_view.cpp26
-rw-r--r--kghostview/kgv_view.h6
-rw-r--r--kghostview/kgvconfigdialog.cpp4
-rw-r--r--kghostview/kgvdocument.cpp2
-rw-r--r--kghostview/kgvshell.cpp4
-rw-r--r--kghostview/kgvshell.h6
8 files changed, 27 insertions, 27 deletions
diff --git a/kghostview/displayoptions.h b/kghostview/displayoptions.h
index 7767da48..b1f2cce8 100644
--- a/kghostview/displayoptions.h
+++ b/kghostview/displayoptions.h
@@ -22,7 +22,7 @@
#include "dscparse_adapter.h"
#include <kdemacros.h>
class TDECmdLineArgs;
-class KConfig;
+class TDEConfig;
class KDE_EXPORT DisplayOptions
{
diff --git a/kghostview/kghostview.upd b/kghostview/kghostview.upd
index a61fffaf..5a86a925 100644
--- a/kghostview/kghostview.upd
+++ b/kghostview/kghostview.upd
@@ -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
diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp
index b8a57a6e..e651c55d 100644
--- a/kghostview/kgv_view.cpp
+++ b/kghostview/kgv_view.cpp
@@ -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;
}
diff --git a/kghostview/kgv_view.h b/kghostview/kgv_view.h
index d758ce5c..8457c050 100644
--- a/kghostview/kgv_view.h
+++ b/kghostview/kgv_view.h
@@ -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;
diff --git a/kghostview/kgvconfigdialog.cpp b/kghostview/kgvconfigdialog.cpp
index 3333a845..27f2664c 100644
--- a/kghostview/kgvconfigdialog.cpp
+++ b/kghostview/kgvconfigdialog.cpp
@@ -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" ) );
diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp
index 96ff7e96..673220a0 100644
--- a/kghostview/kgvdocument.cpp
+++ b/kghostview/kgvdocument.cpp
@@ -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
diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp
index 9bb974e2..ec2348fc 100644
--- a/kghostview/kgvshell.cpp
+++ b/kghostview/kgvshell.cpp
@@ -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() ) );
diff --git a/kghostview/kgvshell.h b/kghostview/kgvshell.h
index 7d3f4def..ea794e35 100644
--- a/kghostview/kgvshell.h
+++ b/kghostview/kgvshell.h
@@ -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();