Re: 2.2

[Kornel Benko]

Am Freitag, 15. Mai 2015 um 16:31:05, schrieb Stephan Witt <st.w...@gmx.net>
> Am 15.05.2015 um 15:46 schrieb Stephan Witt <st.w...@gmx.net>:
> 
> > Am 15.05.2015 um 14:49 schrieb Enrico Forestieri <for...@lyx.org>:
> > 
> >> On Fri, May 15, 2015 at 12:04:50PM +0200, Stephan Witt wrote:
> >>> 
> >>> I'll try to get it running on Linux to see how it works there. Meanwhile,
> >>> I'm interested in comments.
> >> 
> >> Please, don't pass back and forth QPixmap objects on the stack. These
> >> are big objects, potentially. Instead, use
> >> 
> >> bool getPixmap(QString const & path, QPixmap & pm)
> >> {
> >>    // deal with QPixmap
> >> 
> >>    return !pm.isNull();
> >> }
> > 
> > Ok, thank you. I'll change it.
> 
> This results in the following patch - if you had something like that in mind 
> I'll
> split it in two patches. The other getPixmap method with QPixmap result was 
> already there.
> 
> Stephan

Compile error with this patch.

cd /usr/BUILD/BuildLyxGitQt5/src/frontends/qt4 && /usr/bin/c++   
-DBOOST_SIGNALS_NO_DEPRECATION_WARNING=1 -DLYX_BUILD_QT_FRONTEND 
-DQT_CONCURRENT_LIB -DQT_CORE_LIB -DQT_GENUINE_STR -DQT_GUI_LIB 
-DQT_WIDGETS_LIB -Wall -Wunused-parameter --std=gnu++11 -fno-strict-aliasing  
-Wall -Wunused-parameter --std=gnu++11 -fno-strict-aliasing -O0 -g3 -D_DEBUG 
-fPIC -I/usr/BUILD/BuildLyxGitQt5 -I/usr/src/lyx/lyx-git/src 
-I/usr/include/enchant -I/usr/src/lyx/lyx-git/boost 
-I/usr/src/lyx/lyx-git/src/frontends -I/usr/src/lyx/lyx-git/src/frontends/qt4 
-I/usr/BUILD/BuildLyxGitQt5/src/frontends/qt4 -isystem 
/usr/BUILD/BuildQt5/5.4/gcc_64/include -isystem 
/usr/BUILD/BuildQt5/5.4/gcc_64/include/QtCore -isystem 
/usr/BUILD/BuildQt5/5.4/gcc_64/mkspecs/linux-g++ -isystem 
/usr/BUILD/BuildQt5/5.4/gcc_64/include/QtGui -isystem 
/usr/BUILD/BuildQt5/5.4/gcc_64/include/QtWidgets -isystem 
/usr/BUILD/BuildQt5/5.4/gcc_64/include/QtConcurrent    
-DBOOST_USER_CONFIG="<config.h>" -o CMakeFiles/frontend_qt.dir/GuiView.cpp.o -c 
/usr/src/lyx/lyx-git/src/frontends/qt4/GuiView.cpp
/usr/src/lyx/lyx-git/src/frontends/qt4/GuiView.cpp: In constructor 
‘lyx::frontend::GuiView::GuiView(int)’:
/usr/src/lyx/lyx-git/src/frontends/qt4/GuiView.cpp:539:77: error: no matching 
function for call to ‘getPixmap(const char [8], const char [4], const char [8])’
  setWindowIcon(QIcon::fromTheme("lyx", getPixmap("images/", "lyx", 
"svg,png")));
                                                                             ^
/usr/src/lyx/lyx-git/src/frontends/qt4/GuiView.cpp:539:77: note: candidates are:
In file included from /usr/src/lyx/lyx-git/src/frontends/qt4/GuiView.cpp:22:0:
/usr/src/lyx/lyx-git/src/frontends/qt4/GuiApplication.h:251:6: note: bool 
lyx::frontend::getPixmap(QPixmap&, const QString&, const QString&, const 
QString&)
 bool getPixmap(QPixmap & pixmap, QString const & path, QString const & name, 
QString const & ext);
      ^
/usr/src/lyx/lyx-git/src/frontends/qt4/GuiApplication.h:251:6: note:   
candidate expects 4 arguments, 3 provided
/usr/src/lyx/lyx-git/src/frontends/qt4/GuiApplication.h:252:6: note: bool 
lyx::frontend::getPixmap(QPixmap&, const QString&)
 bool getPixmap(QPixmap & pixmap, QString const & path);
      ^
/usr/src/lyx/lyx-git/src/frontends/qt4/GuiApplication.h:252:6: note:   
candidate expects 2 arguments, 3 provided
make[2]: *** [src/frontends/qt4/CMakeFiles/frontend_qt.dir/GuiView.cpp.o] Chyba 
1
make[2]: Leaving directory `/usr/BUILD/BuildLyxGitQt5'
make[1]: *** [src/frontends/qt4/CMakeFiles/frontend_qt.dir/all] Chyba 2
make[1]: Leaving directory `/usr/BUILD/BuildLyxGitQt5'

        Kornel

signature.asc
Description: This is a digitally signed message part.