summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2023-12-03 00:36:48 +0900
committerMichele Calgaro <[email protected]>2023-12-04 14:02:55 +0900
commit4f29422c2b51f8e38a8d2240dbae152cb3157b69 (patch)
treebf00bfa263c9c5f520cd67207b2e4c1bf2ea3142
parent252be932ea74bff9fbd8989cdc7a8bf94febcfed (diff)
downloadtellico-4f29422c2b51f8e38a8d2240dbae152cb3157b69.tar.gz
tellico-4f29422c2b51f8e38a8d2240dbae152cb3157b69.zip
Replaced various '#define' with actual strings - part 5
Signed-off-by: Michele Calgaro <[email protected]>
-rw-r--r--src/filehandler.cpp2
-rw-r--r--src/translators/alexandriaimporter.cpp2
-rw-r--r--src/translators/audiofileimporter.cpp2
-rw-r--r--src/translators/onixexporter.cpp2
-rw-r--r--src/translators/tellicoimporter.cpp2
-rw-r--r--src/translators/tellicozipexporter.cpp2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/filehandler.cpp b/src/filehandler.cpp
index f5c9de9..0d7ed6b 100644
--- a/src/filehandler.cpp
+++ b/src/filehandler.cpp
@@ -82,7 +82,7 @@ FileHandler::FileRef::FileRef(const KURL& url_, bool quiet_, bool allowCompresse
if(allowCompressed_) {
m_device = KFilterDev::deviceForFile(m_filename);
} else {
- m_device = TQT_TQIODEVICE(new TQFile(m_filename));
+ m_device = new TQFile(m_filename);
}
m_isValid = true;
}
diff --git a/src/translators/alexandriaimporter.cpp b/src/translators/alexandriaimporter.cpp
index 2f19d23..5a2d25b 100644
--- a/src/translators/alexandriaimporter.cpp
+++ b/src/translators/alexandriaimporter.cpp
@@ -86,7 +86,7 @@ Tellico::Data::CollPtr AlexandriaImporter::collection() {
bool readNextLine = true;
ts.unsetDevice();
- ts.setDevice(TQT_TQIODEVICE(&file));
+ ts.setDevice(&file);
TQString line;
while(!ts.atEnd()) {
if(readNextLine) {
diff --git a/src/translators/audiofileimporter.cpp b/src/translators/audiofileimporter.cpp
index da41fc8..a30c6c4 100644
--- a/src/translators/audiofileimporter.cpp
+++ b/src/translators/audiofileimporter.cpp
@@ -296,7 +296,7 @@ Tellico::Data::CollPtr AudioFileImporter::collection() {
continue;
}
ts.unsetDevice();
- ts.setDevice(TQT_TQIODEVICE(&file));
+ ts.setDevice(&file);
for(TQString line = ts.readLine(); !line.isNull(); line = ts.readLine()) {
if(!iconRx.exactMatch(line)) {
continue;
diff --git a/src/translators/onixexporter.cpp b/src/translators/onixexporter.cpp
index 6a31912..7c87241 100644
--- a/src/translators/onixexporter.cpp
+++ b/src/translators/onixexporter.cpp
@@ -78,7 +78,7 @@ bool ONIXExporter::exec() {
TQByteArray data;
TQBuffer buf(data);
- KZip zip(TQT_TQIODEVICE(&buf));
+ KZip zip(&buf);
zip.open(IO_WriteOnly);
zip.writeFile(TQString::fromLatin1("onix.xml"), TQString(), TQString(), xml.length(), xml);
diff --git a/src/translators/tellicoimporter.cpp b/src/translators/tellicoimporter.cpp
index c485966..35a9482 100644
--- a/src/translators/tellicoimporter.cpp
+++ b/src/translators/tellicoimporter.cpp
@@ -769,7 +769,7 @@ void TellicoImporter::loadZipData() {
m_zip = new KZip(fileRef().fileName());
} else {
m_buffer = new TQBuffer(data());
- m_zip = new KZip(TQT_TQIODEVICE(m_buffer));
+ m_zip = new KZip(m_buffer);
}
if(!m_zip->open(IO_ReadOnly)) {
setStatusMessage(i18n(errorLoad).arg(url().fileName()));
diff --git a/src/translators/tellicozipexporter.cpp b/src/translators/tellicozipexporter.cpp
index 18c7c8e..863d78e 100644
--- a/src/translators/tellicozipexporter.cpp
+++ b/src/translators/tellicozipexporter.cpp
@@ -71,7 +71,7 @@ bool TellicoZipExporter::exec() {
return true; // intentionally cancelled
}
- KZip zip(TQT_TQIODEVICE(&buf));
+ KZip zip(&buf);
zip.open(IO_WriteOnly);
zip.writeFile(TQString::fromLatin1("tellico.xml"), TQString(), TQString(), xml.length(), xml);