From 291a39a7983f34d2794ac45a466a76f6eb65f584 Mon Sep 17 00:00:00 2001
From: Nodir Temirkhodjaev <nodir.temir@gmail.com>
Date: Thu, 26 Oct 2017 09:34:52 +0500
Subject: [PATCH] UI: Rename activityLog/ to log/.

---
 src/ui/FortFirewall.pro                   | 8 ++++----
 src/ui/driver/drivermanager.cpp           | 4 ++--
 src/ui/driver/driverworker.cpp            | 2 +-
 src/ui/fortmanager.cpp                    | 4 ++--
 src/ui/{activityLog => log}/logbuffer.cpp | 0
 src/ui/{activityLog => log}/logbuffer.h   | 0
 src/ui/{activityLog => log}/logentry.cpp  | 0
 src/ui/{activityLog => log}/logentry.h    | 0
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename src/ui/{activityLog => log}/logbuffer.cpp (100%)
 rename src/ui/{activityLog => log}/logbuffer.h (100%)
 rename src/ui/{activityLog => log}/logentry.cpp (100%)
 rename src/ui/{activityLog => log}/logentry.h (100%)

diff --git a/src/ui/FortFirewall.pro b/src/ui/FortFirewall.pro
index 1735e3e1..e7283926 100644
--- a/src/ui/FortFirewall.pro
+++ b/src/ui/FortFirewall.pro
@@ -7,8 +7,8 @@ TEMPLATE = app
 
 SOURCES += \
     main.cpp \
-    activityLog/logbuffer.cpp \
-    activityLog/logentry.cpp \
+    log/logbuffer.cpp \
+    log/logentry.cpp \
     conf/addressgroup.cpp \
     conf/appgroup.cpp \
     conf/firewallconf.cpp \
@@ -36,8 +36,8 @@ SOURCES += \
     util/stringutil.cpp
 
 HEADERS += \
-    activityLog/logbuffer.h \
-    activityLog/logentry.h \
+    log/logbuffer.h \
+    log/logentry.h \
     conf/addressgroup.h \
     conf/appgroup.h \
     conf/firewallconf.h \
diff --git a/src/ui/driver/drivermanager.cpp b/src/ui/driver/drivermanager.cpp
index e1276649..64abb230 100644
--- a/src/ui/driver/drivermanager.cpp
+++ b/src/ui/driver/drivermanager.cpp
@@ -2,10 +2,10 @@
 
 #include <QThread>
 
-#include "../activityLog/logbuffer.h"
-#include "../activityLog/logentry.h"
 #include "../fortcommon.h"
 #include "../conf/firewallconf.h"
+#include "../log/logbuffer.h"
+#include "../log/logentry.h"
 #include "../util/confutil.h"
 #include "../util/device.h"
 #include "driverworker.h"
diff --git a/src/ui/driver/driverworker.cpp b/src/ui/driver/driverworker.cpp
index 1338a8cc..99edbaa9 100644
--- a/src/ui/driver/driverworker.cpp
+++ b/src/ui/driver/driverworker.cpp
@@ -1,7 +1,7 @@
 #include "driverworker.h"
 
-#include "../activityLog/logbuffer.h"
 #include "../fortcommon.h"
+#include "../log/logbuffer.h"
 #include "../util/device.h"
 
 DriverWorker::DriverWorker(Device *device, QObject *parent) :
diff --git a/src/ui/fortmanager.cpp b/src/ui/fortmanager.cpp
index 6d66ff27..83a4aa90 100644
--- a/src/ui/fortmanager.cpp
+++ b/src/ui/fortmanager.cpp
@@ -9,13 +9,13 @@
 #include <QTimer>
 #include <QWindow>
 
-#include "activityLog/logbuffer.h"
-#include "activityLog/logentry.h"
 #include "conf/addressgroup.h"
 #include "conf/appgroup.h"
 #include "conf/firewallconf.h"
 #include "driver/drivermanager.h"
 #include "fortsettings.h"
+#include "log/logbuffer.h"
+#include "log/logentry.h"
 #include "task/taskinfo.h"
 #include "task/taskmanager.h"
 #include "translationmanager.h"
diff --git a/src/ui/activityLog/logbuffer.cpp b/src/ui/log/logbuffer.cpp
similarity index 100%
rename from src/ui/activityLog/logbuffer.cpp
rename to src/ui/log/logbuffer.cpp
diff --git a/src/ui/activityLog/logbuffer.h b/src/ui/log/logbuffer.h
similarity index 100%
rename from src/ui/activityLog/logbuffer.h
rename to src/ui/log/logbuffer.h
diff --git a/src/ui/activityLog/logentry.cpp b/src/ui/log/logentry.cpp
similarity index 100%
rename from src/ui/activityLog/logentry.cpp
rename to src/ui/log/logentry.cpp
diff --git a/src/ui/activityLog/logentry.h b/src/ui/log/logentry.h
similarity index 100%
rename from src/ui/activityLog/logentry.h
rename to src/ui/log/logentry.h