Merge branch 'master' of github.com:Sankore/Sankore-3.1

src/core/UBApplication.cpp

@@ -268,11 +268,6 @@ int UBApplication::exec(const QString& pFileToImport)
     connect(mainWindow->actionCopy, SIGNAL(triggered()), applicationController, SLOT(actionCopy()));
     connect(mainWindow->actionPaste, SIGNAL(triggered()), applicationController, SLOT(actionPaste()));
 
-//#ifndef __ppc__
-//    // this cause a problem on MACX/PPC (see https://trac.assembla.com/uniboard/ticket/862)
-//    installEventFilter(new UBIdleTimer(this));
-//#endif
-
     applicationController->initScreenLayout();
     boardController->setupLayout();
 

src/core/UBPreferencesController.cpp

@@ -65,7 +65,6 @@ UBPreferencesController::UBPreferencesController(QWidget *parent)
     , mMarkerProperties(0)
 {
     mPreferencesWindow = new UBPreferencesDialog(this,parent, Qt::Dialog);
-    //    mPreferencesWindow = new QDialog(parent, Qt::Dialog);
     mPreferencesUI = new Ui::preferencesDialog();  // deleted in
     mPreferencesUI->setupUi(mPreferencesWindow);
     connect(mPreferencesUI->Username_textBox, SIGNAL(editingFinished()), this, SLOT(onCommunityUsernameChanged()));