diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:22:10 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:22:10 -0600 |
| commit | 3e4d718796cddcc798d9f737037ef4bad540a0af (patch) | |
| tree | 69d0aaad3f8f46c1dbb4939b7fcda8e7de12c481 /ktalkd | |
| parent | 50d6569cdef5f0aac099f5d01864bd0e14f82ae3 (diff) | |
| download | tdenetwork-3e4d718796cddcc798d9f737037ef4bad540a0af.tar.gz tdenetwork-3e4d718796cddcc798d9f737037ef4bad540a0af.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'ktalkd')
| -rw-r--r-- | ktalkd/ChangeLog | 2 | ||||
| -rw-r--r-- | ktalkd/ktalkdlg/ktalkdlg.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ktalkd/ChangeLog b/ktalkd/ChangeLog index 23d34b5a..775b08a1 100644 --- a/ktalkd/ChangeLog +++ b/ktalkd/ChangeLog @@ -365,7 +365,7 @@ It sets now $TDEBINDIR, for portable ktalkdrc files. TDEBINDIR is determined by a call to the kde_bindir() function. Makefile doesn't define TALKD_CONF anymore for compilation : - ktalkd now opens ktalkdrc from KApplication::kde_configdir(). + ktalkd now opens ktalkdrc from TDEApplication::kde_configdir(). 1998-03-26 David Faure <faure@kde.org> (0.5.0) ktalkdrc: Extprg is now $TDEDIR/bin/ktalkdlg. 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; |