Fixed some Travis warnings

And added `-Wall` to Travis to see more
presentation
MarPiRK 11 years ago
parent ec25822c63
commit 2d85e6a00e
  1. 2
      .travis.yml
  2. 2
      CMakeLists.txt
  3. 4
      src/control/Control.cpp
  4. 2
      src/control/XournalMain.cpp
  5. 2
      src/util/i18n.h

@ -39,6 +39,6 @@ before_script:
- "cd build"
script:
- "cmake .. -DBUILD_POPPLER=ON -DEXT_GLIBMM=ON -DCMAKE_DEBUG_INCLUDES_LDFLAGS=ON -DENABLE_MATHTEX=ON -DENABLE_OS=ON -DENABLE_CPPUNIT=ON -DUNSTABLE_LAYERS_SIDEBAR=ON"
- "cmake .. -DBUILD_POPPLER=ON -DEXT_GLIBMM=ON -DCMAKE_DEBUG_INCLUDES_LDFLAGS=ON -DENABLE_MATHTEX=ON -DENABLE_OS=ON -DENABLE_CPPUNIT=ON -DUNSTABLE_LAYERS_SIDEBAR=ON -DDEBUG_COMPILE=ON"
- "make"
- "make test"

@ -226,7 +226,7 @@ set (DEV_SETTINGS_XML_FILE "settings.xml" CACHE STRING "Settings file name")
set (DEV_PRINT_CONFIG_FILE "print-config.ini" CACHE STRING "Print config file name")
set (DEV_METADATA_FILE "metadata.ini" CACHE STRING "Metadata file name")
set (DEV_METADATA_MAX_ITEMS 50 CACHE STRING "Maximal amount of metadata elements")
set (DEV_ERRORLOG_DIR "" CACHE STRING "Directory where errorlogfiles will be placed")
set (DEV_ERRORLOG_DIR "errorlogs" CACHE STRING "Directory where errorlogfiles will be placed")
option (DEV_ENABLE_GCOV "Build with gcov support" OFF) # Enabel gcov support expanded in src/

@ -2823,7 +2823,7 @@ bool Control::close(bool destroy)
if (undoRedo->isChanged())
{
GtkWidget* dialog = gtk_message_dialog_new((GtkWindow*) *getWindow(), GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s",
_C("This document is not saved yet."));
gtk_dialog_add_button(GTK_DIALOG(dialog), _C("Save"), 1);
@ -2860,7 +2860,7 @@ bool Control::close(bool destroy)
if (!bf::exists(this->doc->getFilename()))
{
GtkWidget* dialog = gtk_message_dialog_new((GtkWindow*) *getWindow(), GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s",
_C("Document file was removed."));
gtk_dialog_add_button(GTK_DIALOG(dialog), _C("Save As"), 1);

@ -93,7 +93,7 @@ void XournalMain::checkForErrorlog()
msg += FS(_F("The most recent log file name: {1}") % errorList[0]);
GtkWidget* dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, msg.c_str());
GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", msg.c_str());
gtk_dialog_add_button(GTK_DIALOG(dialog), _C("Send Bugreport"), 1);
gtk_dialog_add_button(GTK_DIALOG(dialog), _C("Open Logfile"), 2);

@ -21,7 +21,7 @@
#define C_F(context, msg) boost::locale::format(C_(context, msg))
/* Some helpler defines */
/* Some helpler macros */
// boost::locale::format → std::string
#define FS(format) (format).str()

Loading…
Cancel
Save