summaryrefslogtreecommitdiff
path: root/src/libs/zeroconf/avahiLib.cpp
Commit message (Collapse)AuthorAgeFilesLines
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Use double quotes instead of single quotes as per our guidelines.Christian Kandeler2014-04-221-1/+1
| | | | | Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Remove unneeded typedefsKai Koehne2013-04-021-1/+0
| | | | | | | | | | Fix gcc 4.8.0 warnings like warning: typedef 'AvahiSimplePollSetFuncPtr' locally defined but not used [-Wunused-local-typedefs] Change-Id: I5cc2917958dc8e6a4c31031577ecc66575b8d328 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-291-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tips.cpp src/plugins/coreplugin/versiondialog.cpp src/plugins/projectexplorer/kitinformationconfigwidget.cpp src/plugins/qnx/blackberryapplicationrunner.cpp src/plugins/qnx/blackberrydeployconfiguration.cpp src/plugins/qnx/blackberrydeployconfiguration.h src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
| * Fix memory leak when sdRef is nullMontel Laurent2013-01-211-2/+2
| | | | | | | | | | Change-Id: I903683e5d91d96f43bf88b571fac2f2d18f07e25 Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-081-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #!/usr/bin/env ruby Dir.glob('**/*.cpp') { |file| # skip ast (excluding paste, astpath, and canv'ast'imer) next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i s = File.read(file) next if s.include?('qlalr') orig = s.dup s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m| res = $& if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces res else res.gsub!('} else', 'else') res.gsub!(/\n +} *\n/m, "\n") res.gsub(/ *{$/, '') end } s.gsub!(/ *$/, '') File.open(file, 'wb').write(s) if s != orig } Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc Reviewed-by: hjk <qthjk@ovi.com>
* | Zeroconf: Compile with QT_NO_CAST_FROM_ASCIIOrgad Shaneh2012-12-111-1/+1
|/ | | | | Change-Id: If23da8a3ae819875c627d40375b908eb0ea73e3c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* UI text: fix capitalization and punctuation.Leena Miettinen2012-10-011-6/+6
| | | | | Change-Id: Ib0dfa00b827830365ce4482b14da3668bcadd142 Reviewed-by: hjk <qthjk@ovi.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* zeroconf: Fix a bad call to serviceResolveReply, detected by an ICC warningThiago Macieira2012-05-291-1/+1
| | | | | | | | | | | | | | The warning was: src/libs/zeroconf/avahiLib.cpp(397): warning #68: integer conversion resulted in a change of sign sg->serviceResolveReply(0, kDNSServiceErr_Timeout, interface, 0, QString(), 0, 0); ^ The arguments to ServiceGatherer::serviceResolveReply seemed wrong: in the actual function declaration, the interface is before the error code. Change-Id: I0fe6d2e3249294a941ad2e791bb49eaa5c3d8ab7 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* zeroconf: adding a signal to track initial startupFawzi Mohamed2012-05-291-3/+3
| | | | | | | * improving error messages * track startup Change-Id: Iba5a293b03b2d46facfbc7a9827d0d71eb7ba152 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* Fix a warning about an integer change of sign with ICCThiago Macieira2012-05-231-1/+1
| | | | | | | The ttl argument to ServiceGaterer::txtFieldReply is uint32_t. Change-Id: I7df624eb04d5ffea1b281ed06d38d5e66b7a7319 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* Zeroconf: Fix build warning about unused variableKai Koehne2012-04-161-1/+1
| | | | | Change-Id: I62160525b1bf2d9886cc75cf34d928ba7b4174f3 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* zeroconf: const refs for ZConfLib::PtrFawzi Mohamed2012-04-121-5/+5
| | | | | Change-Id: I1e8104c4d3605f1867efb626c6c712cfb752e65a Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* zeroconf: add version to avahi libFawzi Mohamed2012-04-121-5/+11
| | | | | | Change-Id: Iedb59b74b1f9950abb0ca1d5adaaa594a465c0fd Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* zeroconf: windows support, avahi improvements, less messagesFawzi Mohamed2012-03-141-4/+28
| | | | | | | | | | | * support windows without apple bonjour installed * avahi with autorefresh * less spurious updates (messages when nothing actually changes) * quickly give up on connecting to daemon the first time * added startedBrowsing signal Change-Id: I8a29d94040fa6ffae318c98782120123093d6616 Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* Fix non-needed usage of QString's fromLocal8Bit() and fromUtf8()Denis Mingulov2012-01-301-1/+1
| | | | | | | | | | | | | | | | QString::fromLocal8Bit() and QString::fromUtf8() are much more slower than an obvious QString::fromLatin1() and QLatin1String(), so this commit changes some places where these functions are really not needed. QString::fromLatin1() is used in case if QString object is used immediately (something like QString::fromLatin1().arg()), QLatin1String is used otherwise like in other places (for example, QPixmap(QLatin1String("..."))) - to allow to use default QString constructor and work with QT_NO_CAST_FROM_ASCII. Change-Id: Ib6eb1c61e9cb35c7c5b7569fea77c5e41d32621a Reviewed-by: hjk <qthjk@ovi.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* zeroconf: IPv6 support, triggerRefresh, better avahi supportFawzi Mohamed2012-01-251-11/+45
| | | | | | Change-Id: If4e5e284d7ee109fe2fe6b0f50b25acfc3868a72 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* tr()-Fixes.Friedemann Kleint2011-12-131-7/+8
| | | | | | | | | - Capitalization - Fix lupdate warnings about tr() Usage in ZeroConf - Fix some messages. Change-Id: I95e4095ce54040e30d9a7968407bfc99b76643ff Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* more s/info@qt.nokia.com/qt-info@nokia.com/Eike Ziller2011-11-111-2/+2
| | | | | Change-Id: I5eecac63f45cf5bd192bd2ee42370d6338c1ec9f Reviewed-by: hjk <qthjk@ovi.com>
* zeroconf: codestyleFawzi Mohamed2011-10-311-57/+89
| | | | | | | Trying to avoid long lines and fixing other spacing issues. Change-Id: Ie0024743ef66c52a7922be046a8f7d8701a94ad6 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* zeroconf: correct txt record handling, small avahi fixesFawzi Mohamed2011-10-311-14/+12
| | | | | Change-Id: I660c12773a39655eec45d5ab3e00f70f5590dda7 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* zeroconf: initLib/setDefaultZConfLib related cleanupsFawzi Mohamed2011-10-281-5/+6
| | | | | | | | | | Renamed initLib to setDefaultZConfLib. Use shared pointers for libs: avoid small leak for each call to initLib. Renamed nativeLib to more logical dnsSdLib. Print in ~ServiceBrowserPrivate only if DEBUG_ZEROCONF. Change-Id: Icf76bba490c2ece46769253555b28c1220b44c23 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* zeroconf: fix windows buildingFawzi Mohamed2011-10-181-2/+2
| | | | | | | Correct exports, fixed commented out ifdef, moved socket including to a separate header. Change-Id: Iadb6f58e2c3dbadee411fc0df7c7519c1d90309d Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
* zeroconf: native avahi, and working fallbacksFawzi Mohamed2011-10-181-0/+478
* supports avahi through its native interface * starts embedded deamon if found * tested all fallbacks on ubuntu * Service is a normal object now * several smaller improvements Change-Id: I36288ec6fcefb64a60b6284e4d86d4b589ba37b5 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
View Lorry Controller Status