diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-09-26 15:52:27 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-01-01 01:16:30 +0100 |
| commit | 7f25602f7cf16b010592dbf41d78a859b8361677 (patch) | |
| tree | 5b7911621130a67f1c0c91865944758238763f5b | |
| parent | 0ffd1835a66d84bbb659711e2a34768d7d65b8fa (diff) | |
| download | krusader-7f25602f7cf16b010592dbf41d78a859b8361677.tar.gz krusader-7f25602f7cf16b010592dbf41d78a859b8361677.zip | |
Fix inadvertent tqt changes.
(cherry picked from commit c2fb605097bc21f6b794d5546192cd95d99104f8)
| -rw-r--r-- | iso/Makefile.am | 5 | ||||
| -rw-r--r-- | iso/kiso.cpp | 4 | ||||
| -rw-r--r-- | iso/qfilehack.cpp | 10 | ||||
| -rw-r--r-- | iso/qfilehack.h | 12 |
4 files changed, 14 insertions, 17 deletions
diff --git a/iso/Makefile.am b/iso/Makefile.am index 8151bec..a8ad6fa 100644 --- a/iso/Makefile.am +++ b/iso/Makefile.am @@ -17,7 +17,7 @@ kio_iso_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) SUBDIRS = libisofs noinst_HEADERS = iso.h kiso.h qfilehack.h kisofile.h kisodirectory.h -EXTRA_DIST = iso.protocol isoservice.desktop kio_iso.desktop +EXTRA_DIST = iso.protocol isoservice.desktop install-data-local: $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/ @@ -26,14 +26,11 @@ install-data-local: $(INSTALL_DATA) $(srcdir)/isoservice.desktop $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/isoservice.desktop $(mkinstalldirs) $(DESTDIR)$(kde_confdir)/ $(INSTALL_DATA) $(srcdir)/kio_isorc $(DESTDIR)$(kde_confdir)/kio_isorc - $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/ - $(INSTALL_DATA) $(srcdir)/kio_iso.desktop $(DESTDIR)$(kde_appsdir)/kio_iso.desktop uninstall-local: -rm -f $(DESTDIR)$(kde_servicesdir)/iso.protocol -rm -f $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/isoservice.desktop -rm -f $(DESTDIR)$(kde_confdir)/kio_isorc - -rm -f $(DESTDIR)$(kde_appsdir)/kio_iso.desktop # These paths are KDE specific. Use them: # kde_appsdir Where your application's menu entry (.desktop) should go to. diff --git a/iso/kiso.cpp b/iso/kiso.cpp index 45dde07..738770b 100644 --- a/iso/kiso.cpp +++ b/iso/kiso.cpp @@ -39,7 +39,7 @@ #include "kiso.h" #include "libisofs/isofs.h" -#include "tqfilehack.h" +#include "qfilehack.h" #ifdef __linux__ @@ -157,7 +157,7 @@ void KIso::prepareDevice( const TQString & filename, { /* 'hack' for TQt's false assumption that only S_ISREG is seekable */ if( "inode/blockdevice" == mimetype ) - setDevice( new TQFileHack( filename ) ); + setDevice( new QFileHack( filename ) ); else { if( "application/x-gzip" == mimetype diff --git a/iso/qfilehack.cpp b/iso/qfilehack.cpp index 234f404..f4f788f 100644 --- a/iso/qfilehack.cpp +++ b/iso/qfilehack.cpp @@ -15,18 +15,18 @@ * * ***************************************************************************/ -#include "tqfilehack.h" +#include "qfilehack.h" -TQFileHack::TQFileHack(){ +QFileHack::QFileHack(){ } -TQFileHack::TQFileHack( const TQString & name ) : TQFile(name) { +QFileHack::QFileHack( const TQString & name ) : TQFile(name) { } -TQFileHack::~TQFileHack(){ +QFileHack::~QFileHack(){ } -bool TQFileHack::open ( int m ) { +bool QFileHack::open ( int m ) { bool ret; #ifdef __linux__ diff --git a/iso/qfilehack.h b/iso/qfilehack.h index ba3b57f..fe43217 100644 --- a/iso/qfilehack.h +++ b/iso/qfilehack.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef TQFILEHACK_H -#define TQFILEHACK_H +#ifndef QFILEHACK_H +#define QFILEHACK_H #include <tqfile.h> #include <tqstring.h> @@ -27,11 +27,11 @@ * block devices for example? */ -class TQFileHack : public TQFile { +class QFileHack : public TQFile { public: - TQFileHack(); - TQFileHack( const TQString & name ); - ~TQFileHack(); + QFileHack(); + QFileHack( const TQString & name ); + ~QFileHack(); virtual bool open ( int m ); }; |