diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:17:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:17:46 -0600 |
| commit | 48087e1d5650499b6093a6816356d467c8461802 (patch) | |
| tree | 00c39f978492596620df1374e8a91af507d8bac3 /krdc/rdp | |
| parent | ccfaeb9b831a41e93e777b041cdf33a7d40a0e0b (diff) | |
| download | tdenetwork-48087e1d5650499b6093a6816356d467c8461802.tar.gz tdenetwork-48087e1d5650499b6093a6816356d467c8461802.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'krdc/rdp')
| -rw-r--r-- | krdc/rdp/Makefile.am | 2 | ||||
| -rw-r--r-- | krdc/rdp/krdpview.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/krdc/rdp/Makefile.am b/krdc/rdp/Makefile.am index 3ee8a9b4..df98e88c 100644 --- a/krdc/rdp/Makefile.am +++ b/krdc/rdp/Makefile.am @@ -8,4 +8,4 @@ librdp_la_SOURCES = krdpview.cpp rdphostpref.cpp rdpprefs.ui noinst_HEADERS = krdpview.h rdphostpref.h librdp_la_LIBADD = $(LIB_TDEUI) $(LIBJPEG) -librdp_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +librdp_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp index 00ebf1a6..782aa673 100644 --- a/krdc/rdp/krdpview.cpp +++ b/krdc/rdp/krdpview.cpp @@ -24,7 +24,7 @@ #include <klocale.h> #include <kmessagebox.h> #include <kprocess.h> -#include <kwallet.h> +#include <tdewallet.h> #include <kpassdlg.h> #include <tqvbox.h> @@ -165,7 +165,7 @@ bool KRdpView::editPreferences( HostPrefPtr host ) int hv = hp->height(); int cd = hp->colorDepth(); TQString kl = hp->layout(); - bool kwallet = hp->useKWallet(); + bool tdewallet = hp->useKWallet(); // show preferences dialog KDialogBase *dlg = new KDialogBase( 0L, "dlg", true, @@ -183,7 +183,7 @@ bool KRdpView::editPreferences( HostPrefPtr host ) prefs->setColorDepth(cd); prefs->setKbLayout( keymap2int( kl ) ); prefs->setShowPrefs( true ); - prefs->setUseKWallet(kwallet); + prefs->setUseKWallet(tdewallet); if ( dlg->exec() == TQDialog::Rejected ) return false; |