diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:58 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:58 -0600 |
| commit | b10a61b1fd2fe561ba61a384d4a344bae2a4aa29 (patch) | |
| tree | 99dc6b2584265b2df91f7dbc1dcbf7a54efd205e /kopete/protocols/irc/ui | |
| parent | 64c3be47ff36e40035ead93f913aeeb1e4f85e4b (diff) | |
| download | tdenetwork-b10a61b1fd2fe561ba61a384d4a344bae2a4aa29.tar.gz tdenetwork-b10a61b1fd2fe561ba61a384d4a344bae2a4aa29.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols/irc/ui')
| -rw-r--r-- | kopete/protocols/irc/ui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kopete/protocols/irc/ui/Makefile.am | 2 | ||||
| -rw-r--r-- | kopete/protocols/irc/ui/irceditaccountwidget.cpp | 2 | ||||
| -rw-r--r-- | kopete/protocols/irc/ui/networtdeconfig.ui (renamed from kopete/protocols/irc/ui/networkconfig.ui) | 0 | ||||
| -rw-r--r-- | kopete/protocols/irc/ui/networtdeconfig.ui.h (renamed from kopete/protocols/irc/ui/networkconfig.ui.h) | 0 |
5 files changed, 3 insertions, 3 deletions
diff --git a/kopete/protocols/irc/ui/CMakeLists.txt b/kopete/protocols/irc/ui/CMakeLists.txt index 7d77d5b8..d90cdd65 100644 --- a/kopete/protocols/irc/ui/CMakeLists.txt +++ b/kopete/protocols/irc/ui/CMakeLists.txt @@ -26,5 +26,5 @@ include_directories( tde_add_library( kopeteircui STATIC_PIC AUTOMOC SOURCES ircadd.ui empty.cpp irceditaccountwidget.cpp irceditaccount.ui - channellist.cpp channellistdialog.cpp networkconfig.ui + channellist.cpp channellistdialog.cpp networtdeconfig.ui ) diff --git a/kopete/protocols/irc/ui/Makefile.am b/kopete/protocols/irc/ui/Makefile.am index 854a7398..b31b75ea 100644 --- a/kopete/protocols/irc/ui/Makefile.am +++ b/kopete/protocols/irc/ui/Makefile.am @@ -8,5 +8,5 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) \ libkopeteircui_la_SOURCES = ircadd.ui empty.cpp irceditaccountwidget.cpp \ - irceditaccount.ui channellist.cpp channellistdialog.cpp networkconfig.ui + irceditaccount.ui channellist.cpp channellistdialog.cpp networtdeconfig.ui EXTRA_DIST = ircadd.ui ircprefs.ui empty.cpp diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp index f09ea21e..430282fb 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp +++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp @@ -32,7 +32,7 @@ #include <klistview.h> #include <kdebug.h> #include <kextsock.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kcharsets.h> diff --git a/kopete/protocols/irc/ui/networkconfig.ui b/kopete/protocols/irc/ui/networtdeconfig.ui index 09121e54..09121e54 100644 --- a/kopete/protocols/irc/ui/networkconfig.ui +++ b/kopete/protocols/irc/ui/networtdeconfig.ui diff --git a/kopete/protocols/irc/ui/networkconfig.ui.h b/kopete/protocols/irc/ui/networtdeconfig.ui.h index 183ba57f..183ba57f 100644 --- a/kopete/protocols/irc/ui/networkconfig.ui.h +++ b/kopete/protocols/irc/ui/networtdeconfig.ui.h |