diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-12-19 22:55:58 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-12-19 22:56:21 +0900 |
| commit | df2eb7afd1783a8750b8034890ff7a9e6abb7388 (patch) | |
| tree | 7d8f360841f6830f0265b94f37a876c7ec0576f9 /tdecore | |
| parent | 083dbd6407c433a7ff2b4880836d919a84b2cea9 (diff) | |
| download | tdelibs-df2eb7af.tar.gz tdelibs-df2eb7af.zip | |
Fixed some uncrustify's code formatting offending files.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 491e1c72c7e2a19b58772fd285284e974d489501)
Diffstat (limited to 'tdecore')
| -rw-r--r-- | tdecore/kurl.cpp | 26 | ||||
| -rw-r--r-- | tdecore/network/kresolverstandardworkers.cpp | 2 |
2 files changed, 12 insertions, 16 deletions
diff --git a/tdecore/kurl.cpp b/tdecore/kurl.cpp index 7fd8ad26a..4203e04dc 100644 --- a/tdecore/kurl.cpp +++ b/tdecore/kurl.cpp @@ -2378,21 +2378,17 @@ int KURL::uriMode() const KURL::URIMode KURL::uriModeForProtocol(const TQString& protocol) { + KURL::URIMode mode = Auto; #ifndef KDE_QT_ONLY - KURL::URIMode mode = Auto; - if (protocol == fileProt) - return URL; - if (TDEGlobal::_instance) - mode = KProtocolInfo::uriParseMode(protocol); - if (mode == Auto ) { -#else - KURL::URIMode mode = Auto; + if (protocol == fileProt) + return URL; + if (TDEGlobal::_instance) + mode = KProtocolInfo::uriParseMode(protocol); #endif - if ( protocol == "ed2k" || protocol == "sig2dat" || protocol == "slsk" || protocol == "data" ) mode = RawURI; - else if ( protocol == "mailto" ) mode = Mailto; - else mode = URL; -#ifndef KDE_QT_ONLY - } -#endif - return mode; + if (mode == Auto ) { + if ( protocol == "ed2k" || protocol == "sig2dat" || protocol == "slsk" || protocol == "data" ) mode = RawURI; + else if ( protocol == "mailto" ) mode = Mailto; + else mode = URL; + } + return mode; } diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp index 701e074ad..c10c64e97 100644 --- a/tdecore/network/kresolverstandardworkers.cpp +++ b/tdecore/network/kresolverstandardworkers.cpp @@ -199,7 +199,7 @@ namespace # elif defined(HAVE_GETHOSTBYNAME_R) && (!defined(AF_INET6) || !defined(HAVE_GETHOSTBYNAME2)) # define USE_GETHOSTBYNAME_R # elif defined(HAVE_GETHOSTBYNAME2) -# define USE_GETHOSTBYNAME2) +# define USE_GETHOSTBYNAME2 # else # define USE_GETHOSTBYNAME # endif |