diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /kcontrol/knotify/knotify.cpp | |
parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/knotify/knotify.cpp')
-rw-r--r-- | kcontrol/knotify/knotify.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp index f8e97e573..0f4d9fff7 100644 --- a/kcontrol/knotify/knotify.cpp +++ b/kcontrol/knotify/knotify.cpp @@ -29,7 +29,7 @@ #include <kapplication.h> #include <kcombobox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <knotifydialog.h> #include <tdeparts/genericfactory.h> #include <kstandarddirs.h> @@ -135,7 +135,7 @@ void KCMKNotify::slotAppActivated( const TQString& text ) void KCMKNotify::slotPlayerSettings() { - // kcmshell is a modal dialog, and apparently, we can't put a non-modal + // tdecmshell is a modal dialog, and apparently, we can't put a non-modal // dialog besides a modal dialog. sigh. if ( !m_playerSettings ) m_playerSettings = new PlayerSettingsDialog( this, true ); |