From 835ab042ea6fd56e4c1a0fceb81c51cc30431ee0 Mon Sep 17 00:00:00 2001 From: Sagi Dayan Date: Mon, 22 Sep 2014 18:39:16 +0300 Subject: [PATCH] Fixing Compiler errors from lirans merge --- main/CalendarTab/CalendarManager.h | 2 +- src/jceData/CSV/csv_exporter.h | 2 +- src/jceData/Calendar/{calendardialog.cpp => calendarDialog.cpp} | 2 +- src/jceData/Calendar/{calendardialog.h => calendarDialog.h} | 0 src/jceData/Calendar/{calendardialog.ui => calendarDialog.ui} | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename src/jceData/Calendar/{calendardialog.cpp => calendarDialog.cpp} (94%) rename src/jceData/Calendar/{calendardialog.h => calendarDialog.h} (100%) rename src/jceData/Calendar/{calendardialog.ui => calendarDialog.ui} (100%) diff --git a/main/CalendarTab/CalendarManager.h b/main/CalendarTab/CalendarManager.h index 766fff3..98ba20a 100644 --- a/main/CalendarTab/CalendarManager.h +++ b/main/CalendarTab/CalendarManager.h @@ -4,7 +4,7 @@ #include "./src/jceData/Calendar/calendarPage.h" #include "./src/jceData/Calendar/calendarSchedule.h" #include "./src/jceData/CSV/csv_exporter.h" -#include "./src/jceData/Calendar/calendardialog.h" +#include "./src/jceData/Calendar/calendarDialog.h" #include #include diff --git a/src/jceData/CSV/csv_exporter.h b/src/jceData/CSV/csv_exporter.h index d17246d..c6c73e3 100644 --- a/src/jceData/CSV/csv_exporter.h +++ b/src/jceData/CSV/csv_exporter.h @@ -9,7 +9,7 @@ #include #include "../Calendar/calendarSchedule.h" -#include "../Calendar/calendardialog.h" +#include "../Calendar/calendarDialog.h" #define CSV_CALENDAR_HEADER "Subject,Start Date,Start Time,End Date,End Time,Description,Location" diff --git a/src/jceData/Calendar/calendardialog.cpp b/src/jceData/Calendar/calendarDialog.cpp similarity index 94% rename from src/jceData/Calendar/calendardialog.cpp rename to src/jceData/Calendar/calendarDialog.cpp index fb17d3a..3d8eb2e 100644 --- a/src/jceData/Calendar/calendardialog.cpp +++ b/src/jceData/Calendar/calendarDialog.cpp @@ -1,5 +1,5 @@ #include "calendarDialog.h" -#include "ui_calenDardialog.h" +#include "ui_calendardialog.h" CalendarDialog::CalendarDialog(QWidget *parent) : diff --git a/src/jceData/Calendar/calendardialog.h b/src/jceData/Calendar/calendarDialog.h similarity index 100% rename from src/jceData/Calendar/calendardialog.h rename to src/jceData/Calendar/calendarDialog.h diff --git a/src/jceData/Calendar/calendardialog.ui b/src/jceData/Calendar/calendarDialog.ui similarity index 100% rename from src/jceData/Calendar/calendardialog.ui rename to src/jceData/Calendar/calendarDialog.ui