summaryrefslogtreecommitdiffstats
path: root/ktalkd/ktalkdlg/ktalkdlg.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-20 00:22:10 -0600
committerTimothy Pearson <[email protected]>2013-01-20 00:22:10 -0600
commit3e4d718796cddcc798d9f737037ef4bad540a0af (patch)
tree69d0aaad3f8f46c1dbb4939b7fcda8e7de12c481 /ktalkd/ktalkdlg/ktalkdlg.cpp
parent50d6569cdef5f0aac099f5d01864bd0e14f82ae3 (diff)
downloadtdenetwork-3e4d718796cddcc798d9f737037ef4bad540a0af.tar.gz
tdenetwork-3e4d718796cddcc798d9f737037ef4bad540a0af.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'ktalkd/ktalkdlg/ktalkdlg.cpp')
-rw-r--r--ktalkd/ktalkdlg/ktalkdlg.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/ktalkd/ktalkdlg/ktalkdlg.cpp b/ktalkd/ktalkdlg/ktalkdlg.cpp
index 03bd0670..a1e1338c 100644
--- a/ktalkd/ktalkdlg/ktalkdlg.cpp
+++ b/ktalkd/ktalkdlg/ktalkdlg.cpp
@@ -77,7 +77,7 @@ int main (int argc, char **argv)
TDECmdLineArgs::init(argc, argv, "ktalkdlg", description, version );
TDECmdLineArgs::addCmdLineOptions( option );
KLocale::setMainCatalogue( "kcmktalkd" );
- KApplication a;
+ TDEApplication a;
struct timeval clock;
struct timezone zone;