Fix inadvertent tqt changes.

(cherry picked from commit c2fb605097)
v3.5.13-sru
Darrell Anderson 12 years ago committed by Slávek Banko
parent 0ffd1835a6
commit 7f25602f7c

@ -17,7 +17,7 @@ kio_iso_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
SUBDIRS = libisofs SUBDIRS = libisofs
noinst_HEADERS = iso.h kiso.h qfilehack.h kisofile.h kisodirectory.h 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: install-data-local:
$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/ $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/
@ -26,14 +26,11 @@ install-data-local:
$(INSTALL_DATA) $(srcdir)/isoservice.desktop $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/isoservice.desktop $(INSTALL_DATA) $(srcdir)/isoservice.desktop $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/isoservice.desktop
$(mkinstalldirs) $(DESTDIR)$(kde_confdir)/ $(mkinstalldirs) $(DESTDIR)$(kde_confdir)/
$(INSTALL_DATA) $(srcdir)/kio_isorc $(DESTDIR)$(kde_confdir)/kio_isorc $(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: uninstall-local:
-rm -f $(DESTDIR)$(kde_servicesdir)/iso.protocol -rm -f $(DESTDIR)$(kde_servicesdir)/iso.protocol
-rm -f $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/isoservice.desktop -rm -f $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/isoservice.desktop
-rm -f $(DESTDIR)$(kde_confdir)/kio_isorc -rm -f $(DESTDIR)$(kde_confdir)/kio_isorc
-rm -f $(DESTDIR)$(kde_appsdir)/kio_iso.desktop
# These paths are KDE specific. Use them: # These paths are KDE specific. Use them:
# kde_appsdir Where your application's menu entry (.desktop) should go to. # kde_appsdir Where your application's menu entry (.desktop) should go to.

@ -39,7 +39,7 @@
#include "kiso.h" #include "kiso.h"
#include "libisofs/isofs.h" #include "libisofs/isofs.h"
#include "tqfilehack.h" #include "qfilehack.h"
#ifdef __linux__ #ifdef __linux__
@ -157,7 +157,7 @@ void KIso::prepareDevice( const TQString & filename,
{ {
/* 'hack' for TQt's false assumption that only S_ISREG is seekable */ /* 'hack' for TQt's false assumption that only S_ISREG is seekable */
if( "inode/blockdevice" == mimetype ) if( "inode/blockdevice" == mimetype )
setDevice( new TQFileHack( filename ) ); setDevice( new QFileHack( filename ) );
else else
{ {
if( "application/x-gzip" == mimetype if( "application/x-gzip" == mimetype

@ -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; bool ret;
#ifdef __linux__ #ifdef __linux__

@ -15,8 +15,8 @@
* * * *
***************************************************************************/ ***************************************************************************/
#ifndef TQFILEHACK_H #ifndef QFILEHACK_H
#define TQFILEHACK_H #define QFILEHACK_H
#include <tqfile.h> #include <tqfile.h>
#include <tqstring.h> #include <tqstring.h>
@ -27,11 +27,11 @@
* block devices for example? * block devices for example?
*/ */
class TQFileHack : public TQFile { class QFileHack : public TQFile {
public: public:
TQFileHack(); QFileHack();
TQFileHack( const TQString & name ); QFileHack( const TQString & name );
~TQFileHack(); ~QFileHack();
virtual bool open ( int m ); virtual bool open ( int m );
}; };

Loading…
Cancel
Save