From 51d626185dd74d76eadcd1a423189e366920396b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Sun, 25 Sep 2022 12:44:38 +0800 Subject: Rename namespace to QInterchange to prevent ambiguity --- admin.cxx | 2 +- catalog.cxx | 2 +- interchange.cxx | 2 +- interchange.hxx | 2 +- interchange/admin.hxx | 2 +- interchange/catalog.hxx | 2 +- interchange/member.hxx | 2 +- interchange/ord.hxx | 2 +- interchange/product.hxx | 2 +- member.cxx | 2 +- ord.cxx | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/admin.cxx b/admin.cxx index 48e64a1..263c658 100644 --- a/admin.cxx +++ b/admin.cxx @@ -2,7 +2,7 @@ #include #include "interchange/admin.hxx" -namespace Interchange { +namespace QInterchange { static char *unCopy, *pwCopy; diff --git a/catalog.cxx b/catalog.cxx index 244544c..b971525 100644 --- a/catalog.cxx +++ b/catalog.cxx @@ -1,7 +1,7 @@ #include #include "interchange/catalog.hxx" -namespace Interchange { +namespace QInterchange { Catalog::Catalog(struct interchange_catalog* catalog, QObject* parent) : QAbstractListModel{parent}, diff --git a/interchange.cxx b/interchange.cxx index 6886ba9..5a574e0 100644 --- a/interchange.cxx +++ b/interchange.cxx @@ -1,7 +1,7 @@ #include "interchange.hxx" #include "interchange/ord.hxx" -namespace Interchange { +namespace QInterchange { static Interchange* interchange; diff --git a/interchange.hxx b/interchange.hxx index e25a32c..37b7f5f 100644 --- a/interchange.hxx +++ b/interchange.hxx @@ -4,7 +4,7 @@ #include #include "interchange/catalog.hxx" -namespace Interchange { +namespace QInterchange { class Ord; diff --git a/interchange/admin.hxx b/interchange/admin.hxx index 3a800ac..34597c2 100644 --- a/interchange/admin.hxx +++ b/interchange/admin.hxx @@ -6,7 +6,7 @@ struct interchange_admin; -namespace Interchange { +namespace QInterchange { class Admin : public QObject { diff --git a/interchange/catalog.hxx b/interchange/catalog.hxx index 8946113..8204d6b 100644 --- a/interchange/catalog.hxx +++ b/interchange/catalog.hxx @@ -6,7 +6,7 @@ struct interchange_catalog; -namespace Interchange { +namespace QInterchange { class Catalog : public QAbstractListModel { diff --git a/interchange/member.hxx b/interchange/member.hxx index d4b1836..bd569c6 100644 --- a/interchange/member.hxx +++ b/interchange/member.hxx @@ -6,7 +6,7 @@ struct interchange_member; -namespace Interchange { +namespace QInterchange { class Member : public QObject { diff --git a/interchange/ord.hxx b/interchange/ord.hxx index afe77cc..5b14d96 100644 --- a/interchange/ord.hxx +++ b/interchange/ord.hxx @@ -6,7 +6,7 @@ #include "member.hxx" #include "product.hxx" -namespace Interchange { +namespace QInterchange { struct Item { diff --git a/interchange/product.hxx b/interchange/product.hxx index a7f3587..483ee42 100644 --- a/interchange/product.hxx +++ b/interchange/product.hxx @@ -3,7 +3,7 @@ #include -namespace Interchange { +namespace QInterchange { struct Product { diff --git a/member.cxx b/member.cxx index 6b11d53..ee05be8 100644 --- a/member.cxx +++ b/member.cxx @@ -2,7 +2,7 @@ #include #include "interchange/member.hxx" -namespace Interchange { +namespace QInterchange { static char *unCopy, *pwCopy; diff --git a/ord.cxx b/ord.cxx index 1c103e8..8d76dce 100644 --- a/ord.cxx +++ b/ord.cxx @@ -2,7 +2,7 @@ #include #include "interchange/ord.hxx" -namespace Interchange { +namespace QInterchange { int Ord::rowCount(QModelIndex const& parent) const { -- cgit v1.2.3