diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
commit | c48e769eb275917717e2b55eb869f7e559293ac8 (patch) | |
tree | 8f650b907e21c918b826f854dbe1c8174cc2c0c6 /kopete/libkopete/tests | |
parent | 8011d84f483f3628f3f04ea5cb2c1c3c86b2dba7 (diff) | |
download | tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.tar.gz tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kopete/libkopete/tests')
-rw-r--r-- | kopete/libkopete/tests/kopeteemoticontest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp index 08910d46..83c0e64c 100644 --- a/kopete/libkopete/tests/kopeteemoticontest.cpp +++ b/kopete/libkopete/tests/kopeteemoticontest.cpp @@ -94,7 +94,7 @@ void KopeteEmoticonTest::testEmoticonParser() inputFile.close(); expectedFile.close(); - TQString path = KGlobal::dirs()->findResource( "emoticons", "Default/smile.png" ).replace( "smile.png", TQString() ); + TQString path = TDEGlobal::dirs()->findResource( "emoticons", "Default/smile.png" ).replace( "smile.png", TQString() ); Kopete::Emoticons::self(); TQString result = emo.parse( inputData ).replace( path, TQString() ); |