X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fos_win32.cpp;h=0928259b72dd47fa9de466d4ca2ccec86450bc0d;hb=12554c93d81f75f87c34040fd7737048d3518d6d;hp=72bf218a04db6e3be44b629d2c8a78c71b91ce43;hpb=1717ef203cf08fd393e2b905a9ed7f9465c8f47d;p=lyx.git

diff --git a/src/support/os_win32.cpp b/src/support/os_win32.cpp
index 72bf218a04..0928259b72 100644
--- a/src/support/os_win32.cpp
+++ b/src/support/os_win32.cpp
@@ -160,7 +160,7 @@ void init(int argc, char * argv[])
 	wchar_t ** envp = 0;
 	int newmode = 0;
 	__wgetmainargs(&argc_, &argv_, &envp, -1, &newmode);
-	LASSERT(argc == argc_, /**/);
+	LATTEST(argc == argc_);
 
 	// If Cygwin is detected, query the cygdrive prefix.
 	// The cygdrive prefix is needed for translating windows style paths
@@ -212,7 +212,7 @@ void init(int argc, char * argv[])
 
 string utf8_argv(int i)
 {
-	LASSERT(i < argc_, /**/);
+	LASSERT(i < argc_, return "");
 	return fromqstr(QString::fromWCharArray(argv_[i]));
 }
 
@@ -312,7 +312,7 @@ static QString const get_long_path(QString const & short_path)
 		long_path.resize(result);
 		result = GetLongPathNameW((wchar_t *) short_path.utf16(),
 					 &long_path[0], long_path.size());
-		LASSERT(result <= long_path.size(), /**/);
+		LATTEST(result <= long_path.size());
 	}
 
 	return (result == 0) ? short_path : QString::fromWCharArray(&long_path[0]);
@@ -339,7 +339,7 @@ static QString const get_short_path(QString const & long_path, file_access how)
 		short_path.resize(result);
 		result = GetShortPathNameW((wchar_t *) long_path.utf16(),
 					 &short_path[0], short_path.size());
-		LASSERT(result <= short_path.size(), /**/);
+		LATTEST(result <= short_path.size());
 	}
 
 	return (result == 0) ? long_path : QString::fromWCharArray(&short_path[0]);
@@ -458,12 +458,6 @@ shell_type shell()
 }
 
 
-int timeout_min()
-{
-	return 30;
-}
-
-
 char path_separator(path_type type)
 {
 	if (type == TEXENGINE)
@@ -520,7 +514,7 @@ string const GetFolderPath::operator()(folder_id _id) const
 		id = CSIDL_APPDATA;
 		break;
 	default:
-		LASSERT(false, /**/);
+		LASSERT(false, return string());
 	}
 	HRESULT const result = (folder_path_func_)(0, id, 0,
 						   SHGFP_TYPE_CURRENT,