summaryrefslogtreecommitdiffstats
path: root/kexi/tests
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:23:24 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:23:24 -0600
commit5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch)
treefb31321c80b12ee8e2237bdcf8c228fe44e67772 /kexi/tests
parentfe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff)
downloadkoffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz
koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kexi/tests')
-rw-r--r--kexi/tests/newapi/main.cpp2
-rw-r--r--kexi/tests/tableview/main.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/kexi/tests/newapi/main.cpp b/kexi/tests/newapi/main.cpp
index 95e2c0b3..fce63501 100644
--- a/kexi/tests/newapi/main.cpp
+++ b/kexi/tests/newapi/main.cpp
@@ -159,7 +159,7 @@ int main(int argc, char** argv)
if (gui) {
app = new TDEApplication(true, true);
instance = app;
- KGlobal::iconLoader()->addAppDir("kexi");
+ TDEGlobal::iconLoader()->addAppDir("kexi");
}
else {
instance = new TDEInstance(prgname);
diff --git a/kexi/tests/tableview/main.cpp b/kexi/tests/tableview/main.cpp
index 88121b57..9e9b87c5 100644
--- a/kexi/tests/tableview/main.cpp
+++ b/kexi/tests/tableview/main.cpp
@@ -32,7 +32,7 @@
int main(int argc, char* argv[])
{
TDEApplication app(argc, argv, "tv_test");
- KGlobal::iconLoader()->addAppDir("kexi");
+ TDEGlobal::iconLoader()->addAppDir("kexi");
KexiTableView tv;