|
Lines 1-37
Link Here
|
| 1 |
--- src/formats.cpp.orig 2014-07-08 21:01:12.000000000 +0200 |
1 |
--- src/formats.cpp.orig 2014-08-20 19:25:29.000000000 +0200 |
| 2 |
+++ src/formats.cpp 2014-07-08 21:01:34.000000000 +0200 |
2 |
+++ src/formats.cpp 2014-08-20 19:26:13.000000000 +0200 |
| 3 |
@@ -36,7 +36,6 @@ |
3 |
@@ -36,7 +36,7 @@ |
| 4 |
|
4 |
|
| 5 |
void Formats::loadFormats() |
5 |
void Formats::loadFormats() |
| 6 |
{ |
6 |
{ |
| 7 |
-#ifdef Q_OS_LINUX |
7 |
-#ifdef Q_OS_LINUX || Q_OS_FREEBSD |
|
|
8 |
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) |
| 8 |
list<CoderInfo> coderList; |
9 |
list<CoderInfo> coderList; |
| 9 |
coderInfoList(&coderList, |
10 |
coderInfoList(&coderList, |
| 10 |
CoderInfo::TrueMatch, |
11 |
CoderInfo::TrueMatch, |
| 11 |
@@ -91,26 +90,6 @@ |
|
|
| 12 |
|
| 13 |
s_readableFiltersString = readableFiltersList.join(""); |
| 14 |
s_readableFiltersString.prepend(tr("All Supported Filters (%1)").arg(readableExts)); |
| 15 |
-#else |
| 16 |
- QFile data1(QDir::cleanPath("FileFormats/Readableformats.txt")); |
| 17 |
- if (data1.open(QFile::ReadOnly)) { |
| 18 |
- QTextStream in(&data1); |
| 19 |
- |
| 20 |
- s_readableFilters = in.readLine().split(" "); |
| 21 |
- s_readableFiltersString = in.readLine(); |
| 22 |
- } |
| 23 |
- |
| 24 |
- QFile data2(QDir::cleanPath("FileFormats/WritableFormats.txt")); |
| 25 |
- if (data2.open(QFile::ReadOnly)) { |
| 26 |
- QTextStream in(&data2); |
| 27 |
- QString line; |
| 28 |
- do { |
| 29 |
- line = in.readLine(); |
| 30 |
- s_writableFilters << line; |
| 31 |
- } while (!line.isNull()); |
| 32 |
- } |
| 33 |
- s_writableFilters.removeLast(); |
| 34 |
-#endif |
| 35 |
|
| 36 |
s_writableFilters.prepend(tr("Don't change the format")); |
| 37 |
} |