fix compliation warnings

Author: proton

.gitignore

@@ -4,5 +4,6 @@ znotes.pro.user
 translations/*.qm
 build
 Makefile
+.qmake.stash
 znotes
 TODO

main.cpp

@@ -8,8 +8,10 @@ int main(int argc, char **argv)
 
 	settings.load();
     // if another copy is starts
-    if(app.isRunning() && settings.getSingleInstance())
-        return !app.sendMessage("proton is our god!");
+    if(app.isRunning() && settings.getSingleInstance()) {
+        return !app.sendMessage("Only one instance is allowed");
+    }
+
 	app.setQuitOnLastWindowClosed(false);
 
     MainWindow w;

mainwindow.cpp

@@ -168,8 +168,9 @@ MainWindow::~MainWindow()
     // saving notes
     notes->saveAll();
     // saving title of last note
-    if(notes->current())
+    if(notes->current()) {
         settings.setLastNote(notes->current()->fileName());
+    }
     // saving dialog's params
     settings.setDialogGeometry(saveGeometry());
     settings.setDialogState(saveState());
@@ -369,8 +370,9 @@ void MainWindow::hideEvent(QHideEvent* event)
 	settings.setDialogGeometry(saveGeometry());
 	actShow->setEnabled(true);
 	actHide->setDisabled(true);
-    if(notes->current())
+    if(notes->current()) {
         notes->saveAll();
+    }
 
 	if(note_create_widget && note_create_widget->isVisible())
 	{

notelist.cpp

@@ -170,10 +170,11 @@ void NoteList::registerType(Note::Type id,
 
 void NoteList::scanForNewFiles()
 {
-    if (settings.getShowHidden())
+    if (settings.getShowHidden()) {
         dir.setFilter(QDir::Files | QDir::Hidden | QDir::Readable);
-    else
+    } else {
         dir.setFilter(QDir::Files | QDir::Readable);
+    }
 	dir.refresh();
 	QFileInfoList flist = dir.entryInfoList();
     for (int i = 0; i < flist.size(); ++i)
@@ -246,8 +247,9 @@ Note* NoteList::add(const QFileInfo& fileinfo, bool set_current)
 	vec.append(note);
 	tabs->addTab(note->widget(), note->title());
 	notes_filenames.insert(fileinfo.fileName());
-    if (set_current)
+    if (set_current) {
         tabs->setCurrentWidget(note->widget());
+    }
 	return note;
 }
 
@@ -361,11 +363,12 @@ void NoteList::currentTabChanged(int index)
 {
     if (index==-1)
         return;
-    if (current_index != -1)
+    if (current_index != -1) {
         if(current()) {
             current()->save();
             tabs->currentWidget()->setFocus();
         }
+    }
 	int old_index = current_index;
 	current_index = index;
 	const QString path = vec[current_index]->absolutePath();

scriptmodel.cpp

@@ -15,25 +15,19 @@ void ScriptModel::append(const QString& name, const QString& file, const QString
 	setData(index(r, 2), icon);
 }
 
-QVariant ScriptModel::headerData ( int section, Qt::Orientation orientation, int role) const
-{
-	switch(role)
-	{
-		case Qt::DisplayRole:
-		{
-			switch(orientation)
-			{
-				case Qt::Horizontal:
-				{
-					switch(section)
-					{
-					case 0: return QObject::tr("Name");
-					case 1: return QObject::tr("File");
-					case 2: return QObject::tr("Icon");
-					default: return QVariant();
+QVariant ScriptModel::headerData ( int section, Qt::Orientation orientation, int role) const {
+    switch(role) {
+        case Qt::DisplayRole: {
+            switch(orientation) {
+                case Qt::Horizontal: {
+                    switch(section) {
+                        case 0: return QObject::tr("Name");
+                        case 1: return QObject::tr("File");
+                        case 2: return QObject::tr("Icon");
+                        default: return QVariant();
 					}
 				}
-				case Qt::Vertical: return QString::number(section);
+                default: return QString::number(section);
 			}
 		}
 		default: return QVariant();

settings.cpp

@@ -91,7 +91,7 @@ void Settings::load()
 	if(!mydocuments_path.isEmpty()) notes_path = mydocuments_path+"/Notes";
 	else if(!QDir::homePath().isEmpty()) notes_path = QDir::homePath()+"/Notes";
 #else
-	if(!QDir::homePath().isEmpty()) notes_path = QDir::homePath()+"\Notes";
+    if(!QDir::homePath().isEmpty()) notes_path = QDir::homePath()+"\\Notes";
 #endif
 		config.setValue("NotesPath", notes_path);
 	}
@@ -514,15 +514,19 @@ void Settings::setToolbarItems(const QVector<int>& v)
     if (v == tb_items)
         return;
     // Remove old settings
-    for (int i = 0; i < tb_items.size(); ++i)
-        if(tb_items[i] != itemSeparator)
+    for (int i = 0; i < tb_items.size(); ++i) {
+        if(tb_items[i] != itemSeparator) {
             config.remove(ToolbarAction(item_enum(tb_items[i])).pref_name()); //dirty hack =(
 	tb_items = v;
+        }
+    }
     // Save settings
 	config.setValue("Toolbar/itemCount", tb_items.size());
-    for (int i = 0; i < tb_items.size(); ++i)
-        if(tb_items[i] != itemSeparator)
+    for (int i = 0; i < tb_items.size(); ++i) {
+        if(tb_items[i] != itemSeparator) {
             config.setValue(ToolbarAction(item_enum(tb_items[i])).pref_name(), i);
+        }
+    }
 
     emit ToolbarItemsChanged();
 }

textnote.cpp

@@ -40,11 +40,13 @@ void TextNote::load()
 // Saving note
 void TextNote::save(bool forced)
 {
-    if (!(content_changed || forced))
+    if (!(content_changed || forced)) {
         return; //If file doesn't need in saving, exiting from function
+    }
 	file.close();
-    if(!file.open(QFile::WriteOnly | QFile::Text))
+    if(!file.open(QFile::WriteOnly | QFile::Text)) {
         return;
+    }
 	QTextStream out(&file);
 	out << text_edit->toPlainText();
 	file.close();