diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Q_bookmarkdialog.cpp | 4 | ||||
-rwxr-xr-x | src/Q_bookmarkdialog.ui | 4 | ||||
-rw-r--r-- | src/Q_userinterfacepreferencesdialog.cpp | 4 | ||||
-rw-r--r-- | src/Q_userinterfacepreferencesdialog.ui | 4 | ||||
-rw-r--r-- | src/bookmarkdialog.cpp | 4 | ||||
-rw-r--r-- | src/ftpsession.cpp | 6 | ||||
-rw-r--r-- | src/importdialog.cpp | 2 | ||||
-rw-r--r-- | src/kasablanca.cpp | 26 | ||||
-rw-r--r-- | src/kasablanca.h | 10 | ||||
-rw-r--r-- | src/kbconfig.cpp | 2 | ||||
-rw-r--r-- | src/kbtaskview.cpp | 2 | ||||
-rw-r--r-- | src/kbtaskview.h | 4 | ||||
-rw-r--r-- | src/main.cpp | 8 |
13 files changed, 40 insertions, 40 deletions
diff --git a/src/Q_bookmarkdialog.cpp b/src/Q_bookmarkdialog.cpp index b736ab0..c3f016d 100644 --- a/src/Q_bookmarkdialog.cpp +++ b/src/Q_bookmarkdialog.cpp @@ -15,7 +15,7 @@ #include <ntqpushbutton.h> #include <ntqsplitter.h> #include <ntqheader.h> -#include <klistview.h> +#include <tdelistview.h> #include <ntqtabwidget.h> #include <klineedit.h> #include <ntqlabel.h> @@ -41,7 +41,7 @@ KasablancaBookmarkDialog::KasablancaBookmarkDialog( TQWidget* parent, const char splitter1 = new TQSplitter( this, "splitter1" ); splitter1->setOrientation( TQSplitter::Horizontal ); - BookmarkListView = new KListView( splitter1, "BookmarkListView" ); + BookmarkListView = new TDEListView( splitter1, "BookmarkListView" ); BookmarkListView->addColumn( tr2i18n( "Name" ) ); BookmarkListView->header()->setClickEnabled( FALSE, BookmarkListView->header()->count() - 1 ); BookmarkListView->setMinimumSize( TQSize( 0, 0 ) ); diff --git a/src/Q_bookmarkdialog.ui b/src/Q_bookmarkdialog.ui index 8c50701..c960c2c 100755 --- a/src/Q_bookmarkdialog.ui +++ b/src/Q_bookmarkdialog.ui @@ -37,7 +37,7 @@ <property name="orientation"> <enum>Horizontal</enum> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Name</string> @@ -409,7 +409,7 @@ </tabstops> <layoutdefaults spacing="6" margin="0"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/src/Q_userinterfacepreferencesdialog.cpp b/src/Q_userinterfacepreferencesdialog.cpp index daf741a..5433cfa 100644 --- a/src/Q_userinterfacepreferencesdialog.cpp +++ b/src/Q_userinterfacepreferencesdialog.cpp @@ -14,7 +14,7 @@ #include <ntqvariant.h> #include <ntqlabel.h> #include <ntqcheckbox.h> -#include <kfontrequester.h> +#include <tdefontrequester.h> #include <ntqlayout.h> #include <ntqtooltip.h> #include <ntqwhatsthis.h> @@ -59,7 +59,7 @@ KasablancaUserInterfacePreferencesDialog::KasablancaUserInterfacePreferencesDial KasablancaUserInterfacePreferencesDialogLayout->addWidget( kcfg_HideHiddenFilesIsEnabled, 2, 4 ); - kcfg_LogwindowFont = new KFontRequester( this, "kcfg_LogwindowFont" ); + kcfg_LogwindowFont = new TDEFontRequester( this, "kcfg_LogwindowFont" ); KasablancaUserInterfacePreferencesDialogLayout->addMultiCellWidget( kcfg_LogwindowFont, 3, 3, 2, 4 ); diff --git a/src/Q_userinterfacepreferencesdialog.ui b/src/Q_userinterfacepreferencesdialog.ui index 267a4b9..836fea2 100644 --- a/src/Q_userinterfacepreferencesdialog.ui +++ b/src/Q_userinterfacepreferencesdialog.ui @@ -84,7 +84,7 @@ <string>Enabled</string> </property> </widget> - <widget class="KFontRequester" row="3" column="2" rowspan="1" colspan="3"> + <widget class="TDEFontRequester" row="3" column="2" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_LogwindowFont</cstring> </property> @@ -137,6 +137,6 @@ </customwidgets> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>kfontrequester.h</includehint> + <includehint>tdefontrequester.h</includehint> </includehints> </UI> diff --git a/src/bookmarkdialog.cpp b/src/bookmarkdialog.cpp index 963f103..1cb0a83 100644 --- a/src/bookmarkdialog.cpp +++ b/src/bookmarkdialog.cpp @@ -29,9 +29,9 @@ #include <kcompletion.h> #include <tdelocale.h> #include <klineedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kpushbutton.h> -#include <klistview.h> +#include <tdelistview.h> #include "bookmarkdialog.h" #include "kbbookmarkitem.h" diff --git a/src/ftpsession.cpp b/src/ftpsession.cpp index f77320d..3b8e236 100644 --- a/src/ftpsession.cpp +++ b/src/ftpsession.cpp @@ -17,7 +17,7 @@ #include <tdelocale.h> #include <tdeglobal.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kiconloader.h> #include <kinputdialog.h> @@ -109,7 +109,7 @@ FtpSession::~FtpSession() void FtpSession::SetCmdLine(KLineEdit* cmdline) { - KCompletion *comp = cmdline->completionObject(); + TDECompletion *comp = cmdline->completionObject(); connect(cmdline, SIGNAL(returnPressed(const TQString&)), comp, SLOT(addItem(const TQString&))); cmdline->setCompletionMode(TDEGlobalSettings::CompletionAuto); mp_cmdline = cmdline; @@ -117,7 +117,7 @@ void FtpSession::SetCmdLine(KLineEdit* cmdline) void FtpSession::SetCwdLine(KLineEdit* cwdline) { - KCompletion *comp = cwdline->completionObject(); + TDECompletion *comp = cwdline->completionObject(); connect(cwdline, SIGNAL(returnPressed(const TQString&)), comp, SLOT(addItem(const TQString&))); cwdline->setCompletionMode(TDEGlobalSettings::CompletionAuto); mp_cwdline = cwdline; diff --git a/src/importdialog.cpp b/src/importdialog.cpp index be684c3..80f3525 100644 --- a/src/importdialog.cpp +++ b/src/importdialog.cpp @@ -19,7 +19,7 @@ #include <tdelocale.h> #include <tdeconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include "kbsiteinfo.h" diff --git a/src/kasablanca.cpp b/src/kasablanca.cpp index 8895be4..049ad7a 100644 --- a/src/kasablanca.cpp +++ b/src/kasablanca.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#include <kaction.h> +#include <tdeaction.h> #include <kapp.h> -#include <kapplication.h> -#include <kdeversion.h> +#include <tdeapplication.h> +#include <tdeversion.h> #include <kedittoolbar.h> #include <tdeglobal.h> #include <kiconloader.h> @@ -26,13 +26,13 @@ #include <kkeydialog.h> #include <tdelocale.h> #include <tdemainwindow.h> -#include <kmenubar.h> -#include <kmessagebox.h> +#include <tdemenubar.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kstatusbar.h> #include <kstdaction.h> #include <ksystemtray.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kpassivepopup.h> #include <klineedit.h> @@ -222,14 +222,14 @@ void Kasablanca::setupActions() /* // this doesn't do anything useful. it's just here to illustrate // how to insert a custom menu and menu item - KAction *custom = new KAction(i18n("Cus&tom Menuitem"), 0, + TDEAction *custom = new TDEAction(i18n("Cus&tom Menuitem"), 0, this, SLOT(optionsPreferences()), actionCollection(), "custom_action"); */ - new KAction(i18n("Edit"), CTRL+Key_E, this, SLOT(SLOT_EditBookmarks()), actionCollection(), "edit bookmarks action"); + new TDEAction(i18n("Edit"), CTRL+Key_E, this, SLOT(SLOT_EditBookmarks()), actionCollection(), "edit bookmarks action"); - new KAction(i18n("Import"), CTRL+Key_I, this, SLOT(SLOT_ImportBookmarks()), actionCollection(), "import bookmarks action"); + new TDEAction(i18n("Import"), CTRL+Key_I, this, SLOT(SLOT_ImportBookmarks()), actionCollection(), "import bookmarks action"); createGUI(); } @@ -258,8 +258,8 @@ void Kasablanca::optionsConfigureKeys() void Kasablanca::optionsConfigureToolbars() { // use the standard toolbar editor -#if defined(KDE_MAKE_VERSION) -# if KDE_VERSION >= KDE_MAKE_VERSION(3,1,0) +#if defined(TDE_MAKE_VERSION) +# if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else saveMainWindowSettings(TDEGlobal::config()); @@ -294,8 +294,8 @@ void Kasablanca::newToolbarConfig() // recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.) createGUI(); -#if defined(KDE_MAKE_VERSION) -# if KDE_VERSION >= KDE_MAKE_VERSION(3,1,0) +#if defined(TDE_MAKE_VERSION) +# if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else applyMainWindowSettings(TDEGlobal::config()); diff --git a/src/kasablanca.h b/src/kasablanca.h index 7d221a5..54a9456 100644 --- a/src/kasablanca.h +++ b/src/kasablanca.h @@ -24,7 +24,7 @@ class KbDir; class KbFile; -class KToggleAction; +class TDEToggleAction; class KSystemTray; class TQWidget; class TQCloseEvent; @@ -33,8 +33,8 @@ class TQPixmap; class FtpSession; class KbStatusTip; -#include <kapplication.h> -#include <klistview.h> +#include <tdeapplication.h> +#include <tdelistview.h> #include <tdemainwindow.h> #include <kprocess.h> @@ -117,8 +117,8 @@ private: TQPopupMenu m_rclickmenu_a, m_rclickmenu_b, m_rclickmenu_t; TQLabel *mp_statusline_a, *mp_statusline_b, *mp_encryptionicon_a, *mp_encryptionicon_b; TQPixmap m_iconencrypted, m_iconunencrypted; - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction; + TDEToggleAction *m_toolbarAction; + TDEToggleAction *m_statusbarAction; FtpSession *mp_session_a, *mp_session_b; list<FtpSession*> *mp_sessionlist; bool m_skiplistenabled, m_onqueuefinishedenabled; diff --git a/src/kbconfig.cpp b/src/kbconfig.cpp index 820a4c4..6763926 100644 --- a/src/kbconfig.cpp +++ b/src/kbconfig.cpp @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from kbconfig.kcfg. +// This file is generated by tdeconfig_compiler from kbconfig.kcfg. // All changes you do to this file will be lost. #include "kbconfig.h" diff --git a/src/kbtaskview.cpp b/src/kbtaskview.cpp index 83f62bb..ed1912c 100644 --- a/src/kbtaskview.cpp +++ b/src/kbtaskview.cpp @@ -21,7 +21,7 @@ #include "kbtransferitem.h" KbTaskView::KbTaskView(TQWidget *parent, const char *name) - : KListView(parent, name) + : TDEListView(parent, name) { addColumn(i18n("Task")); addColumn(i18n("Progress")); diff --git a/src/kbtaskview.h b/src/kbtaskview.h index 71e47b7..e2aab6b 100644 --- a/src/kbtaskview.h +++ b/src/kbtaskview.h @@ -12,12 +12,12 @@ #ifndef KBTASKVIEW_H #define KBTASKVIEW_H -#include <klistview.h> +#include <tdelistview.h> /** @author Magnus Kulke */ -class KbTaskView : public KListView +class KbTaskView : public TDEListView { Q_OBJECT public: diff --git a/src/main.cpp b/src/main.cpp index 1f12140..86b0837 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,7 +3,7 @@ */ #include "kasablanca.h" -#include <kapplication.h> +#include <tdeapplication.h> #include <dcopclient.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> @@ -17,12 +17,12 @@ static const char version[] = "0.4.0.2"; static TDECmdLineOptions options[] = { // { "+[URL]", I18N_NOOP( "Document to open." ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) { - KLocale::setMainCatalogue("kasablanca"); + TDELocale::setMainCatalogue("kasablanca"); TDEAboutData about("kasablanca", I18N_NOOP("kasablanca"), version, description, TDEAboutData::License_GPL, "(C) 2004 Magnus Kulke", 0, 0, @@ -34,7 +34,7 @@ int main(int argc, char **argv) about.addCredit( "Richard Stellingwerf", 0, "justremenic@hotmail.com" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; // register ourselves as a dcop client app.dcopClient()->registerAs(app.name(), false); |