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 /kio/kfile/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 'kio/kfile/tests')
| -rw-r--r-- | kio/kfile/tests/kfiletreeviewtest.cpp | 2 | ||||
| -rw-r--r-- | kio/kfile/tests/kfstest.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kio/kfile/tests/kfiletreeviewtest.cpp b/kio/kfile/tests/kfiletreeviewtest.cpp index e131bda3a..cf28557f8 100644 --- a/kio/kfile/tests/kfiletreeviewtest.cpp +++ b/kio/kfile/tests/kfiletreeviewtest.cpp @@ -66,7 +66,7 @@ void testFrame::showPath( const KURL &url ) { TQString fname = "TestBranch"; // url.fileName (); /* try a user icon */ - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); TQPixmap pix = loader->loadIcon( "contents2", KIcon::Small ); TQPixmap pixOpen = loader->loadIcon( "contents", KIcon::Small ); diff --git a/kio/kfile/tests/kfstest.cpp b/kio/kfile/tests/kfstest.cpp index f85995a61..b0ecabcc6 100644 --- a/kio/kfile/tests/kfstest.cpp +++ b/kio/kfile/tests/kfstest.cpp @@ -57,7 +57,7 @@ int main(int argc, char **argv) if (argv1 == TQString::fromLatin1("diroperator")) { KDirOperator *op = new KDirOperator(startDir, 0, "operator"); - op->setViewConfig( KGlobal::config(), "TestGroup" ); + op->setViewConfig( TDEGlobal::config(), "TestGroup" ); op->setView(KFile::Simple); op->show(); a.setMainWidget(op); |