diff options
Diffstat (limited to 'src/file_chooser_portal.cpp')
| -rw-r--r-- | src/file_chooser_portal.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/file_chooser_portal.cpp b/src/file_chooser_portal.cpp index ee8b0f6..4668abd 100644 --- a/src/file_chooser_portal.cpp +++ b/src/file_chooser_portal.cpp @@ -33,11 +33,6 @@ // Portal #include "file_chooser_portal.h" #include "file_chooser_portal.moc" -#include "util.h" - -#define OPTION_VALID(opt, sig) \ - options.keys().contains(opt) && check_variant(options[opt], sig) - TDEFileChooserPortal::TDEFileChooserPortal(TQT_DBusConnection &connection) : m_connection(connection) @@ -135,8 +130,8 @@ bool TDEFileChooserPortal::SaveFiles(const TQT_DBusObjectPath& handle, return false; } - TQValueList<TQT_DBusData> filelist = options["files"].value.toTQValueList(); - TQValueList<TQT_DBusData>::iterator fi; + TQT_DBusValueList filelist = options["files"].value.toTQValueList(); + TQT_DBusValueList::iterator fi; TQStringList files; for (fi = filelist.begin(); fi != filelist.end(); ++fi) { @@ -279,15 +274,15 @@ TQString TDEFileChooserPortal::parseFilter(const TQT_DBusData data) { TQStringList patternList; - TQValueList<TQT_DBusData> filterData = data.toStruct(); + TQT_DBusValueList filterData = data.toStruct(); TQString label = filterData[0].toString(); - TQValueList<TQT_DBusData> patterns = filterData[1].toTQValueList(); + TQT_DBusValueList patterns = filterData[1].toTQValueList(); - TQValueList<TQT_DBusData>::iterator fp; + TQT_DBusValueList::iterator fp; for (fp = patterns.begin(); fp != patterns.end(); ++fp) { - TQValueList<TQT_DBusData> patternData = (*fp).toStruct(); + TQT_DBusValueList patternData = (*fp).toStruct(); bool isMime = (patternData[0].toUInt32() == 1); if (isMime) { // KFileDialog cannot handle both a mime and a simple @@ -326,9 +321,9 @@ TQString TDEFileChooserPortal::parseFilterList(const TQT_DBusVariant filterData, const TQT_DBusVariant currentFilterData) { TQStringList filterList; - TQValueList<TQT_DBusData> filters = filterData.value.toTQValueList(); + TQT_DBusValueList filters = filterData.value.toTQValueList(); if (filters.count() > 0) { - TQValueList<TQT_DBusData>::iterator f; + TQT_DBusValueList::iterator f; for (f = filters.begin(); f != filters.end(); ++f) filterList += parseFilter((*f)); } |