diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
tree | 7b7a01768b3781763186c825af21bb14717d2c32 /kparts/tests | |
parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kparts/tests')
-rw-r--r-- | kparts/tests/example.cpp | 2 | ||||
-rw-r--r-- | kparts/tests/normalktm.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kparts/tests/example.cpp b/kparts/tests/example.cpp index 3675781ea..4628e8ca7 100644 --- a/kparts/tests/example.cpp +++ b/kparts/tests/example.cpp @@ -63,7 +63,7 @@ Shell::~Shell() void Shell::slotFileOpen() { - if ( ! m_part1->openURL( locate("data", KGlobal::instance()->instanceName()+"/kpartstest_shell.rc" ) ) ) + if ( ! m_part1->openURL( locate("data", TDEGlobal::instance()->instanceName()+"/kpartstest_shell.rc" ) ) ) KMessageBox::error(this,"Couldn't open file !"); } diff --git a/kparts/tests/normalktm.cpp b/kparts/tests/normalktm.cpp index 82c464a5a..913686bf9 100644 --- a/kparts/tests/normalktm.cpp +++ b/kparts/tests/normalktm.cpp @@ -61,7 +61,7 @@ Shell::~Shell() void Shell::slotFileOpen() { - if ( ! m_part1->openURL( locate("data", KGlobal::instance()->instanceName()+"/kpartstest_shell.rc" ) ) ) + if ( ! m_part1->openURL( locate("data", TDEGlobal::instance()->instanceName()+"/kpartstest_shell.rc" ) ) ) KMessageBox::error(this,"Couldn't open file !"); } |