summaryrefslogtreecommitdiffstats
path: root/kfax
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 /kfax
parent6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef (diff)
downloadtdegraphics-3c5631f74d1c75204f950140331e10f739082ee9.tar.gz
tdegraphics-3c5631f74d1c75204f950140331e10f739082ee9.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kfax')
-rw-r--r--kfax/kfax.cpp6
-rw-r--r--kfax/kfax.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp
index 7e420a11..f77c281f 100644
--- a/kfax/kfax.cpp
+++ b/kfax/kfax.cpp
@@ -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 );
}
}
diff --git a/kfax/kfax.h b/kfax/kfax.h
index f7547a24..1b1d2449 100644
--- a/kfax/kfax.h
+++ b/kfax/kfax.h
@@ -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;