From 491e1c72c7e2a19b58772fd285284e974d489501 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 19 Dec 2020 22:55:58 +0900 Subject: Fixed some uncrustify's code formatting offending files. Signed-off-by: Michele Calgaro --- tdecore/kurl.cpp | 26 +++++++++++--------------- tdecore/network/kresolverstandardworkers.cpp | 2 +- 2 files changed, 12 insertions(+), 16 deletions(-) (limited to 'tdecore') diff --git a/tdecore/kurl.cpp b/tdecore/kurl.cpp index 290355552..a80257f76 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 -- cgit v1.2.1