summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@ubuntu.com>2011-12-07 12:02:05 -0800
committerChase Douglas <chase.douglas@ubuntu.com>2011-12-07 12:02:05 -0800
commit723704879e551b971e1e3504be7338e371d4981d (patch)
tree7921304b8687553a58601873cc5aa8d6a699e250
parent2a3c526f6f6d1e32a4f51bef557a26520fe01ef7 (diff)
Rename Process::pid() to Process::Pid() to follow naming conventions
-rw-r--r--include/xorg/gtest/process.h3
-rw-r--r--src/environment.cpp2
-rw-r--r--src/process.cpp2
3 files changed, 4 insertions, 3 deletions
diff --git a/include/xorg/gtest/process.h b/include/xorg/gtest/process.h
index fd3259c..b345547 100644
--- a/include/xorg/gtest/process.h
+++ b/include/xorg/gtest/process.h
@@ -51,7 +51,8 @@ class Process {
DONT_OVERWRITE_EXISTING_VALUE);
const char * GetEnv(const char* name);
- pid_t pid() const;
+ pid_t Pid() const;
+
private:
// Disable copy c'tor, assignment operator
Process(const Process&);
diff --git a/src/environment.cpp b/src/environment.cpp
index 05e372c..14e3310 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -69,7 +69,7 @@ void xorg::testing::Environment::SetUp() {
int status;
int pid = d_->process.Wait(&status, WNOHANG);
- if (pid == d_->process.pid()) {
+ if (pid == d_->process.Pid()) {
throw std::runtime_error("Dummy X server failed to start, did you run as "
"root?");
} else if (pid == 0) {
diff --git a/src/process.cpp b/src/process.cpp
index f4cb54f..e964de3 100644
--- a/src/process.cpp
+++ b/src/process.cpp
@@ -129,6 +129,6 @@ const char* xorg::testing::Process::GetEnv(const char* name) {
return getenv(name);
}
-pid_t xorg::testing::Process::pid() const {
+pid_t xorg::testing::Process::Pid() const {
return d_->pid;
}