* Re: [Powertop] [PATCH] Move report.cpp and report.h to report/ directory (v4)
@ 2012-10-11 21:55 Chris Ferron
0 siblings, 0 replies; 2+ messages in thread
From: Chris Ferron @ 2012-10-11 21:55 UTC (permalink / raw)
To: powertop
[-- Attachment #1: Type: text/plain, Size: 5293 bytes --]
On 10/11/2012 05:49 AM, Igor Zhbanov wrote:
> Move report.cpp and report.h to report/ directory to other report-related
> files.
> ---
> I hope this is the final version of the patch.
> Never used "git mv" before.
>
> src/Makefile.am | 4 ++--
> src/cpu/cpu.cpp | 2 +-
> src/devices/device.cpp | 2 +-
> src/devlist.cpp | 2 +-
> src/main.cpp | 2 +-
> src/process/do_process.cpp | 2 +-
> src/{ => report}/report.cpp | 2 +-
> src/{ => report}/report.h | 2 +-
> src/tuning/tuning.cpp | 2 +-
> 9 files changed, 10 insertions(+), 10 deletions(-)
> rename src/{ => report}/report.cpp (99%)
> rename src/{ => report}/report.h (97%)
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> index ccf3f0c..4c4a7c0 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -11,10 +11,10 @@ powertop_SOURCES = parameters/persistent.cpp parameters/learn.cpp parameters/par
> parameters/parameters.h display.cpp cpu/cpu_core.cpp cpu/cpudevice.cpp \
> cpu/cpu.cpp cpu/cpu.h cpu/cpu_linux.cpp cpu/abstract_cpu.cpp cpu/intel_cpus.h \
> cpu/cpu_package.cpp cpu/cpudevice.h cpu/intel_cpus.cpp devlist.h devlist.cpp \
> - lib.cpp report.cpp process/process.cpp process/interrupt.h process/timer.h \
> + lib.cpp report/report.cpp process/process.cpp process/interrupt.h process/timer.h \
> process/processdevice.cpp process/powerconsumer.cpp process/work.h \
> process/timer.cpp process/process.h process/work.cpp process/do_process.cpp \
> - process/processdevice.h process/interrupt.cpp process/powerconsumer.h report.h \
> + process/processdevice.h process/interrupt.cpp process/powerconsumer.h report/report.h \
> perf/perf.cpp perf/perf_event.h perf/perf.h perf/perf_bundle.h perf/perf_bundle.cpp \
> display.h devices/rfkill.h devices/i915-gpu.cpp devices/device.cpp devices/alsa.cpp \
> devices/runtime_pm.cpp devices/thinkpad-fan.cpp devices/usb.cpp devices/ahci.cpp \
> diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp
> index 3d260d9..e65d828 100644
> --- a/src/cpu/cpu.cpp
> +++ b/src/cpu/cpu.cpp
> @@ -36,7 +36,7 @@
> #include "../perf/perf_bundle.h"
> #include "../lib.h"
> #include "../display.h"
> -#include "../report.h"
> +#include "../report/report.h"
> #include "../report/report-maker.h"
>
> static class abstract_cpu system_level;
> diff --git a/src/devices/device.cpp b/src/devices/device.cpp
> index 01e37b4..00ec5e6 100644
> --- a/src/devices/device.cpp
> +++ b/src/devices/device.cpp
> @@ -47,7 +47,7 @@ using namespace std;
> #include "../parameters/parameters.h"
> #include "../display.h"
> #include "../lib.h"
> -#include "../report.h"
> +#include "../report/report.h"
> #include "../report/report-maker.h"
> #include "../measurement/measurement.h"
> #include "../devlist.h"
> diff --git a/src/devlist.cpp b/src/devlist.cpp
> index c5d65e6..de5abff 100644
> --- a/src/devlist.cpp
> +++ b/src/devlist.cpp
> @@ -42,7 +42,7 @@ using namespace std;
>
> #include "devlist.h"
> #include "lib.h"
> -#include "report.h"
> +#include "report/report.h"
> #include "report/report-maker.h"
>
> #include "process/process.h"
> diff --git a/src/main.cpp b/src/main.cpp
> index 7971f2b..e1dcb1c 100644
> --- a/src/main.cpp
> +++ b/src/main.cpp
> @@ -56,7 +56,7 @@
>
> #include "display.h"
> #include "devlist.h"
> -#include "report.h"
> +#include "report/report.h"
>
> #define DEBUGFS_MAGIC 0x64626720
>
> diff --git a/src/process/do_process.cpp b/src/process/do_process.cpp
> index 7c61947..8f73083 100644
> --- a/src/process/do_process.cpp
> +++ b/src/process/do_process.cpp
> @@ -28,7 +28,7 @@
> #include "work.h"
> #include "processdevice.h"
> #include "../lib.h"
> -#include "../report.h"
> +#include "../report/report.h"
> #include "../report/report-maker.h"
> #include "../devlist.h"
>
> diff --git a/src/report.cpp b/src/report/report.cpp
> similarity index 99%
> rename from src/report.cpp
> rename to src/report/report.cpp
> index a2000c9..51bc6a7 100644
> --- a/src/report.cpp
> +++ b/src/report/report.cpp
> @@ -26,7 +26,7 @@
>
> #include "lib.h"
> #include "report.h"
> -#include "report/report-maker.h"
> +#include "report-maker.h"
> #include <errno.h>
> #include <string.h>
> #include <utility>
> diff --git a/src/report.h b/src/report/report.h
> similarity index 97%
> rename from src/report.h
> rename to src/report/report.h
> index bf8f6de..77bf2d7 100644
> --- a/src/report.h
> +++ b/src/report/report.h
> @@ -28,7 +28,7 @@
> #include <string>
> #include <stdio.h>
>
> -#include "report/report-maker.h"
> +#include "report-maker.h"
>
> using namespace std;
>
> diff --git a/src/tuning/tuning.cpp b/src/tuning/tuning.cpp
> index 69f0783..ebb4ac8 100644
> --- a/src/tuning/tuning.cpp
> +++ b/src/tuning/tuning.cpp
> @@ -39,7 +39,7 @@
> #include "ethernet.h"
> #include "wifi.h"
> #include "../display.h"
> -#include "../report.h"
> +#include "../report/report.h"
> #include "../report/report-maker.h"
> #include "../lib.h"
>
Your patch has been merged.
Thank You,
-C
^ permalink raw reply [flat|nested] 2+ messages in thread* [Powertop] [PATCH] Move report.cpp and report.h to report/ directory (v4)
@ 2012-10-11 12:49 Igor Zhbanov
0 siblings, 0 replies; 2+ messages in thread
From: Igor Zhbanov @ 2012-10-11 12:49 UTC (permalink / raw)
To: powertop
[-- Attachment #1: Type: text/plain, Size: 4859 bytes --]
Move report.cpp and report.h to report/ directory to other report-related
files.
---
I hope this is the final version of the patch.
Never used "git mv" before.
src/Makefile.am | 4 ++--
src/cpu/cpu.cpp | 2 +-
src/devices/device.cpp | 2 +-
src/devlist.cpp | 2 +-
src/main.cpp | 2 +-
src/process/do_process.cpp | 2 +-
src/{ => report}/report.cpp | 2 +-
src/{ => report}/report.h | 2 +-
src/tuning/tuning.cpp | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
rename src/{ => report}/report.cpp (99%)
rename src/{ => report}/report.h (97%)
diff --git a/src/Makefile.am b/src/Makefile.am
index ccf3f0c..4c4a7c0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,10 +11,10 @@ powertop_SOURCES = parameters/persistent.cpp parameters/learn.cpp parameters/par
parameters/parameters.h display.cpp cpu/cpu_core.cpp cpu/cpudevice.cpp \
cpu/cpu.cpp cpu/cpu.h cpu/cpu_linux.cpp cpu/abstract_cpu.cpp cpu/intel_cpus.h \
cpu/cpu_package.cpp cpu/cpudevice.h cpu/intel_cpus.cpp devlist.h devlist.cpp \
- lib.cpp report.cpp process/process.cpp process/interrupt.h process/timer.h \
+ lib.cpp report/report.cpp process/process.cpp process/interrupt.h process/timer.h \
process/processdevice.cpp process/powerconsumer.cpp process/work.h \
process/timer.cpp process/process.h process/work.cpp process/do_process.cpp \
- process/processdevice.h process/interrupt.cpp process/powerconsumer.h report.h \
+ process/processdevice.h process/interrupt.cpp process/powerconsumer.h report/report.h \
perf/perf.cpp perf/perf_event.h perf/perf.h perf/perf_bundle.h perf/perf_bundle.cpp \
display.h devices/rfkill.h devices/i915-gpu.cpp devices/device.cpp devices/alsa.cpp \
devices/runtime_pm.cpp devices/thinkpad-fan.cpp devices/usb.cpp devices/ahci.cpp \
diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp
index 3d260d9..e65d828 100644
--- a/src/cpu/cpu.cpp
+++ b/src/cpu/cpu.cpp
@@ -36,7 +36,7 @@
#include "../perf/perf_bundle.h"
#include "../lib.h"
#include "../display.h"
-#include "../report.h"
+#include "../report/report.h"
#include "../report/report-maker.h"
static class abstract_cpu system_level;
diff --git a/src/devices/device.cpp b/src/devices/device.cpp
index 01e37b4..00ec5e6 100644
--- a/src/devices/device.cpp
+++ b/src/devices/device.cpp
@@ -47,7 +47,7 @@ using namespace std;
#include "../parameters/parameters.h"
#include "../display.h"
#include "../lib.h"
-#include "../report.h"
+#include "../report/report.h"
#include "../report/report-maker.h"
#include "../measurement/measurement.h"
#include "../devlist.h"
diff --git a/src/devlist.cpp b/src/devlist.cpp
index c5d65e6..de5abff 100644
--- a/src/devlist.cpp
+++ b/src/devlist.cpp
@@ -42,7 +42,7 @@ using namespace std;
#include "devlist.h"
#include "lib.h"
-#include "report.h"
+#include "report/report.h"
#include "report/report-maker.h"
#include "process/process.h"
diff --git a/src/main.cpp b/src/main.cpp
index 7971f2b..e1dcb1c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -56,7 +56,7 @@
#include "display.h"
#include "devlist.h"
-#include "report.h"
+#include "report/report.h"
#define DEBUGFS_MAGIC 0x64626720
diff --git a/src/process/do_process.cpp b/src/process/do_process.cpp
index 7c61947..8f73083 100644
--- a/src/process/do_process.cpp
+++ b/src/process/do_process.cpp
@@ -28,7 +28,7 @@
#include "work.h"
#include "processdevice.h"
#include "../lib.h"
-#include "../report.h"
+#include "../report/report.h"
#include "../report/report-maker.h"
#include "../devlist.h"
diff --git a/src/report.cpp b/src/report/report.cpp
similarity index 99%
rename from src/report.cpp
rename to src/report/report.cpp
index a2000c9..51bc6a7 100644
--- a/src/report.cpp
+++ b/src/report/report.cpp
@@ -26,7 +26,7 @@
#include "lib.h"
#include "report.h"
-#include "report/report-maker.h"
+#include "report-maker.h"
#include <errno.h>
#include <string.h>
#include <utility>
diff --git a/src/report.h b/src/report/report.h
similarity index 97%
rename from src/report.h
rename to src/report/report.h
index bf8f6de..77bf2d7 100644
--- a/src/report.h
+++ b/src/report/report.h
@@ -28,7 +28,7 @@
#include <string>
#include <stdio.h>
-#include "report/report-maker.h"
+#include "report-maker.h"
using namespace std;
diff --git a/src/tuning/tuning.cpp b/src/tuning/tuning.cpp
index 69f0783..ebb4ac8 100644
--- a/src/tuning/tuning.cpp
+++ b/src/tuning/tuning.cpp
@@ -39,7 +39,7 @@
#include "ethernet.h"
#include "wifi.h"
#include "../display.h"
-#include "../report.h"
+#include "../report/report.h"
#include "../report/report-maker.h"
#include "../lib.h"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-10-11 21:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-11 21:55 [Powertop] [PATCH] Move report.cpp and report.h to report/ directory (v4) Chris Ferron
-- strict thread matches above, loose matches on Subject: below --
2012-10-11 12:49 Igor Zhbanov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.