summaryrefslogtreecommitdiffstats
path: root/kcoloredit/kcoloreditdoc.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:19:40 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:19:40 -0600
commit74f47aebb77b4744bf18960b81c3744106cf56e0 (patch)
tree98f808be7ee64f341ba893cfc4fc6a2db7ed5092 /kcoloredit/kcoloreditdoc.cpp
parentc705f8f0619865875d6247d9470dced55241bc79 (diff)
downloadtdegraphics-74f47aebb77b4744bf18960b81c3744106cf56e0.tar.gz
tdegraphics-74f47aebb77b4744bf18960b81c3744106cf56e0.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kcoloredit/kcoloreditdoc.cpp')
-rw-r--r--kcoloredit/kcoloreditdoc.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kcoloredit/kcoloreditdoc.cpp b/kcoloredit/kcoloreditdoc.cpp
index 954d64a3..b5823b1b 100644
--- a/kcoloredit/kcoloreditdoc.cpp
+++ b/kcoloredit/kcoloreditdoc.cpp
@@ -235,7 +235,7 @@ void KColorEditDoc::copyToClipboard(Palette& palette) {
TQString text;
TQTextOStream stream(&text);
palette.save(stream, 0, false);
- KApplication::clipboard()->setText(text);
+ TDEApplication::clipboard()->setText(text);
emit clipboardChanged();
}
@@ -260,7 +260,7 @@ void KColorEditDoc::paste() {
Palette palettePaste;
TQString text;
TQTextIStream stream(&text);
- text = KApplication::clipboard()->text();
+ text = TDEApplication::clipboard()->text();
if(palettePaste.load( stream, false )) {
m_paletteHistory.paste(paletteCursorPos(), palettePaste);
setPaletteSelection(paletteCursorPos(), paletteCursorPos() +