Re: trying to stop calling into the MainWindow

2015-11-08 Thread Tomaz Canabrava
On Fri, Nov 6, 2015 at 10:11 PM, Lubomir I. Ivanov wrote: > On 7 November 2015 at 00:58, K. "pestophagous" Heller > wrote: > > > > broadcast/listener pattern is one thing, but using it in *combination* > > with globally shared mutable state

[PATCH 1/4] Android: Clean up variable export

2015-11-08 Thread Joakim Bygdell
Removes duplicate variable export. Signed-off-by: Joakim Bygdell --- packaging/android/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 3d054f5..124835d 100644 --- a/packaging/android/build.sh +++

[PATCH 4/4] Android: remove duplicate top bar from log window

2015-11-08 Thread Joakim Bygdell
The log page have an extra top bar that is not needed. Signed-off-by: Joakim Bygdell --- qt-mobile/qml/Log.qml | 5 - 1 file changed, 5 deletions(-) diff --git a/qt-mobile/qml/Log.qml b/qt-mobile/qml/Log.qml index 8e660f2..7d9ddb7 100644 --- a/qt-mobile/qml/Log.qml +++

[PATCH 2/4] Android: disable ftdi on mac

2015-11-08 Thread Joakim Bygdell
Until we can get libftdi to build on mac we are better of just diabeling it. Signed-off-by: Joakim Bygdell --- packaging/android/build.sh | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packaging/android/build.sh b/packaging/android/build.sh index

[PATCH 3/4] Android: ask which pkg-config to use

2015-11-08 Thread Joakim Bygdell
Since pkg-config is installed in different places on linux and mac, let's ask where it is. Signed-off-by: Joakim Bygdell --- packaging/android/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packaging/android/build.sh

[PATCH] divetooltipitem.cpp: prettify the tooltip bounds and padding

2015-11-08 Thread Lubomir I. Ivanov
From: "Lubomir I. Ivanov" When the tooltip is expanded, not enough padding is present right from the text and bottom from it, making the tooltip border appear very close to the text. When the tooltip is collapsed (no time entries) it clips the graph/pixmap which makes the

[PATH] Re-enable facebook

2015-11-08 Thread Tomaz Canabrava
With this patch series facebook is back at work, yey. Beware that not eveyrthing is complete and we still need to manually copy things to it's correct place. The facebook now is a plugin ( wich simplifies some things, and makes a few things more complex ), so after build, if you run subsurface

Re: [PATCH] Enable BT compilation earlier

2015-11-08 Thread Dirk Hohndel
we need to play with this some more. Because having it this early means that if we turn off BT support because Qt is too old we still have the define in the compiler flags and things go badly wrong. This is what breaks the build on 14.04 on Launchpad. Can you find a way to make both work? /D On

Re: [PATCH] Enable BT compilation earlier

2015-11-08 Thread Miika Turkia
On Sun, Nov 8, 2015 at 7:31 PM, Dirk Hohndel wrote: > we need to play with this some more. Because having it this early means > that if we turn off BT support because Qt is too old we still have the > define in the compiler flags and things go badly wrong. This is what > breaks

Re: cloud storage on Android

2015-11-08 Thread Anton Lundin
On 07 November, 2015 - Joakim Bygdell wrote: > > > On 07 Nov 2015, at 19:10, Dirk Hohndel wrote: > > > > > > I think Lubomir posted about the fact that we may be using the wrong path > > on Android. I'll play with this later but wanted to send this out now in > > case it

Re: [PATCH 4/4] Android: remove duplicate top bar from log window

2015-11-08 Thread Dirk Hohndel
Thanks for those patches, Joakim! /D ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

Re: [PATH] fix broken mac build on old clangs.

2015-11-08 Thread Thiago Macieira
On Sunday 08 November 2015 22:12:19 Tomaz Canabrava wrote: > if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") > - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11 ") > - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") > + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 ") >

Re: [PATH] fix broken mac build on old clangs.

2015-11-08 Thread Dirk Hohndel
> On Nov 8, 2015, at 19:31, Thiago Macieira wrote: > >> On Sunday 08 November 2015 22:12:19 Tomaz Canabrava wrote: >> if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") >> - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11 ") >> - set(CMAKE_CXX_FLAGS

Re: [PATH] fix broken mac build on old clangs.

2015-11-08 Thread Thiago Macieira
On Sunday 08 November 2015 21:57:54 Tomaz Canabrava wrote: > They don't like c++11 They who? What's the error? Is that a build with the old GCC 4.2 instead of Clang? -- Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org Software Architect - Intel Open Source Technology Center

[PATH] fix broken mac build on old clangs.

2015-11-08 Thread Tomaz Canabrava
They don't like c++11 From b881e39ea03ab9a6e5d949d04f3fa690a5feeeb4 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Sun, 8 Nov 2015 21:50:12 -0200 Subject: [PATCH 7/7] Remove lambdas: they don't work on OSX 10.7 Signed-off-by: Tomaz Canabrava

Re: [PATH] fix broken mac build on old clangs.

2015-11-08 Thread Tomaz Canabrava
and two more patches. On Sun, Nov 8, 2015 at 9:57 PM, Tomaz Canabrava wrote: > They don't like c++11 > > From be06d0f78281a4a7b96aa8a49ce1b94441aa47a8 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Sun, 8 Nov 2015 22:01:05 -0200 Subject:

Re: [PATH] fix broken mac build on old clangs.

2015-11-08 Thread Dirk Hohndel
> On Nov 8, 2015, at 8:33 PM, Thiago Macieira wrote: > > On Sunday 08 November 2015 20:00:13 Dirk Hohndel wrote: >> Nope. Xcode 4 uses clang and throws up with c++11 >> >> And I need XCode 4 to build working binaries. We've been down this rat hole >> before. I'm not

Re: [PULL REQUEST] warning fixes

2015-11-08 Thread Lubomir I. Ivanov
On 8 November 2015 at 08:24, Dirk Hohndel wrote: > On Sun, Nov 08, 2015 at 12:00:47AM +0200, Lubomir I. Ivanov wrote: >> some general cleanup of warnings. >> >> i always check for #ifdefs before removing an unused variable, but please >> let me know if i messed up somewhere or

Re: [PATH] fix broken mac build on old clangs.

2015-11-08 Thread Thiago Macieira
On Sunday 08 November 2015 21:02:53 Dirk Hohndel wrote: > /Users/hohndel/Qt/5.5/clang_64/lib/QtCore.framework/Headers/qstring.h:739:5 > 5: error: no type named 'u16string' in namespace 'std' Option -stdlib=libc++ to clang should fix this. >

Re: [PATH] fix broken mac build on old clangs.

2015-11-08 Thread Dirk Hohndel
> On Nov 8, 2015, at 10:41 PM, Thiago Macieira wrote: > > Can you try adding the -stdlib option in the AppleClang branch to see what > happens? I have an odd question. Why? What we have in master works. I have no interest in seeing Subsurface code made unreadable by

Re: [PATH] fix broken mac build on old clangs.

2015-11-08 Thread Thiago Macieira
On Sunday 08 November 2015 20:00:13 Dirk Hohndel wrote: > Nope. Xcode 4 uses clang and throws up with c++11 > > And I need XCode 4 to build working binaries. We've been down this rat hole > before. I'm not switching compilers. Xcode 4.6 comes with a Clang based on the 3.2 branch of LLVM and

[PATCH] Enable BT compilation earlier

2015-11-08 Thread Miika Turkia
Commit ba55c603953bb530de2fe97fa46098d8c87e6aa5 broke Bluetooth support for me. This patch moves the setting of BT_SUPPORT earlier, re-enabling BT download option on the download dialog. Signed-off-by: Miika Turkia --- CMakeLists.txt | 8 1 file changed, 4