summaryrefslogtreecommitdiffstats
path: root/tdecore
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2020-12-19 22:55:58 +0900
committerMichele Calgaro <[email protected]>2020-12-19 22:55:58 +0900
commit491e1c72c7e2a19b58772fd285284e974d489501 (patch)
tree2d2658d0c98c0d1a55746a7f9a39fa2344a9874c /tdecore
parent5cb3ed2e545a03815cdd04ab8666b605a71c44b4 (diff)
downloadtdelibs-491e1c72c7e2a19b58772fd285284e974d489501.tar.gz
tdelibs-491e1c72c7e2a19b58772fd285284e974d489501.zip
Fixed some uncrustify's code formatting offending files.
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'tdecore')
-rw-r--r--tdecore/kurl.cpp26
-rw-r--r--tdecore/network/kresolverstandardworkers.cpp2
2 files changed, 12 insertions, 16 deletions
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