diff options
| author | 2008-04-28 03:04:54 +0000 | |
|---|---|---|
| committer | 2008-04-28 03:04:54 +0000 | |
| commit | 875b9b3c697182686d552cae85e136d17f36896a (patch) | |
| tree | bda7a7456401b25f19a091189134c0de2233c177 /src/modules/options | |
| parent | A huge progress in KDE4 port, kvirc and several modules now compile. Linking ... (diff) | |
| download | KVIrc-875b9b3c697182686d552cae85e136d17f36896a.tar.gz KVIrc-875b9b3c697182686d552cae85e136d17f36896a.tar.bz2 KVIrc-875b9b3c697182686d552cae85e136d17f36896a.zip | |
Yet more KDE4 port
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1609 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/options')
| -rw-r--r-- | src/modules/options/optw_connection.cpp | 8 | ||||
| -rw-r--r-- | src/modules/options/optw_servers.cpp | 4 | ||||
| -rw-r--r-- | src/modules/options/optw_servers.h | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp index 66ae40d71..1f01823bb 100644 --- a/src/modules/options/optw_connection.cpp +++ b/src/modules/options/optw_connection.cpp @@ -161,7 +161,13 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * parent) connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool))); #endif //!COMPILE_IPV6_SUPPORT - addBoolSelector(0,4,0,4,__tr2qs_ctx("Pick Random IP Address for Round-Robin Servers","options"),KviOption_boolPickRandomIpAddressForRoundRobinServers); + b = addBoolSelector(0,4,0,4,__tr2qs_ctx("Pick Random IP Address for Round-Robin Servers","options"),KviOption_boolPickRandomIpAddressForRoundRobinServers); + mergeTip(b,__tr2qs_ctx("<center>This option will cause the KVIrc networking stack to pick up " \ + "a random entry when multiple IP address are retrieved for a server " \ + "dns lookup. This is harmless and can fix some problems with caching " \ + "dns servers that do not properly rotate the records as the authoritative " \ + "ones would do. On the other hand, you might want to disable it if " \ + "you want to rely on the dns server to provide the best choice.</center>")); addRowSpacer(0,5,0,5); } diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index 4b03a8322..a46c7d010 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -1395,7 +1395,7 @@ void KviServerOptionsWidget::importPopupActivated(int id) return; } - connect(m_pImportFilter,SIGNAL(server(const KviIrcServer &,const char *)),this,SLOT(importServer(const KviIrcServer &,const char *))); + connect(m_pImportFilter,SIGNAL(server(const KviIrcServer &,const QString&)),this,SLOT(importServer(const KviIrcServer &,const QString&))); connect(m_pImportFilter,SIGNAL(destroyed()),this,SLOT(importerDead())); m_pImportFilter->start(); @@ -1406,7 +1406,7 @@ void KviServerOptionsWidget::importerDead() m_pImportFilter = 0; } -void KviServerOptionsWidget::importServer(const KviIrcServer &s,const char * network) +void KviServerOptionsWidget::importServer(const KviIrcServer &s,const QString &network) { KviServerOptionsListViewItem * net = findNetItem(network); if(!net) diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h index 52ebb0c38..5cdf8f335 100644 --- a/src/modules/options/optw_servers.h +++ b/src/modules/options/optw_servers.h @@ -187,7 +187,7 @@ private: KviServerOptionsListViewItem * findNetItem(const char * netname); protected slots: void importerDead(); - void importServer(const KviIrcServer & s,const char * network); + void importServer(const KviIrcServer & s,const QString &network); void importPopupAboutToShow(); void listViewItemSelectionChanged(KviTalListViewItem *it); void listViewRightButtonPressed(KviTalListViewItem *it,const QPoint &pnt,int col); |
