summaryrefslogtreecommitdiff
path: root/devel/qt4-dbus/files/patch-tools__qdbus__qdbus__qdbus.cpp
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2019-03-16 21:55:51 +0000
committerTobias C. Berner <tcberner@FreeBSD.org>2019-03-16 21:55:51 +0000
commit369eb054b0edf196641e8706f3f6fcd77788f690 (patch)
treed44bab2e528ec5663705a59ae511ea0a4e027206 /devel/qt4-dbus/files/patch-tools__qdbus__qdbus__qdbus.cpp
parentx11-themes/qtcurve: remove qt4 slave (Qt4 deprecation) (diff)
Qt4 deprecation: Remove Qt4 and its consumes.
2019-03-15 accessibility/qt4-accessible: Qt4 has been EOL since december 2015 2019-03-15 astro/qlandkartegt: Qt4 has been EOL since december 2015 2019-03-15 astro/stellarium-qt4: Qt4 has been EOL since december 2015 2019-03-15 astro/xglobe: Qt4 has been EOL since december 2015 2019-03-15 audio/acoustid-fingerprinter: Qt4 has been EOL since december 2015 2019-03-15 audio/cueplayer: Qt4 has been EOL since december 2015 2019-03-15 audio/esperanza: Qt4 has been EOL since december 2015 2019-03-15 audio/lastfm-desktop: Qt4 has been EOL since december 2015 2019-03-15 audio/minitunes: Qt4 has been EOL since december 2015 2019-03-15 audio/mixxx20: Qt4 has been EOL since december 2015 2019-03-15 audio/mumble: Qt4 has been EOL since december 2015 2019-03-15 audio/murmur: Qt4 has been EOL since december 2015 2019-03-15 audio/puddletag: Qt4 has been EOL since december 2015 2019-03-15 audio/qmpdclient: Qt4 has been EOL since december 2015 2019-03-15 audio/skype-call-recorder: Qt4 has been EOL since december 2015 2019-03-15 audio/virtual_oss_ctl: Qt4 has been EOL since december 2015 2019-03-15 biology/clustalx: Qt4 has been EOL since december 2015 2019-03-15 cad/klayout: Qt4 has been EOL since december 2015 2019-03-15 cad/layouteditor: Qt4 has been EOL since december 2015 2019-03-15 cad/leocad: Qt4 has been EOL since december 2015 2019-03-15 cad/meshlab: Qt4 has been EOL since december 2015 2019-03-15 cad/qfsm: Qt4 has been EOL since december 2015 2019-03-15 cad/qucs: Qt4 has been EOL since december 2015 2019-03-15 chinese/gcin-qt4: Qt4 has been EOL since december 2015 2019-03-15 chinese/qt4-codecs-cn: Qt4 has been EOL since december 2015 2019-03-15 chinese/qt4-codecs-tw: Qt4 has been EOL since december 2015 2019-03-15 chinese/qterm: Qt4 has been EOL since december 2015 2019-03-15 comms/dabstick-radio: Qt4 has been EOL since december 2015 2019-03-15 comms/hamfax: Qt4 has been EOL since december 2015 2019-03-15 comms/linpsk: Qt4 has been EOL since december 2015 2019-03-15 databases/py-qt4-sql: Qt4 has been EOL since december 2015 2019-03-15 databases/qt4-ibase-plugin: Qt4 has been EOL since december 2015 2019-03-15 databases/qt4-mysql-plugin: Qt4 has been EOL since december 2015 2019-03-15 databases/qt4-odbc-plugin: Qt4 has been EOL since december 2015 2019-03-15 databases/qt4-pgsql-plugin: Qt4 has been EOL since december 2015 2019-03-15 databases/qt4-sql: Qt4 has been EOL since december 2015 2019-03-15 databases/qt4-sqlite-plugin: Qt4 has been EOL since december 2015 2019-03-15 databases/qt4-sqlite3-plugin: Qt4 has been EOL since december 2015 2019-03-15 databases/sqliteman: Qt4 has been EOL since december 2015 2019-03-15 databases/tora: Qt4 has been EOL since december 2015 2019-03-15 deskutils/cdcat: Qt4 has been EOL since december 2015 2019-03-15 deskutils/fbreader: Qt4 has been EOL since december 2015 2019-03-15 deskutils/launchy: Qt4 has been EOL since december 2015 2019-03-15 deskutils/qorganizer: Qt4 has been EOL since december 2015 2019-03-15 deskutils/qrfcview: Qt4 has been EOL since december 2015 2019-03-15 deskutils/qtm: Qt4 has been EOL since december 2015 2019-03-15 deskutils/tuxcards: Qt4 has been EOL since december 2015 2019-03-15 deskutils/vym: Qt4 has been EOL since december 2015 2019-03-15 devel/apiextractor: Qt4 has been EOL since december 2015 2019-03-15 devel/automoc4: Qt4 has been EOL since december 2015 2019-03-15 devel/edb: Qt4 has been EOL since december 2015 2019-03-15 devel/generatorrunner: Qt4 has been EOL since december 2015 2019-03-15 devel/grantlee: Qt4 has been EOL since december 2015 2019-03-15 devel/gwenhywfar-qt4: Qt4 has been EOL since december 2015 2019-03-15 devel/kaptain: Qt4 has been EOL since december 2015 2019-03-15 devel/ninja-ide: Qt4 has been EOL since december 2015 2019-03-12 devel/physfs-devel: is the same as devel/physfs, serving no purpose 2019-03-15 devel/piklab: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-assistant: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-core: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-dbus: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-dbussupport: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-declarative: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-designer: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-designerplugin: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-help: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-qscintilla2: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-script: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-scripttools: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-test: Qt4 has been EOL since december 2015 2019-03-15 devel/pyside: Qt4 has been EOL since december 2015 2019-03-15 devel/pyside-tools: Qt4 has been EOL since december 2015 2019-03-15 devel/qbzr: Qt4 has been EOL since december 2015 2019-03-15 devel/qct: Qt4 has been EOL since december 2015 2019-03-15 devel/qdevelop: Qt4 has been EOL since december 2015 2019-03-15 devel/qprog: Qt4 has been EOL since december 2015 2019-03-15 devel/qross: Qt4 has been EOL since december 2015 2019-03-15 devel/qscintilla2: Qt4 has been EOL since december 2015 2019-03-15 devel/qscintilla2-designerplugin: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-assistant: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-assistant-adp: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-corelib: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-dbus: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-designer: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-help-tools: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-libqtassistantclient: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-linguist: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-linguisttools: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-makeqpf: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-moc: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-porting: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qdbusviewer: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qdoc3: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qmake: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qmlviewer: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qt3support: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qtsolutions-singleapplication: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qtsolutions-soap: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qvfb: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-rcc: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-script: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-scripttools: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-testlib: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-uic: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-uic3: Qt4 has been EOL since december 2015 2019-03-15 devel/qtscriptgenerator: Qt4 has been EOL since december 2015 2019-03-15 devel/shiboken: Qt4 has been EOL since december 2015 2019-03-15 devel/subcommander2: Qt4 has been EOL since december 2015 2019-03-15 devel/universalindentgui: Qt4 has been EOL since december 2015 2019-03-15 editors/leo: Qt4 has been EOL since december 2015 2019-03-15 editors/lfhex: Qt4 has been EOL since december 2015 2019-03-15 editors/plume-creator-devel: Qt4 has been EOL since december 2015 2019-03-15 editors/textroom: Qt4 has been EOL since december 2015 2019-03-15 editors/yzis: Qt4 has been EOL since december 2015 2019-03-15 emulators/dboxfe: Qt4 has been EOL since december 2015 2019-03-15 emulators/q4wine: Qt4 has been EOL since december 2015 2019-03-15 emulators/qtemu: Qt4 has been EOL since december 2015 2019-03-15 emulators/swine: Qt4 has been EOL since december 2015 2019-03-15 finance/alkimia-qt4: Qt4 has been EOL since december 2015 2019-03-15 finance/bitcoin-armory: Qt4 has been EOL since december 2015 2019-03-15 finance/qhacc: Qt4 has been EOL since december 2015 2019-03-15 ftp/scythia: Qt4 has been EOL since december 2015 2019-03-15 games/bubble-chains: Qt4 has been EOL since december 2015 2019-03-15 games/capicity: Qt4 has been EOL since december 2015 2019-03-15 games/capitalism: Qt4 has been EOL since december 2015 2019-03-15 games/flukz: Qt4 has been EOL since december 2015 2019-03-15 games/goldencheetah: Qt4 has been EOL since december 2015 2019-03-15 games/jag: Qt4 has been EOL since december 2015 2019-03-15 games/kardsgt: Qt4 has been EOL since december 2015 2019-03-15 games/kcheckers: Qt4 has been EOL since december 2015 2019-03-15 games/openpref: Qt4 has been EOL since december 2015 2019-03-15 games/pokerth: Qt4 has been EOL since december 2015 2019-03-15 games/qgo: Qt4 has been EOL since december 2015 2019-03-15 games/qtads: Qt4 has been EOL since december 2015 2019-03-15 games/quackle: Qt4 has been EOL since december 2015 2019-03-15 games/spellathon: Qt4 has been EOL since december 2015 2019-03-15 games/sudoku-sensei: Qt4 has been EOL since december 2015 2019-03-15 games/tbe: Qt4 has been EOL since december 2015 2019-03-15 games/xptools: Qt4 has been EOL since december 2015 2019-03-15 german/tipp10: Qt4 has been EOL since december 2015 2019-03-15 graphics/appleseed: Qt4 has been EOL since december 2015 2019-03-15 graphics/aqsis: Qt4 has been EOL since december 2015 2019-03-15 graphics/autoq3d: Qt4 has been EOL since december 2015 2019-03-15 graphics/burplex: Qt4 has been EOL since december 2015 2019-03-15 graphics/darknock: Qt4 has been EOL since december 2015 2019-03-15 graphics/djview4-qt4: Qt4 has been EOL since december 2015 2019-03-15 graphics/easypaint: Qt4 has been EOL since december 2015 2019-03-15 graphics/eos-movrec: Qt4 has been EOL since december 2015 2019-03-15 graphics/gle-graphics: Qt4 has been EOL since december 2015 2019-03-15 graphics/lprof-devel: Qt4 has been EOL since december 2015 2019-03-15 graphics/luminance: Qt4 has been EOL since december 2015 2019-03-15 graphics/luxrender: Qt4 has been EOL since december 2015 2019-03-15 graphics/luxrender14: Qt4 has been EOL since december 2015 2019-03-15 graphics/meshviewer: Qt4 has been EOL since december 2015 2019-03-15 graphics/natron: Qt4 has been EOL since december 2015 2019-03-15 graphics/oyranos: Qt4 has been EOL since december 2015 2019-03-15 graphics/pencil: Qt4 has been EOL since december 2015 2019-03-15 graphics/prison: Qt4 has been EOL since december 2015 2019-03-15 graphics/py-qt4-svg: Qt4 has been EOL since december 2015 2019-03-15 graphics/qt4-iconengines: Qt4 has been EOL since december 2015 2019-03-15 graphics/qt4-imageformats: Qt4 has been EOL since december 2015 2019-03-15 graphics/qt4-opengl: Qt4 has been EOL since december 2015 2019-03-15 graphics/qt4-pixeltool: Qt4 has been EOL since december 2015 2019-03-15 graphics/qt4-svg: Qt4 has been EOL since december 2015 2019-03-15 graphics/qxv: Qt4 has been EOL since december 2015, qxv is unmaintained 2019-03-15 graphics/scantailor: Qt4 has been EOL since december 2015 2019-03-15 graphics/seexpr: Qt4 has been EOL since december 2015 2019-03-15 graphics/smillaenlarger: Qt4 has been EOL since december 2015 2019-03-15 graphics/structuresynth: Qt4 has been EOL since december 2015 2019-03-15 graphics/yagf: Qt4 has been EOL since december 2015 2019-03-15 japanese/qt4-codecs-jp: Qt4 has been EOL since december 2015 2019-03-15 korean/qt4-codecs-kr: Qt4 has been EOL since december 2015 2019-03-15 mail/qgmailnotifier: Qt4 has been EOL since december 2015 2019-03-15 math/qtiplot: Qt4 has been EOL since december 2015 2019-03-15 math/qtoctave: Qt4 has been EOL since december 2015 2019-03-15 math/qwtplot3d-qt4: Qt4 has been EOL since december 2015 2019-03-15 misc/py-qt4-demo: Qt4 has been EOL since december 2015 2019-03-15 misc/py-qt4-doc: Qt4 has been EOL since december 2015 2019-03-15 misc/qmetro: Qt4 has been EOL since december 2015 2019-03-15 misc/qt4-doc: Qt4 has been EOL since december 2015 2019-03-15 misc/qt4-l10n: Qt4 has been EOL since december 2015 2019-03-15 misc/qt4-qtconfig: Qt4 has been EOL since december 2015 2019-03-15 misc/qt4-qtdemo: Qt4 has been EOL since december 2015 2019-03-15 misc/saaghar: Qt4 has been EOL since december 2015 2019-03-15 multimedia/2mandvd: Qt4 has been EOL since december 2015 2019-03-15 multimedia/abby: Qt4 has been EOL since december 2015 2019-03-15 multimedia/avidemux-qt4: Qt4 has been EOL since december 2015 2019-03-15 multimedia/gstreamer-qt4: Qt4 has been EOL since december 2015 2019-03-15 multimedia/mediadownloader: Qt4 has been EOL since december 2015 2019-03-15 multimedia/mlt-qt4: Qt4 has been EOL since december 2015 2019-03-15 multimedia/phonon-xine: Qt4 has been EOL since december 2015 2019-03-15 multimedia/py-qt4-multimedia: Qt4 has been EOL since december 2015 2019-03-15 multimedia/py-qt4-phonon: Qt4 has been EOL since december 2015 2019-03-15 multimedia/qmmp: Qt4 has been EOL since december 2015 2019-03-15 multimedia/qmmp-plugin-pack: Qt4 has been EOL since december 2015 2019-03-15 multimedia/qt4-mobility: Qt4 has been EOL since december 2015 2019-03-15 multimedia/qt4-multimedia: Qt4 has been EOL since december 2015 2019-03-15 multimedia/umplayer: Qt4 has been EOL since december 2015 2019-03-15 net/avahi-qt4: Qt4 has been EOL since december 2015 2019-03-15 net/cagibi: Qt4 has been EOL since december 2015 2019-03-15 net/hupnp: Qt4 has been EOL since december 2015 2019-03-15 net/ostinato: Qt4 has been EOL since december 2015 2019-03-15 net/py-qt4-network: Qt4 has been EOL since december 2015 2019-03-15 net/qjsonrpc: Qt4 has been EOL since december 2015 2019-03-15 net/qoauth: Qt4 has been EOL since december 2015 2019-03-15 net/qt4-network: Qt4 has been EOL since december 2015 2019-03-15 net/qtweetlib: Qt4 has been EOL since december 2015 2019-03-15 net-im/libjreen: Qt4 has been EOL since december 2015 2019-03-15 net-im/psimedia: Qt4 has been EOL since december 2015 2019-03-15 net-im/ramblercontacts: Qt4 has been EOL since december 2015 2019-03-15 net-im/telepathy-logger-qt4: Qt4 has been EOL since december 2015 2019-03-15 net-im/turpial: Qt4 has been EOL since december 2015 2019-03-15 net-im/vacuum-im: Qt4 has been EOL since december 2015 2019-03-15 net-mgmt/nagiosagent: Qt4 has been EOL since december 2015 2019-03-15 net-mgmt/qkismet: Qt4 has been EOL since december 2015 2019-03-15 net-p2p/bitmessage: Qt4 has been EOL since december 2015 2019-03-15 net-p2p/eiskaltdcpp-qt: Qt4 has been EOL since december 2015 2019-03-15 net-p2p/valknut: Qt4 has been EOL since december 2015 2019-03-15 polish/qfaktury: Qt4 has been EOL since december 2015 2019-03-15 print/kpdftool: Qt4 has been EOL since december 2015 2019-03-15 print/scribus: Qt4 has been EOL since december 2015 2019-03-15 science/MOOSE-neural-simulator: Qt4 has been EOL since december 2015 2019-03-15 science/avogadro: Qt4 has been EOL since december 2015 2019-03-15 science/openstructure: Qt4 has been EOL since december 2015 2019-03-15 science/py-veusz: Qt4 has been EOL since december 2015 2019-03-15 science/qtresistors: Qt4 has been EOL since december 2015 2019-03-15 security/keepassx2: Qt4 has been EOL since december 2015 2019-03-15 security/kqoauth: Qt4 has been EOL since december 2015 2019-03-15 security/tpmmanager: Qt4 has been EOL since december 2015 2019-03-15 sysutils/android-file-transfer-qt4: Qt4 has been EOL since december 2015 2019-03-15 sysutils/bacula9-bat: Qt4 has been EOL since december 2015 2019-03-15 sysutils/bareos-traymonitor: Qt4 has been EOL since december 2015 2019-03-15 sysutils/bareos16-bat: Qt4 has been EOL since december 2015 2019-03-15 sysutils/bareos16-traymonitor: Qt4 has been EOL since december 2015 2019-03-15 sysutils/policykit-qt: Qt4 has been EOL since december 2015 2019-03-15 sysutils/qpxtool: Qt4 has been EOL since december 2015 2019-03-15 sysutils/qsynergy: Qt4 has been EOL since december 2015 2019-03-15 sysutils/qzeitgeist: Qt4 has been EOL since december 2015 2019-03-15 sysutils/searchmonkey: Qt4 has been EOL since december 2015 2019-03-15 sysutils/unetbootin: Qt4 has been EOL since december 2015 2019-03-15 textproc/beediff: Qt4 has been EOL since december 2015 2019-03-15 textproc/dixit: Qt4 has been EOL since december 2015 2019-03-15 textproc/goldendict: Qt4 has been EOL since december 2015 2019-03-15 textproc/ibus-qt: Qt4 has been EOL since december 2015 2019-03-15 textproc/py-qt4-xml: Qt4 has been EOL since december 2015 2019-03-15 textproc/py-qt4-xmlpatterns: Qt4 has been EOL since december 2015 2019-03-15 textproc/qt4-clucene: Qt4 has been EOL since december 2015 2019-03-15 textproc/qt4-xml: Qt4 has been EOL since december 2015 2019-03-15 textproc/qt4-xmlpatterns: Qt4 has been EOL since december 2015 2019-03-15 textproc/qt4-xmlpatterns-tool: Qt4 has been EOL since december 2015 2019-03-15 textproc/scim-bridge-qt4: Qt4 has been EOL since december 2015 2019-03-15 textproc/uim-qt4: Qt4 has been EOL since december 2015 2019-03-15 textproc/xxdiff: Qt4 has been EOL since december 2015 2019-03-15 www/aria2fe: Qt4 has been EOL since december 2015 2019-03-15 www/cutycapt: Qt4 has been EOL since december 2015 2019-03-15 www/py-qt4-webkit: Qt4 has been EOL since december 2015 2019-03-15 www/qt4-webkit: Qt4 has been EOL since december 2015 2019-03-15 www/qupzilla-qt4: Qt4 has been EOL since december 2015 2019-03-15 x11/leechcraft: Qt4 has been EOL since december 2015 2019-03-15 x11/py-qt4-opengl: Qt4 has been EOL since december 2015 2019-03-15 x11/qimageblitz: Qt4 has been EOL since december 2015 2019-03-15 x11/qt4-graphicssystems-opengl: Qt4 has been EOL since december 2015 2019-03-15 x11/qt4-inputmethods: Qt4 has been EOL since december 2015 2019-03-15 x11/qxkb: Qt4 has been EOL since december 2015 2019-03-15 x11-fonts/fontmatrix: Qt4 has been EOL since december 2015 2019-03-15 x11-themes/qt4-style-float: Qt4 has been EOL since december 2015 2019-03-15 x11-themes/qt4-style-phase: Qt4 has been EOL since december 2015 2019-03-15 x11-themes/qt4-style-quantumstyle: Qt4 has been EOL since december 2015 2019-03-15 x11-themes/qtcurve-qt4: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/attica: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/py-qt4-gui: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/qt4-declarative: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/qt4-gui: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/qt4pas: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/qwt5: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/qwt5-designerplugin: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/soqt: Qt4 has been EOL since december 2015 2019-03-15 x11-wm/qlwm: Qt4 has been EOL since december 2015 Approved by: portmgr (implicit)
Diffstat (limited to 'devel/qt4-dbus/files/patch-tools__qdbus__qdbus__qdbus.cpp')
-rw-r--r--devel/qt4-dbus/files/patch-tools__qdbus__qdbus__qdbus.cpp144
1 files changed, 0 insertions, 144 deletions
diff --git a/devel/qt4-dbus/files/patch-tools__qdbus__qdbus__qdbus.cpp b/devel/qt4-dbus/files/patch-tools__qdbus__qdbus__qdbus.cpp
deleted file mode 100644
index eab9f93025d8..000000000000
--- a/devel/qt4-dbus/files/patch-tools__qdbus__qdbus__qdbus.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
---- tools/qdbus/qdbus/qdbus.cpp.orig 2012-04-26 21:45:51.000000000 +0200
-+++ tools/qdbus/qdbus/qdbus.cpp 2012-12-07 14:46:43.000000000 +0100
-@@ -54,7 +54,6 @@ QT_BEGIN_NAMESPACE
- Q_DBUS_EXPORT extern bool qt_dbus_metaobject_skip_annotations;
- QT_END_NAMESPACE
-
--static QDBusConnection connection(QLatin1String(""));
- static bool printArgumentsLiterally = false;
-
- static void showUsage()
-@@ -111,7 +110,7 @@ static void printArg(const QVariant &v)
- }
- }
-
--static void listObjects(const QString &service, const QString &path)
-+static void listObjects(const QString &service, const QString &path, const QDBusConnection &connection)
- {
- // make a low-level call, to avoid introspecting the Introspectable interface
- QDBusMessage call = QDBusMessage::createMethodCall(service, path.isEmpty() ? QLatin1String("/") : path,
-@@ -144,13 +143,13 @@ static void listObjects(const QString &s
- if (child.tagName() == QLatin1String("node")) {
- QString sub = path + QLatin1Char('/') + child.attribute(QLatin1String("name"));
- printf("%s\n", qPrintable(sub));
-- listObjects(service, sub);
-+ listObjects(service, sub, connection);
- }
- child = child.nextSiblingElement();
- }
- }
-
--static void listInterface(const QString &service, const QString &path, const QString &interface)
-+static void listInterface(const QString &service, const QString &path, const QString &interface, const QDBusConnection &connection)
- {
- QDBusInterface iface(service, path, interface, connection);
- if (!iface.isValid()) {
-@@ -204,7 +203,7 @@ static void listInterface(const QString
- }
- }
-
--static void listAllInterfaces(const QString &service, const QString &path)
-+static void listAllInterfaces(const QString &service, const QString &path, const QDBusConnection &connection)
- {
- // make a low-level call, to avoid introspecting the Introspectable interface
- QDBusMessage call = QDBusMessage::createMethodCall(service, path.isEmpty() ? QLatin1String("/") : path,
-@@ -229,7 +228,7 @@ static void listAllInterfaces(const QStr
- if (child.tagName() == QLatin1String("interface")) {
- QString ifaceName = child.attribute(QLatin1String("name"));
- if (QDBusUtil::isValidInterfaceName(ifaceName))
-- listInterface(service, path, ifaceName);
-+ listInterface(service, path, ifaceName, connection);
- else {
- qWarning("Invalid D-BUS interface name '%s' found while parsing introspection",
- qPrintable(ifaceName));
-@@ -253,7 +252,7 @@ static QStringList readList(QStringList
- return retval;
- }
-
--static int placeCall(const QString &service, const QString &path, const QString &interface,
-+static int placeCall(const QString &service, const QString &path, const QString &interface, const QDBusConnection &connection,
- const QString &member, const QStringList& arguments, bool try_prop=true)
- {
- QDBusInterface iface(service, path, interface, connection);
-@@ -291,7 +290,7 @@ static int placeCall(const QString &serv
- proparg += interface;
- proparg += member;
- proparg += args.first();
-- if (!placeCall(service, path, "org.freedesktop.DBus.Properties", "Set", proparg, false))
-+ if (!placeCall(service, path, "org.freedesktop.DBus.Properties", connection, "Set", proparg, false))
- return 0;
- }
- fprintf(stderr, "Cannot find '%s.%s' in object %s at %s\n",
-@@ -387,7 +386,7 @@ static int placeCall(const QString &serv
- QStringList proparg;
- proparg += interface;
- proparg += member;
-- if (!placeCall(service, path, "org.freedesktop.DBus.Properties", "Get", proparg, false))
-+ if (!placeCall(service, path, "org.freedesktop.DBus.Properties", connection, "Get", proparg, false))
- return 0;
- }
- if (err.type() == QDBusError::ServiceUnknown)
-@@ -448,6 +447,7 @@ int main(int argc, char **argv)
- QCoreApplication app(argc, argv);
- QStringList args = app.arguments();
- args.takeFirst();
-+ QDBusConnection connection(QLatin1String(""));
-
- bool connectionOpened = false;
- while (!args.isEmpty() && args.at(0).startsWith(QLatin1Char('-'))) {
-@@ -481,7 +481,7 @@ int main(int argc, char **argv)
- QDBusConnectionInterface *bus = connection.interface();
- if (args.isEmpty()) {
- printAllServices(bus);
-- exit(0);
-+ return 0;
- }
-
- QString service = args.takeFirst();
-@@ -491,22 +491,22 @@ int main(int argc, char **argv)
- return 0;
- }
- fprintf(stderr, "Service '%s' is not a valid name.\n", qPrintable(service));
-- exit(1);
-+ return 1;
- }
-
- if (args.isEmpty()) {
-- listObjects(service, QString());
-- exit(0);
-+ listObjects(service, QString(), connection);
-+ return 0;
- }
-
- QString path = args.takeFirst();
- if (!QDBusUtil::isValidObjectPath(path)) {
- fprintf(stderr, "Path '%s' is not a valid path name.\n", qPrintable(path));
-- exit(1);
-+ return 1;
- }
- if (args.isEmpty()) {
-- listAllInterfaces(service, path);
-- exit(0);
-+ listAllInterfaces(service, path, connection);
-+ return 0;
- }
-
- QString interface = args.takeFirst();
-@@ -521,14 +521,13 @@ int main(int argc, char **argv)
- }
- if (!interface.isEmpty() && !QDBusUtil::isValidInterfaceName(interface)) {
- fprintf(stderr, "Interface '%s' is not a valid interface name.\n", qPrintable(interface));
-- exit(1);
-+ return 1;
- }
- if (!QDBusUtil::isValidMemberName(member)) {
- fprintf(stderr, "Method name '%s' is not a valid member name.\n", qPrintable(member));
-- exit(1);
-+ return 1;
- }
-
-- int ret = placeCall(service, path, interface, member, args);
-- exit(ret);
-+ return placeCall(service, path, interface, connection, member, args);
- }
-