diff options
Diffstat (limited to 'win/vncconfig')
-rw-r--r-- | win/vncconfig/Connections.h | 4 | ||||
-rw-r--r-- | win/vncconfig/Legacy.cxx | 10 | ||||
-rw-r--r-- | win/vncconfig/vncconfig.cxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/win/vncconfig/Connections.h b/win/vncconfig/Connections.h index 8c8bb9aa..dfa5c79f 100644 --- a/win/vncconfig/Connections.h +++ b/win/vncconfig/Connections.h @@ -73,7 +73,7 @@ namespace rfb { try { network::TcpFilter::Pattern pat(network::TcpFilter::parsePattern(newPat.c_str())); pattern = network::TcpFilter::patternToStr(pat); - } catch(rdr::Exception& e) { + } catch(std::exception& e) { MsgBox(nullptr, e.what(), MB_ICONEXCLAMATION | MB_OK); return false; } @@ -235,7 +235,7 @@ namespace rfb { (localHost != isItemChecked(IDC_LOCALHOST)) || (port_number != getItemInt(IDC_PORT)) || (rfb::Server::idleTimeout != getItemInt(IDC_IDLE_TIMEOUT)); - } catch (rdr::Exception&) { + } catch (std::exception&) { return false; } } diff --git a/win/vncconfig/Legacy.cxx b/win/vncconfig/Legacy.cxx index 3dae1c99..855d7363 100644 --- a/win/vncconfig/Legacy.cxx +++ b/win/vncconfig/Legacy.cxx @@ -114,7 +114,7 @@ void LegacyPage::LoadPrefs() // Finally, save the Hosts value regKey.setString("Hosts", newHosts.c_str()); - } catch (rdr::Exception&) { + } catch (std::exception&) { MsgBox(nullptr, "Unable to convert AuthHosts setting to Hosts format.", MB_ICONWARNING | MB_OK); } @@ -135,7 +135,7 @@ void LegacyPage::LoadPrefs() regKey.setBool("AlwaysShared", connectPriority == 1); regKey.setBool("NeverShared", connectPriority == 2); - } catch(rdr::Exception&) { + } catch(std::exception&) { } // Open the local, default-user settings @@ -145,7 +145,7 @@ void LegacyPage::LoadPrefs() userKey.openKey(winvnc3, "Default"); vlog.info("loading Default prefs"); LoadUserPrefs(userKey); - } catch(rdr::Exception& e) { + } catch(std::exception& e) { vlog.error("error reading Default settings:%s", e.what()); } @@ -156,7 +156,7 @@ void LegacyPage::LoadPrefs() userKey.openKey(winvnc3, username.c_str()); vlog.info("loading local User prefs"); LoadUserPrefs(userKey); - } catch(rdr::Exception& e) { + } catch(std::exception& e) { vlog.error("error reading local User settings:%s", e.what()); } @@ -167,7 +167,7 @@ void LegacyPage::LoadPrefs() userKey.openKey(HKEY_CURRENT_USER, "Software\\ORL\\WinVNC3"); vlog.info("loading global User prefs"); LoadUserPrefs(userKey); - } catch(rdr::Exception& e) { + } catch(std::exception& e) { vlog.error("error reading global User settings:%s", e.what()); } } diff --git a/win/vncconfig/vncconfig.cxx b/win/vncconfig/vncconfig.cxx index bfe4e640..de3a4620 100644 --- a/win/vncconfig/vncconfig.cxx +++ b/win/vncconfig/vncconfig.cxx @@ -179,7 +179,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE /*prev*/, char* /*cmdLine*/, int /* throw; } - } catch (rdr::Exception& e) { + } catch (std::exception& e) { MsgBox(nullptr, e.what(), MB_ICONEXCLAMATION | MB_OK); return 1; } |