diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-27 18:42:32 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-27 18:42:32 +0000 |
| commit | c625fb33d2ad82ecfe512326b53bb9abf10e9036 (patch) | |
| tree | e7688c321620b4756ae1f6f2a67006b7edbb90f1 /filters | |
| parent | bda1ab47e26ffa7e28e738b073fb46067e709d49 (diff) | |
| download | koffice-c625fb33d2ad82ecfe512326b53bb9abf10e9036.tar.gz koffice-c625fb33d2ad82ecfe512326b53bb9abf10e9036.zip | |
Fix koffice Qt4 FTBFS
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238530 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'filters')
| -rw-r--r-- | filters/chalk/png/kis_png_converter.cc | 4 | ||||
| -rw-r--r-- | filters/chalk/raw/kis_raw_import.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/filters/chalk/png/kis_png_converter.cc b/filters/chalk/png/kis_png_converter.cc index b7c48b50..d3cce618 100644 --- a/filters/chalk/png/kis_png_converter.cc +++ b/filters/chalk/png/kis_png_converter.cc @@ -154,7 +154,7 @@ KisImageBuilder_Result KisPNGConverter::decode(const KURL& uri) { kdDebug(41008) << "Start decoding PNG File" << endl; // open the file - kdDebug(41008) << TQFile::encodeName(uri.path()) << " " << uri.path() << " " << uri << endl; + kdDebug(41008) << TQString(TQFile::encodeName(uri.path())) << " " << uri.path() << " " << uri << endl; FILE *fp = fopen(TQFile::encodeName(uri.path()), "rb"); if (!fp) { @@ -438,7 +438,7 @@ KisImageBuilder_Result KisPNGConverter::decode(const KURL& uri) KisImageBuilder_Result KisPNGConverter::buildImage(const KURL& uri) { - kdDebug(41008) << TQFile::encodeName(uri.path()) << " " << uri.path() << " " << uri << endl; + kdDebug(41008) << TQString(TQFile::encodeName(uri.path())) << " " << uri.path() << " " << uri << endl; if (uri.isEmpty()) return KisImageBuilder_RESULT_NO_URI; diff --git a/filters/chalk/raw/kis_raw_import.cpp b/filters/chalk/raw/kis_raw_import.cpp index adfd14f6..f006f913 100644 --- a/filters/chalk/raw/kis_raw_import.cpp +++ b/filters/chalk/raw/kis_raw_import.cpp @@ -458,7 +458,7 @@ void KisRawImport::slotReceivedStdout(KProcess *, char *buffer, int buflen) //kdDebug(41008) << "stdout received " << buflen << " bytes on stdout.\n"; //kdDebug(41008) << TQString::fromAscii(buffer, buflen) << "\n"; int oldSize = m_data->size(); - m_data->resize(oldSize + buflen, TQGArray::SpeedOptim); + m_data->tqresize(oldSize + buflen, TQGArray::SpeedOptim); memcpy(m_data->data() + oldSize, buffer, buflen); } @@ -577,7 +577,7 @@ TQSize KisRawImport::determineSize(TQ_UINT32& startOfImageData) } TQString size = TQStringList::split("\n", TQString::fromAscii(m_data->data(), i))[1]; - kdDebug(41008) << "Header: " << TQString::fromAscii(m_data->data(), i) << "\n"; + kdDebug(41008) << "Header: " << TQString(TQString::fromAscii(m_data->data(), i)) << "\n"; TQStringList sizelist = TQStringList::split(" ", size); TQ_INT32 w = sizelist[0].toInt(); TQ_INT32 h = sizelist[1].toInt(); |