diff options
Diffstat (limited to 'parts/fileselector')
-rw-r--r-- | parts/fileselector/CMakeLists.txt | 6 | ||||
-rw-r--r-- | parts/fileselector/Makefile.am | 14 | ||||
-rw-r--r-- | parts/fileselector/fileselector_part.cpp | 36 | ||||
-rw-r--r-- | parts/fileselector/fileselector_part.h | 12 | ||||
-rw-r--r-- | parts/fileselector/fileselector_widget.cpp | 102 | ||||
-rw-r--r-- | parts/fileselector/fileselector_widget.h | 44 | ||||
-rw-r--r-- | parts/fileselector/kbookmarkhandler.cpp | 6 | ||||
-rw-r--r-- | parts/fileselector/kbookmarkhandler.h | 4 | ||||
-rw-r--r-- | parts/fileselector/tdevfileselector.desktop (renamed from parts/fileselector/kdevfileselector.desktop) | 4 | ||||
-rw-r--r-- | parts/fileselector/tdevpart_fileselector.rc (renamed from parts/fileselector/kdevpart_fileselector.rc) | 0 |
10 files changed, 114 insertions, 114 deletions
diff --git a/parts/fileselector/CMakeLists.txt b/parts/fileselector/CMakeLists.txt index 8f18792e..b310f791 100644 --- a/parts/fileselector/CMakeLists.txt +++ b/parts/fileselector/CMakeLists.txt @@ -27,12 +27,12 @@ link_directories( ##### other data ################################ -install( FILES kdevfileselector.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES tdevfileselector.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libkdevfileselector (module) ############## +##### libtdevfileselector (module) ############## -tde_add_kpart( libkdevfileselector AUTOMOC +tde_add_kpart( libtdevfileselector AUTOMOC SOURCES fileselector_part.cpp fileselector_widget.cpp tdeactionselector.cpp kbookmarkhandler.cpp diff --git a/parts/fileselector/Makefile.am b/parts/fileselector/Makefile.am index f0c2fc35..43ee404b 100644 --- a/parts/fileselector/Makefile.am +++ b/parts/fileselector/Makefile.am @@ -2,17 +2,17 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/sourceinfo $(all_includes) -kde_module_LTLIBRARIES = libkdevfileselector.la -libkdevfileselector_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libkdevfileselector_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libtdevfileselector.la +libtdevfileselector_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libtdevfileselector_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libkdevfileselector_la_SOURCES = fileselector_part.cpp fileselector_widget.cpp tdeactionselector.cpp kbookmarkhandler.cpp +libtdevfileselector_la_SOURCES = fileselector_part.cpp fileselector_widget.cpp tdeactionselector.cpp kbookmarkhandler.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = kdevfileselector.desktop +service_DATA = tdevfileselector.desktop # not used currently -#rcdir = $(kde_datadir)/kdevfileselector -#rc_DATA = kdevfileselector.rc +#rcdir = $(kde_datadir)/tdevfileselector +#rc_DATA = tdevfileselector.rc diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp index a6b4a6bb..331bb639 100644 --- a/parts/fileselector/fileselector_part.cpp +++ b/parts/fileselector/fileselector_part.cpp @@ -13,33 +13,33 @@ #include <ktextbrowser.h> #include <tdeconfig.h> #include <tdefileitem.h> -#include <kdevgenericfactory.h> +#include <tdevgenericfactory.h> #include <tdediroperator.h> #include <kdialogbase.h> #include <tdemessagebox.h> -#include <kdevapi.h> -#include <kdevcore.h> -#include <kdevproject.h> -#include <kdevmainwindow.h> -#include <kdevpartcontroller.h> -#include <kdevplugininfo.h> -#include <kdevcreatefile.h> +#include <tdevapi.h> +#include <tdevcore.h> +#include <tdevproject.h> +#include <tdevmainwindow.h> +#include <tdevpartcontroller.h> +#include <tdevplugininfo.h> +#include <tdevcreatefile.h> #include <ktip.h> #include "fileselector_widget.h" -typedef KDevGenericFactory<FileSelectorPart> FileSelectorFactory; -static const KDevPluginInfo data("kdevfileselector"); -K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( data ) ) +typedef TDevGenericFactory<FileSelectorPart> FileSelectorFactory; +static const TDevPluginInfo data("tdevfileselector"); +K_EXPORT_COMPONENT_FACTORY( libtdevfileselector, FileSelectorFactory( data ) ) FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "FileSelectorPart") + : TDevPlugin(&data, parent, name ? name : "FileSelectorPart") { setInstance(FileSelectorFactory::instance()); - m_filetree = new KDevFileSelector( this, mainWindow(), partController(), 0, "fileselectorwidget" ); + m_filetree = new TDevFileSelector( this, mainWindow(), partController(), 0, "fileselectorwidget" ); connect( m_filetree->dirOperator(), TQT_SIGNAL(fileSelected(const KFileItem*)), this, TQT_SLOT(fileSelected(const KFileItem*))); @@ -63,7 +63,7 @@ FileSelectorPart::~FileSelectorPart() mainWindow()->removeView( m_filetree ); } - delete (KDevFileSelector*) m_filetree; + delete (TDevFileSelector*) m_filetree; } void FileSelectorPart::fileSelected( const KFileItem * file ) @@ -90,14 +90,14 @@ void FileSelectorPart::slotConfigWidget( KDialogBase * dlg ) void FileSelectorPart::newFile() { - KDevCreateFile *creator = extension<KDevCreateFile>("TDevelop/CreateFile"); + TDevCreateFile *creator = extension<TDevCreateFile>("TDevelop/CreateFile"); if (creator) { - KDevCreateFile::CreatedFile file = creator->createNewFile("", + TDevCreateFile::CreatedFile file = creator->createNewFile("", m_filetree->dirOperator()->url().path()); - if (file.status == KDevCreateFile::CreatedFile::STATUS_NOTCREATED) + if (file.status == TDevCreateFile::CreatedFile::STATUS_NOTCREATED) KMessageBox::error(0, i18n("Cannot create file. Check whether the directory and filename are valid.")); - else if (file.status != KDevCreateFile::CreatedFile::STATUS_CANCELED) + else if (file.status != TDevCreateFile::CreatedFile::STATUS_CANCELED) { partController()->editDocument(KURL::fromPathOrURL( file.dir + "/" + file.filename)); diff --git a/parts/fileselector/fileselector_part.h b/parts/fileselector/fileselector_part.h index f415444d..80841deb 100644 --- a/parts/fileselector/fileselector_part.h +++ b/parts/fileselector/fileselector_part.h @@ -1,17 +1,17 @@ -#ifndef __KDEVPART_FILESELECTOR_H__ -#define __KDEVPART_FILESELECTOR_H__ +#ifndef __TDEVPART_FILESELECTOR_H__ +#define __TDEVPART_FILESELECTOR_H__ -#include <kdevplugin.h> +#include <tdevplugin.h> #include <kdialogbase.h> #include <tdefileitem.h> #include <tqguardedptr.h> -class KDevFileSelector; +class TDevFileSelector; class KDialogBase; -class FileSelectorPart : public KDevPlugin +class FileSelectorPart : public TDevPlugin { Q_OBJECT @@ -33,7 +33,7 @@ private slots: void slotConfigWidget( KDialogBase * ); private: - TQGuardedPtr<KDevFileSelector> m_filetree; + TQGuardedPtr<TDevFileSelector> m_filetree; TDEAction *m_newFileAction; }; diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp index 894bf185..1d6fb154 100644 --- a/parts/fileselector/fileselector_widget.cpp +++ b/parts/fileselector/fileselector_widget.cpp @@ -26,9 +26,9 @@ #include "tdeactionselector.h" #include "kbookmarkhandler.h" -#include <kdevcore.h> -#include <kdevmainwindow.h> -#include <kdevpartcontroller.h> +#include <tdevcore.h> +#include <tdevmainwindow.h> +#include <tdevpartcontroller.h> #include <tqlayout.h> #include <tqtoolbutton.h> @@ -76,32 +76,32 @@ static void silenceTQToolBar(TQtMsgType, const char *) {} -KDevFileSelectorToolBar::KDevFileSelectorToolBar(TQWidget *parent) +TDevFileSelectorToolBar::TDevFileSelectorToolBar(TQWidget *parent) : TDEToolBar( parent, "KDev FileSelector Toolbar", true ) { setMinimumWidth(10); } -KDevFileSelectorToolBar::~KDevFileSelectorToolBar() +TDevFileSelectorToolBar::~TDevFileSelectorToolBar() {} -void KDevFileSelectorToolBar::setMovingEnabled( bool) +void TDevFileSelectorToolBar::setMovingEnabled( bool) { TDEToolBar::setMovingEnabled(false); } -KDevFileSelectorToolBarParent::KDevFileSelectorToolBarParent(TQWidget *parent) +TDevFileSelectorToolBarParent::TDevFileSelectorToolBarParent(TQWidget *parent) :TQFrame(parent),m_tb(0) {} -KDevFileSelectorToolBarParent::~KDevFileSelectorToolBarParent() +TDevFileSelectorToolBarParent::~TDevFileSelectorToolBarParent() {} -void KDevFileSelectorToolBarParent::setToolBar(KDevFileSelectorToolBar *tb) +void TDevFileSelectorToolBarParent::setToolBar(TDevFileSelectorToolBar *tb) { m_tb=tb; } -void KDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * ) +void TDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * ) { if (m_tb) { @@ -113,8 +113,8 @@ void KDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * ) //BEGIN Constructor/destructor -KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *mainWindow, - KDevPartController *partController, +TDevFileSelector::TDevFileSelector( FileSelectorPart *part, TDevMainWindow *mainWindow, + TDevPartController *partController, TQWidget * parent, const char * name ) : TQWidget(parent, name), m_part(part), @@ -127,8 +127,8 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar ); - KDevFileSelectorToolBarParent *tbp=new KDevFileSelectorToolBarParent(this); - toolbar = new KDevFileSelectorToolBar(tbp); + TDevFileSelectorToolBarParent *tbp=new TDevFileSelectorToolBarParent(this); + toolbar = new TDevFileSelectorToolBar(tbp); tbp->setToolBar(toolbar); lo->addWidget(tbp); toolbar->setMovingEnabled(false); @@ -142,7 +142,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main lo->addWidget(cmbPath); cmbPath->listBox()->installEventFilter( this ); - dir = new KDevDirOperator(m_part, KURL(), this, "operator"); + dir = new TDevDirOperator(m_part, KURL(), this, "operator"); dir->setView(KFile::/*Simple*/Detail); TDEActionCollection *coll = dir->actionCollection(); @@ -229,7 +229,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main "reapplies the last filter used when toggled on.") ); } -KDevFileSelector::~KDevFileSelector() +TDevFileSelector::~TDevFileSelector() { writeConfig( m_part->instance()->config(), "fileselector" ); } @@ -237,7 +237,7 @@ KDevFileSelector::~KDevFileSelector() //BEGIN Public Methods -void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name) +void TDevFileSelector::readConfig(TDEConfig *config, const TQString & name) { dir->readConfig(config, name + ":dir"); dir->setView( KFile::Default ); @@ -283,12 +283,12 @@ void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name) } -void KDevFileSelector::initialDirChangeHack() +void TDevFileSelector::initialDirChangeHack() { setDir( waitingDir ); } -void KDevFileSelector::setupToolbar( TDEConfig *config ) +void TDevFileSelector::setupToolbar( TDEConfig *config ) { toolbar->clear(); TQStringList tbactions = config->readListEntry( "toolbar actions", ',' ); @@ -311,7 +311,7 @@ void KDevFileSelector::setupToolbar( TDEConfig *config ) } } -void KDevFileSelector::writeConfig(TDEConfig *config, const TQString & name) +void TDevFileSelector::writeConfig(TDEConfig *config, const TQString & name) { dir->writeConfig(config,name + ":dir"); @@ -332,7 +332,7 @@ void KDevFileSelector::writeConfig(TDEConfig *config, const TQString & name) config->writeEntry( "AutoSyncEvents", autoSyncEvents ); } -void KDevFileSelector::setView(KFile::FileView view) +void TDevFileSelector::setView(KFile::FileView view) { dir->setView(view); } @@ -341,7 +341,7 @@ void KDevFileSelector::setView(KFile::FileView view) //BEGIN Public Slots -void KDevFileSelector::slotFilterChange( const TQString & nf ) +void TDevFileSelector::slotFilterChange( const TQString & nf ) { TQToolTip::remove( btnFilter ); TQString f = nf.stripWhiteSpace(); @@ -371,7 +371,7 @@ void KDevFileSelector::slotFilterChange( const TQString & nf ) btnFilter->setEnabled( !( empty && lastFilter.isEmpty() ) ); } -void KDevFileSelector::setDir( KURL u ) +void TDevFileSelector::setDir( KURL u ) { dir->setURL(u, true); } @@ -380,12 +380,12 @@ void KDevFileSelector::setDir( KURL u ) //BEGIN Private Slots -void KDevFileSelector::cmbPathActivated( const KURL& u ) +void TDevFileSelector::cmbPathActivated( const KURL& u ) { cmbPathReturnPressed( u.url() ); } -void KDevFileSelector::cmbPathReturnPressed( const TQString& u ) +void TDevFileSelector::cmbPathReturnPressed( const TQString& u ) { TQStringList urls = cmbPath->urls(); urls.remove( u ); @@ -395,12 +395,12 @@ void KDevFileSelector::cmbPathReturnPressed( const TQString& u ) dir->setURL( KURL(u), true ); } -void KDevFileSelector::dirUrlEntered( const KURL& u ) +void TDevFileSelector::dirUrlEntered( const KURL& u ) { cmbPath->setURL( u ); } -void KDevFileSelector::dirFinishedLoading() +void TDevFileSelector::dirFinishedLoading() {} @@ -411,7 +411,7 @@ void KDevFileSelector::dirFinishedLoading() If on: Set last filter. */ -void KDevFileSelector::btnFilterClick() +void TDevFileSelector::btnFilterClick() { if ( !btnFilter->isOn() ) { @@ -425,9 +425,9 @@ void KDevFileSelector::btnFilterClick() } -void KDevFileSelector::autoSync() +void TDevFileSelector::autoSync() { - kdDebug()<<"KDevFileSelector::autoSync()"<<endl; + kdDebug()<<"TDevFileSelector::autoSync()"<<endl; // if visible, sync if ( isVisible() ) { @@ -443,14 +443,14 @@ void KDevFileSelector::autoSync() } } -void KDevFileSelector::autoSync( KParts::Part *part ) +void TDevFileSelector::autoSync( KParts::Part *part ) { KTextEditor::Document* doc = dynamic_cast<KTextEditor::Document*>( part ); if( !doc ) return; // as above, but using document url. - kdDebug()<<"KDevFileSelector::autoSync( KTextEditor::Document )"<<endl; + kdDebug()<<"TDevFileSelector::autoSync( KTextEditor::Document )"<<endl; KURL u ( doc->url() ); if ( u.isEmpty() ) { @@ -468,15 +468,15 @@ void KDevFileSelector::autoSync( KParts::Part *part ) } } /// \FIXME crash on shutdown -void KDevFileSelector::setActiveDocumentDir() +void TDevFileSelector::setActiveDocumentDir() { - //kdDebug()<<"KDevFileSelector::setActiveDocumentDir()"<<endl; + //kdDebug()<<"TDevFileSelector::setActiveDocumentDir()"<<endl; KURL u = activeDocumentUrl(); if (!u.isEmpty()) setDir( u.upURL() ); } -void KDevFileSelector::viewChanged() +void TDevFileSelector::viewChanged() { /// @todo make sure the button is disabled if the directory is unreadable, eg /// the document URL has protocol http @@ -487,12 +487,12 @@ void KDevFileSelector::viewChanged() //BEGIN Protected -void KDevFileSelector::focusInEvent( TQFocusEvent * ) +void TDevFileSelector::focusInEvent( TQFocusEvent * ) { dir->setFocus(); } -void KDevFileSelector::showEvent( TQShowEvent * ) +void TDevFileSelector::showEvent( TQShowEvent * ) { // sync if we should if ( autoSyncEvents & GotVisible ) @@ -509,7 +509,7 @@ void KDevFileSelector::showEvent( TQShowEvent * ) } } -bool KDevFileSelector::eventFilter( TQObject* o, TQEvent *e ) +bool TDevFileSelector::eventFilter( TQObject* o, TQEvent *e ) { /* This is rather unfortunate, but: @@ -559,7 +559,7 @@ private: TQString _str; }; -KURL KDevFileSelector::activeDocumentUrl( ) +KURL TDevFileSelector::activeDocumentUrl( ) { KParts::ReadOnlyPart * part = dynamic_cast<KParts::ReadOnlyPart*>( partController->activePart() ); if ( part ) @@ -575,7 +575,7 @@ KURL KDevFileSelector::activeDocumentUrl( ) //////////////////////////////////////////////////////////////////////////////// // KFSConfigPage implementation //////////////////////////////////////////////////////////////////////////////// -KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelector *kfs ) +KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, TDevFileSelector *kfs ) : TQWidget( parent, name ), fileSelector( kfs ), bDirty( false ) @@ -706,20 +706,20 @@ void KFSConfigPage::apply() // sync int s = 0; if ( cbSyncActive->isChecked() ) - s |= KDevFileSelector::DocumentChanged; + s |= TDevFileSelector::DocumentChanged; if ( cbSyncOpen->isChecked() ) - s |= KDevFileSelector::DocumentOpened; + s |= TDevFileSelector::DocumentOpened; if ( cbSyncShow->isChecked() ) - s |= KDevFileSelector::GotVisible; + s |= TDevFileSelector::GotVisible; fileSelector->autoSyncEvents = s; // reset connections disconnect( fileSelector->partController, 0, fileSelector, TQT_SLOT( autoSync() ) ); disconnect( fileSelector->partController, 0, fileSelector, TQT_SLOT( autoSync( KParts::Part *) ) ); - if ( s & KDevFileSelector::DocumentChanged ) + if ( s & TDevFileSelector::DocumentChanged ) connect( fileSelector->partController, TQT_SIGNAL( viewChanged() ), fileSelector, TQT_SLOT( autoSync() ) ); - if ( s & KDevFileSelector::DocumentOpened ) + if ( s & TDevFileSelector::DocumentOpened ) connect( fileSelector->partController, TQT_SIGNAL( partAdded(KParts::Part *) ), fileSelector, TQT_SLOT( autoSync(KParts::Part *) ) ); @@ -773,9 +773,9 @@ void KFSConfigPage::init() // sync int s = fileSelector->autoSyncEvents; - cbSyncActive->setChecked( s & KDevFileSelector::DocumentChanged ); - cbSyncOpen->setChecked( s & KDevFileSelector::DocumentOpened ); - cbSyncShow->setChecked( s & KDevFileSelector::GotVisible ); + cbSyncActive->setChecked( s & TDevFileSelector::DocumentChanged ); + cbSyncOpen->setChecked( s & TDevFileSelector::DocumentOpened ); + cbSyncShow->setChecked( s & TDevFileSelector::GotVisible ); // histories sbPathHistLength->setValue( fileSelector->cmbPath->maxItems() ); sbFilterHistLength->setValue( fileSelector->filter->maxCount() ); @@ -791,9 +791,9 @@ void KFSConfigPage::slotChanged() //END KFSConfigPage -//BEGIN KDevDirOperator +//BEGIN TDevDirOperator -void KDevDirOperator::activatedMenu( const KFileItem *fi, const TQPoint & pos ) +void TDevDirOperator::activatedMenu( const KFileItem *fi, const TQPoint & pos ) { setupMenu(); updateSelectionDependentActions(); @@ -816,6 +816,6 @@ void KDevDirOperator::activatedMenu( const KFileItem *fi, const TQPoint & pos ) popup->popup(pos); } -//END KDevDirOperator +//END TDevDirOperator #include "fileselector_widget.moc" diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h index ef64f88c..1c30eadd 100644 --- a/parts/fileselector/fileselector_widget.h +++ b/parts/fileselector/fileselector_widget.h @@ -29,8 +29,8 @@ #include <tqframe.h> #include <tdediroperator.h> -class KDevMainWindow; -class KDevPartController; +class TDevMainWindow; +class TDevPartController; class FileSelectorPart; class TDEActionCollection; class TDEActionSelector; @@ -57,39 +57,39 @@ namespace KTextEditor */ /* I think this fix for not moving toolbars is better */ -class KDevFileSelectorToolBar: public TDEToolBar +class TDevFileSelectorToolBar: public TDEToolBar { Q_OBJECT public: - KDevFileSelectorToolBar(TQWidget *parent); - virtual ~KDevFileSelectorToolBar(); + TDevFileSelectorToolBar(TQWidget *parent); + virtual ~TDevFileSelectorToolBar(); virtual void setMovingEnabled( bool b ); }; -class KDevFileSelectorToolBarParent: public TQFrame +class TDevFileSelectorToolBarParent: public TQFrame { Q_OBJECT public: - KDevFileSelectorToolBarParent(TQWidget *parent); - ~KDevFileSelectorToolBarParent(); - void setToolBar(KDevFileSelectorToolBar *tb); + TDevFileSelectorToolBarParent(TQWidget *parent); + ~TDevFileSelectorToolBarParent(); + void setToolBar(TDevFileSelectorToolBar *tb); private: - KDevFileSelectorToolBar *m_tb; + TDevFileSelectorToolBar *m_tb; protected: virtual void resizeEvent ( TQResizeEvent * ); }; -class KDevDirOperator: public KDirOperator +class TDevDirOperator: public KDirOperator { Q_OBJECT public: - KDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), TQWidget *parent=0, const char *name=0) + TDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), TQWidget *parent=0, const char *name=0) :KDirOperator(urlName, parent, name), m_part(part) { } @@ -101,7 +101,7 @@ private: FileSelectorPart *m_part; }; -class KDevFileSelector : public TQWidget +class TDevFileSelector : public TQWidget { Q_OBJECT @@ -112,15 +112,15 @@ public: /* When to sync to current document directory */ enum AutoSyncEvent { DocumentChanged=1, DocumentOpened=2, GotVisible=4 }; - KDevFileSelector( FileSelectorPart *part, KDevMainWindow *mainWindow=0, KDevPartController *partController=0, + TDevFileSelector( FileSelectorPart *part, TDevMainWindow *mainWindow=0, TDevPartController *partController=0, TQWidget * parent = 0, const char * name = 0 ); - ~KDevFileSelector(); + ~TDevFileSelector(); void readConfig( TDEConfig *, const TQString & ); void writeConfig( TDEConfig *, const TQString & ); void setupToolbar( TDEConfig * ); void setView( KFile::FileView ); - KDevDirOperator *dirOperator(){ return dir; } + TDevDirOperator *dirOperator(){ return dir; } TDEActionCollection *actionCollection() { return mActionCollection; }; public slots: @@ -146,18 +146,18 @@ protected: KURL activeDocumentUrl(); private: - class KDevFileSelectorToolBar *toolbar; + class TDevFileSelectorToolBar *toolbar; TDEActionCollection *mActionCollection; class KBookmarkHandler *bookmarkHandler; KURLComboBox *cmbPath; - KDevDirOperator * dir; + TDevDirOperator * dir; class TDEAction *acSyncDir; KHistoryCombo * filter; class TQToolButton *btnFilter; FileSelectorPart *m_part; - KDevMainWindow *mainwin; - KDevPartController *partController; + TDevMainWindow *mainwin; + TDevPartController *partController; TQString lastFilter; int autoSyncEvents; // enabled autosync events @@ -183,7 +183,7 @@ class KFSConfigPage : public TQWidget Q_OBJECT public: - KFSConfigPage( TQWidget* parent=0, const char *name=0, KDevFileSelector *kfs=0); + KFSConfigPage( TQWidget* parent=0, const char *name=0, TDevFileSelector *kfs=0); virtual ~KFSConfigPage() {}; public slots: @@ -194,7 +194,7 @@ public slots: private: void init(); - KDevFileSelector *fileSelector; + TDevFileSelector *fileSelector; bool bDirty; //class TQListBox *lbAvailableActions, *lbUsedActions; TDEActionSelector *acSel; diff --git a/parts/fileselector/kbookmarkhandler.cpp b/parts/fileselector/kbookmarkhandler.cpp index 935b9d86..059f0d78 100644 --- a/parts/fileselector/kbookmarkhandler.cpp +++ b/parts/fileselector/kbookmarkhandler.cpp @@ -35,7 +35,7 @@ #include "kbookmarkhandler.moc" -KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu* tdepopupmenu ) +KBookmarkHandler::KBookmarkHandler( TDevFileSelector *parent, TDEPopupMenu* tdepopupmenu ) : TQObject( parent, "KBookmarkHandler" ), KBookmarkOwner(), mParent( parent ), @@ -45,9 +45,9 @@ KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu* tdep if (!m_menu) m_menu = new TDEPopupMenu( parent, "bookmark menu" ); - TQString file = locate( "data", "kdevfileselector/fsbookmarks.xml" ); + TQString file = locate( "data", "tdevfileselector/fsbookmarks.xml" ); if ( file.isEmpty() ) - file = locateLocal( "data", "kdevfileselector/fsbookmarks.xml" ); + file = locateLocal( "data", "tdevfileselector/fsbookmarks.xml" ); KBookmarkManager *manager = KBookmarkManager::managerForFile( file, false); manager->setUpdate( true ); diff --git a/parts/fileselector/kbookmarkhandler.h b/parts/fileselector/kbookmarkhandler.h index 4ec065aa..7d232107 100644 --- a/parts/fileselector/kbookmarkhandler.h +++ b/parts/fileselector/kbookmarkhandler.h @@ -34,7 +34,7 @@ class KBookmarkHandler : public TQObject, public KBookmarkOwner public: - KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu *tdepopupmenu=0 ); + KBookmarkHandler( TDevFileSelector *parent, TDEPopupMenu *tdepopupmenu=0 ); ~KBookmarkHandler(); // KBookmarkOwner interface: @@ -58,7 +58,7 @@ protected: virtual void virtual_hook( int id, void* data ); private: - KDevFileSelector *mParent; + TDevFileSelector *mParent; TDEPopupMenu *m_menu; KBookmarkMenu *m_bookmarkMenu; diff --git a/parts/fileselector/kdevfileselector.desktop b/parts/fileselector/tdevfileselector.desktop index 785db621..a1d13627 100644 --- a/parts/fileselector/kdevfileselector.desktop +++ b/parts/fileselector/tdevfileselector.desktop @@ -33,7 +33,7 @@ Comment[tg]=Воситаи намоиши файлҳо бо тарафдории Comment[tr]=Güçlü, ağdan saydam, dosya gözatma yardımcı programı Comment[zh_CN]=强有力的网络文件浏览工具。 Comment[zh_TW]=強大的網路檔案瀏覽工具。 -Name=KDevFileSelector +Name=TDevFileSelector Name[da]=TDevelop filvælger Name[de]=Datei-Selektor (TDevelop) Name[hi]=के-डेव-फ़ाइल-चयनक @@ -82,7 +82,7 @@ GenericName[zh_CN]=文件选择器 GenericName[zh_TW]=檔案選擇器 Icon=fileopen ServiceTypes=TDevelop/Plugin -X-TDE-Library=libkdevfileselector +X-TDE-Library=libtdevfileselector X-TDevelop-Version=5 X-TDevelop-Scope=Global X-TDevelop-Mode=AssistantMode diff --git a/parts/fileselector/kdevpart_fileselector.rc b/parts/fileselector/tdevpart_fileselector.rc index 940e2ab2..940e2ab2 100644 --- a/parts/fileselector/kdevpart_fileselector.rc +++ b/parts/fileselector/tdevpart_fileselector.rc |