From ffe8a83e053396df448e9413828527613ca3bd46 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:46:43 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1157647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libkmid/deviceman.cc | 2 +- libkmid/midfile.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'libkmid') diff --git a/libkmid/deviceman.cc b/libkmid/deviceman.cc index 7c8e0f48c..c8030f44e 100644 --- a/libkmid/deviceman.cc +++ b/libkmid/deviceman.cc @@ -116,7 +116,7 @@ DeviceManager::DeviceManager(int def) default_dev=config->readNumEntry("midiDevice",0); if ( default_dev < 0 ) default_dev=0; - QString mapurl(config->readPathEntry("mapFilename")); + TQString mapurl(config->readPathEntry("mapFilename")); if ((config->readBoolEntry("useMidiMapper", false))&&(!mapurl.isEmpty())) { mapper_tmp = new MidiMapper( mapurl.mid(mapurl.find(":")+1 ).local8Bit() ); diff --git a/libkmid/midfile.cc b/libkmid/midfile.cc index baf0a2b37..0e804e4e3 100644 --- a/libkmid/midfile.cc +++ b/libkmid/midfile.cc @@ -35,7 +35,7 @@ #include #include -#include +#include int fsearch(FILE *fh,const char *text,long *ptr); @@ -54,10 +54,10 @@ double metronomeTempoToTempo(ulong x) int uncompressFile(const char *gzname, char *tmpname) // Returns 0 if OK, 1 if error (tmpname not set) { - QString cmd("gzip -dc " + KProcess::quote(gzname)); - FILE *infile = popen( QFile::encodeName(cmd).data(), "r"); + TQString cmd("gzip -dc " + KProcess::quote(gzname)); + FILE *infile = popen( TQFile::encodeName(cmd).data(), "r"); if (infile==NULL) { - fprintf(stderr,"ERROR : popen failed : %s\n",QFile::encodeName(cmd).data()); + fprintf(stderr,"ERROR : popen failed : %s\n",TQFile::encodeName(cmd).data()); return 1; } strcpy(tmpname, "/tmp/KMid.XXXXXXXXXX"); -- cgit v1.2.1