diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:22:56 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:22:56 +0000 |
commit | 7346aee26bf190a7e70333c40fab4caca847cd27 (patch) | |
tree | 4b019b434f88dcc3eeaafe1d3f26240b4c4718e8 /konq-plugins/kuick | |
parent | 23a3d3aa5b44cbdf305495919866d9dbf4f6da54 (diff) | |
download | tdeaddons-7346aee26bf190a7e70333c40fab4caca847cd27.tar.gz tdeaddons-7346aee26bf190a7e70333c40fab4caca847cd27.zip |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1157634 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'konq-plugins/kuick')
-rw-r--r-- | konq-plugins/kuick/kcmkuick/kcmkuick.cpp | 42 | ||||
-rw-r--r-- | konq-plugins/kuick/kcmkuick/kcmkuick.h | 6 | ||||
-rw-r--r-- | konq-plugins/kuick/kdirmenu.cpp | 58 | ||||
-rw-r--r-- | konq-plugins/kuick/kdirmenu.h | 28 | ||||
-rw-r--r-- | konq-plugins/kuick/kimcontactmenu.cpp | 14 | ||||
-rw-r--r-- | konq-plugins/kuick/kimcontactmenu.h | 10 | ||||
-rw-r--r-- | konq-plugins/kuick/kmetamenu.cpp | 62 | ||||
-rw-r--r-- | konq-plugins/kuick/kmetamenu.h | 24 | ||||
-rw-r--r-- | konq-plugins/kuick/kuick_plugin.cpp | 30 | ||||
-rw-r--r-- | konq-plugins/kuick/kuick_plugin.h | 8 |
10 files changed, 141 insertions, 141 deletions
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp index fdbf5c0..27459ee 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp +++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp @@ -14,8 +14,8 @@ #include "kcmkuick.h" -#include <qlayout.h> -#include <qfile.h> +#include <tqlayout.h> +#include <tqfile.h> #include <kglobal.h> #include <klocale.h> #include <kconfig.h> @@ -24,16 +24,16 @@ #include <kstandarddirs.h> #include <kservice.h> -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qpushbutton.h> -#include <qspinbox.h> -#include <qstring.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqpushbutton.h> +#include <tqspinbox.h> +#include <tqstring.h> -typedef KGenericFactory<KCMKuick, QWidget> KuickFactory; +typedef KGenericFactory<KCMKuick, TQWidget> KuickFactory; K_EXPORT_COMPONENT_FACTORY ( kcm_kuick, KuickFactory( "kcmkuick" ) ) -KCMKuick::KCMKuick(QWidget *parent, const char *name, const QStringList &) +KCMKuick::KCMKuick(TQWidget *parent, const char *name, const TQStringList &) :KCModule(parent, name) { KAboutData *ab=new KAboutData( "kcmkuick", I18N_NOOP("KCM Kuick"), @@ -42,16 +42,16 @@ KCMKuick::KCMKuick(QWidget *parent, const char *name, const QStringList &) ab->addAuthor("Holger Freyther",0, "freyther@kde.org"); setAboutData( ab ); - QVBoxLayout *topLayout = new QVBoxLayout(this, 0, 0); + TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, 0); dialog = new KCMKuickDialog(this); topLayout->add(dialog); topLayout->addStretch(); - connect( dialog->m_sbCopy, SIGNAL(valueChanged(int) ), SLOT(configChanged() ) ); - connect( dialog->m_sbMove, SIGNAL(valueChanged(int) ), SLOT(configChanged() ) ); - connect( dialog->pbCopyClear, SIGNAL(pressed() ), SLOT(slotClearCopyCache() ) ); - connect( dialog->pbMoveClear, SIGNAL(pressed() ), SLOT(slotClearMoveCache() ) ); - connect( dialog->m_chkShow, SIGNAL(clicked() ), SLOT(slotShowToggled() ) ); + connect( dialog->m_sbCopy, TQT_SIGNAL(valueChanged(int) ), TQT_SLOT(configChanged() ) ); + connect( dialog->m_sbMove, TQT_SIGNAL(valueChanged(int) ), TQT_SLOT(configChanged() ) ); + connect( dialog->pbCopyClear, TQT_SIGNAL(pressed() ), TQT_SLOT(slotClearCopyCache() ) ); + connect( dialog->pbMoveClear, TQT_SIGNAL(pressed() ), TQT_SLOT(slotClearMoveCache() ) ); + connect( dialog->m_chkShow, TQT_SIGNAL(clicked() ), TQT_SLOT(slotShowToggled() ) ); load(); } @@ -86,7 +86,7 @@ KCMKuick::~KCMKuick() { } -void KCMKuick::load(const QString & /*s*/) +void KCMKuick::load(const TQString & /*s*/) { } @@ -108,8 +108,8 @@ void KCMKuick::save() config.sync(); //is it necessary ? if ( dialog->m_chkShow->isChecked() ) { - QString servicespath = KGlobal::dirs()->saveLocation( "services"); - QFile::remove(servicespath+"/kuick_plugin.desktop"); + TQString servicespath = KGlobal::dirs()->saveLocation( "services"); + TQFile::remove(servicespath+"/kuick_plugin.desktop"); } else { KConfig cfg("kuick_plugin.desktop", false, false, "services"); @@ -124,14 +124,14 @@ void KCMKuick::save() void KCMKuick::slotClearCopyCache( ) { KConfig config("konquerorrc"); config.setGroup("kuick-copy" ); - config.writePathEntry("Paths", QStringList() ); + config.writePathEntry("Paths", TQStringList() ); config.sync(); //is it necessary ? } void KCMKuick::slotClearMoveCache() { KConfig config("konquerorrc"); config.setGroup("kuick-move" ); - config.writePathEntry("Paths", QStringList() ); + config.writePathEntry("Paths", TQStringList() ); config.sync(); //is it necessary ? } @@ -146,7 +146,7 @@ void KCMKuick::defaults() emit changed( true ); } -QString KCMKuick::quickHelp() const +TQString KCMKuick::quickHelp() const { return i18n("<h1>Kuick</h1> With this module you can configure Kuick, the KDE quick" "copy and move plugin for Konqueror."); diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.h b/konq-plugins/kuick/kcmkuick/kcmkuick.h index c10d04e..d4316eb 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuick.h +++ b/konq-plugins/kuick/kcmkuick/kcmkuick.h @@ -26,13 +26,13 @@ class KCMKuick Q_OBJECT public: - KCMKuick (QWidget *parent, const char *name, const QStringList &); + KCMKuick (TQWidget *parent, const char *name, const TQStringList &); ~KCMKuick(); void load(); - void load(const QString &); + void load(const TQString &); void save(); void defaults(); - QString quickHelp() const; + TQString quickHelp() const; public slots: void configChanged(); private: diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp index 2cbf6de..4dbd212 100644 --- a/konq-plugins/kuick/kdirmenu.cpp +++ b/konq-plugins/kuick/kdirmenu.cpp @@ -17,9 +17,9 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qiconset.h> -#include <qdir.h> -#include <qfileinfo.h> +#include <tqiconset.h> +#include <tqdir.h> +#include <tqfileinfo.h> #include <kaction.h> #include <kapplication.h> @@ -32,11 +32,11 @@ #define CICON(a) (*_icons)[a] -QMap<QString, QPixmap> *KDirMenu::_icons = 0; +TQMap<TQString, TQPixmap> *KDirMenu::_icons = 0; -KDirMenu::KDirMenu ( QWidget *parent, const KURL &_src, - const QString &_path, const QString &_name, bool /*showfile*/ ) - : QPopupMenu(parent), +KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src, + const TQString &_path, const TQString &_name, bool /*showfile*/ ) + : TQPopupMenu(parent), path(_path), name(_name), src( _src ), @@ -44,33 +44,33 @@ KDirMenu::KDirMenu ( QWidget *parent, const KURL &_src, { children.setAutoDelete( true ); initIconMap( ); - connect( this, SIGNAL( aboutToShow( ) ), this, SLOT( slotAboutToShow( ) ) ); - connect( this, SIGNAL( aboutToHide( ) ), this, SLOT( slotAboutToHide( ) ) ); + connect( this, TQT_SIGNAL( aboutToShow( ) ), this, TQT_SLOT( slotAboutToShow( ) ) ); + connect( this, TQT_SIGNAL( aboutToHide( ) ), this, TQT_SLOT( slotAboutToHide( ) ) ); children.clear(); // just in case - QFileInfo fileInfo(path); + TQFileInfo fileInfo(path); if (( src.path() != path || !src.isLocalFile()) && fileInfo.isWritable()) - action = new KAction(name, 0, this, SLOT(new_slot( ) ), this); + action = new KAction(name, 0, this, TQT_SLOT(new_slot( ) ), this); } KDirMenu::~KDirMenu( ) { delete action; clear( ); children.clear( ); } -void KDirMenu::insert( KDirMenu *submenu, const QString &_path ) { - static const QIconSet folder = SmallIconSet("folder"); - QString escapedPath = _path; - QString completPath=path+'/'+_path; +void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) { + static const TQIconSet folder = SmallIconSet("folder"); + TQString escapedPath = _path; + TQString completPath=path+'/'+_path; // parse .directory if it does exist - if (QFile::exists(completPath + "/.directory")) { + if (TQFile::exists(completPath + "/.directory")) { KSimpleConfig c(completPath + "/.directory", true); c.setDesktopGroup(); - QString iconPath = c.readEntry("Icon"); + TQString iconPath = c.readEntry("Icon"); if ( iconPath.startsWith("./") ) iconPath = _path + '/' + iconPath.mid(2); - QPixmap icon; + TQPixmap icon; icon = KGlobal::iconLoader()->loadIcon(iconPath, KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState, 0, true); @@ -81,8 +81,8 @@ void KDirMenu::insert( KDirMenu *submenu, const QString &_path ) { else insertItem( folder, escapedPath.replace( "&", "&&" ), submenu ); children.append( submenu ); - connect(submenu, SIGNAL(fileChosen(const QString &)), - this, SLOT(slotFileSelected(const QString &))); + connect(submenu, TQT_SIGNAL(fileChosen(const TQString &)), + this, TQT_SLOT(slotFileSelected(const TQString &))); } void KDirMenu::slotAboutToShow( ) { @@ -92,7 +92,7 @@ void KDirMenu::slotAboutToShow( ) { //Precaution: if not a directory, exit, in case some path in KMetaMenu //isn't checked right - if ( !QFileInfo(path).isDir() ) + if ( !TQFileInfo(path).isDir() ) return; if ( action ) @@ -101,9 +101,9 @@ void KDirMenu::slotAboutToShow( ) { setItemEnabled( insertItem( name ), false ); // all dirs writeable and readable - QDir dir(path, QString::null, - QDir::Name | QDir::DirsFirst | QDir::IgnoreCase, - QDir::Dirs | QDir::Readable | QDir::Executable); + TQDir dir(path, TQString::null, + TQDir::Name | TQDir::DirsFirst | TQDir::IgnoreCase, + TQDir::Dirs | TQDir::Readable | TQDir::Executable); const QFileInfoList* dirList = dir.entryInfoList(); if ( !dirList || dirList->isEmpty() ) { @@ -120,11 +120,11 @@ void KDirMenu::slotAboutToShow( ) { return; } - static const QString& dot = KGlobal::staticQString( "." ); - static const QString& dotdot = KGlobal::staticQString( ".." ); + static const TQString& dot = KGlobal::staticQString( "." ); + static const TQString& dotdot = KGlobal::staticQString( ".." ); for ( QFileInfoListIterator it( *dirList ); *it; ++it ) { - QString fileName = (*it)->fileName(); + TQString fileName = (*it)->fileName(); if ( fileName == dot || fileName == dotdot ) continue; @@ -146,7 +146,7 @@ void KDirMenu::initIconMap() // kdDebug(90160) << "PanelBrowserMenu::initIconMap" << endl; - _icons = new QMap<QString, QPixmap>; + _icons = new TQMap<TQString, TQPixmap>; _icons->insert("folder", SmallIcon("folder")); _icons->insert("unknown", SmallIcon("mime_empty")); @@ -158,7 +158,7 @@ void KDirMenu::initIconMap() _icons->insert("exec", SmallIcon("exec")); _icons->insert("chardevice", SmallIcon("chardevice")); } -void KDirMenu::slotFileSelected(const QString &_path ){ +void KDirMenu::slotFileSelected(const TQString &_path ){ emit fileChosen( _path ); } diff --git a/konq-plugins/kuick/kdirmenu.h b/konq-plugins/kuick/kdirmenu.h index 6356e83..5bbe68e 100644 --- a/konq-plugins/kuick/kdirmenu.h +++ b/konq-plugins/kuick/kdirmenu.h @@ -21,38 +21,38 @@ #ifndef __kdirmenu_h #define __kdirmenu_h -#include <qpopupmenu.h> -#include <qptrlist.h> -#include <qmap.h> +#include <tqpopupmenu.h> +#include <tqptrlist.h> +#include <tqmap.h> class KAction; class KURL; -class KDirMenu : public QPopupMenu { +class KDirMenu : public TQPopupMenu { Q_OBJECT public: - KDirMenu( QWidget *parent, const KURL &src, const QString &_path, - const QString &name, bool showfiles = false ); + KDirMenu( TQWidget *parent, const KURL &src, const TQString &_path, + const TQString &name, bool showfiles = false ); ~KDirMenu( ); - void setPath( const QString &_path); - void insert( KDirMenu *menu, const QString &path ); + void setPath( const TQString &_path); + void insert( KDirMenu *menu, const TQString &path ); protected: int target_id; - static QMap<QString, QPixmap> *_icons; + static TQMap<TQString, TQPixmap> *_icons; signals: - void fileChosen( const QString &_path ); + void fileChosen( const TQString &_path ); private: - QString path; - QString name; + TQString path; + TQString name; KURL src; KAction *action; - QPtrList<KDirMenu> children; + TQPtrList<KDirMenu> children; void initIconMap( ); public slots: void slotAboutToShow( ); void slotAboutToHide( ); - void slotFileSelected(const QString &_path ); + void slotFileSelected(const TQString &_path ); /** No descriptions */ void new_slot(); }; diff --git a/konq-plugins/kuick/kimcontactmenu.cpp b/konq-plugins/kuick/kimcontactmenu.cpp index 42cf980..77ef7a4 100644 --- a/konq-plugins/kuick/kimcontactmenu.cpp +++ b/konq-plugins/kuick/kimcontactmenu.cpp @@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA. */ -#include <qstringlist.h> +#include <tqstringlist.h> // The following enables kabc for contact name lookups instead of using Kopete's idea of their name. //#define KIMCONTACTS_USE_KABC @@ -34,14 +34,14 @@ #include "kimcontactmenu.h" -KIMContactMenu::KIMContactMenu( QWidget *parent, KIMProxy *proxy ) - : QPopupMenu( parent), mProxy( proxy ) +KIMContactMenu::KIMContactMenu( TQWidget *parent, KIMProxy *proxy ) + : TQPopupMenu( parent), mProxy( proxy ) { #ifdef KIMCONTACTS_USE_KABC m_addressBook = KABC::StdAddressBook::self( false ); #endif - connect( this, SIGNAL( activated( int ) ), SLOT( slotItemActivated( int ) ) ); - connect( this, SIGNAL( aboutToShow( ) ), this, SLOT( slotAboutToShow( ) ) ); + connect( this, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotItemActivated( int ) ) ); + connect( this, TQT_SIGNAL( aboutToShow( ) ), this, TQT_SLOT( slotAboutToShow( ) ) ); } KIMContactMenu::~KIMContactMenu() @@ -61,7 +61,7 @@ void KIMContactMenu::slotAboutToShow() int i = 0; - for ( QStringList::Iterator it = mContacts.begin(); it != mContacts.end(); ++it, ++i ) + for ( TQStringList::Iterator it = mContacts.begin(); it != mContacts.end(); ++it, ++i ) { #ifdef KIMCONTACTS_USE_KABC insertItem( mProxy->presenceIcon( *it ), m_addressBook->findByUid( *it ).realName(), i ); @@ -74,7 +74,7 @@ void KIMContactMenu::slotAboutToShow() void KIMContactMenu::slotItemActivated( int item ) { // look up corresponding UID - QString uid = mContacts[ item ]; + TQString uid = mContacts[ item ]; // emit signal emit contactChosen( uid ); } diff --git a/konq-plugins/kuick/kimcontactmenu.h b/konq-plugins/kuick/kimcontactmenu.h index 62c13bc..478c55b 100644 --- a/konq-plugins/kuick/kimcontactmenu.h +++ b/konq-plugins/kuick/kimcontactmenu.h @@ -23,8 +23,8 @@ #ifndef __kim_contact_menu_h #define __kim_contact_menu_h -#include <qpopupmenu.h> -#include <qstringlist.h> +#include <tqpopupmenu.h> +#include <tqstringlist.h> class KIMProxy; namespace KABC { @@ -35,7 +35,7 @@ class KIMContactMenu : public QPopupMenu { Q_OBJECT public: - KIMContactMenu( QWidget *parent, KIMProxy *proxy ); + KIMContactMenu( TQWidget *parent, KIMProxy *proxy ); ~KIMContactMenu(); protected slots: // populate menus if not already populated @@ -43,11 +43,11 @@ protected slots: void slotAboutToHide(); void slotItemActivated( int item ); signals: - void contactChosen( const QString &uid ); + void contactChosen( const TQString &uid ); protected: KIMProxy *mProxy; - QStringList mContacts; + TQStringList mContacts; KABC::AddressBook* m_addressBook; }; diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp index 065a825..2b5d78a 100644 --- a/konq-plugins/kuick/kmetamenu.cpp +++ b/konq-plugins/kuick/kmetamenu.cpp @@ -26,53 +26,53 @@ #include <kurl.h> #include <konq_popupmenu.h> -#include <qpixmap.h> -#include <qdir.h> -#include <qiconset.h> -#include <qstringlist.h> +#include <tqpixmap.h> +#include <tqdir.h> +#include <tqiconset.h> +#include <tqstringlist.h> #include "kmetamenu.h" #include "kdirmenu.h" #include "kimcontactmenu.h" #include "kmetamenu.moc" -KMetaMenu::KMetaMenu( QWidget *parent, const KURL &url, - const QString &text, const QString &key, KIMProxy *imProxy ) -: QPopupMenu( parent), +KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, + const TQString &text, const TQString &key, KIMProxy *imProxy ) +: TQPopupMenu( parent), m_root( 0 ), m_home( 0 ), m_etc( 0 ), m_current( 0 ), m_browse( 0 ) { int recent_no; group = key; actions.setAutoDelete( TRUE ); - QStringList dirList; + TQStringList dirList; KURL u; - u.setPath(QDir::homeDirPath()); + u.setPath(TQDir::homeDirPath()); if ( kapp->authorizeURLAction("list", u, u) ) { m_home = new KDirMenu( parent, url, u.path() , text ); insertItem( SmallIcon( "kfm_home" ), i18n("&Home Folder"), m_home); dirList << u.path(); - connect(m_home, SIGNAL(fileChosen(const QString &)), - SLOT(slotFileChosen(const QString &) ) ); + connect(m_home, TQT_SIGNAL(fileChosen(const TQString &)), + TQT_SLOT(slotFileChosen(const TQString &) ) ); } - u.setPath(QDir::rootDirPath()); + u.setPath(TQDir::rootDirPath()); if ( kapp->authorizeURLAction("list", u, u) ) { m_root = new KDirMenu( parent, url, u.path() , text ); insertItem( SmallIcon( "folder_red" ), i18n("&Root Folder"), m_root); dirList << u.path(); - connect(m_root, SIGNAL(fileChosen(const QString &)), - SLOT(slotFileChosen(const QString &) ) ); + connect(m_root, TQT_SIGNAL(fileChosen(const TQString &)), + TQT_SLOT(slotFileChosen(const TQString &) ) ); } - QString confDir = QDir::rootDirPath()+ "etc"; + TQString confDir = TQDir::rootDirPath()+ "etc"; u.setPath(confDir); - if ( QFileInfo( confDir ).isWritable() && + if ( TQFileInfo( confDir ).isWritable() && kapp->authorizeURLAction("list", u, u) ) { m_etc = new KDirMenu( parent, url, confDir, text ); @@ -80,14 +80,14 @@ KMetaMenu::KMetaMenu( QWidget *parent, const KURL &url, i18n("&System Configuration"), m_etc); dirList << confDir; - connect(m_etc , SIGNAL(fileChosen(const QString &)), - SLOT(slotFileChosen(const QString &) ) ); + connect(m_etc , TQT_SIGNAL(fileChosen(const TQString &)), + TQT_SLOT(slotFileChosen(const TQString &) ) ); } if ( url.isLocalFile() && dirList.find( url.path() ) == dirList.end() - && QFileInfo( url.path() ).isWritable() - && QFileInfo( url.path() ).isDir() + && TQFileInfo( url.path() ).isWritable() + && TQFileInfo( url.path() ).isDir() && kapp->authorizeURLAction("list", url, url) ) //Need to check whether a directory so we don't crash trying to access it //(#60192) @@ -97,21 +97,21 @@ KMetaMenu::KMetaMenu( QWidget *parent, const KURL &url, insertItem( SmallIcon( "folder" ), i18n( "&Current Folder" ), m_current ); - connect(m_current, SIGNAL(fileChosen(const QString &)), - SLOT(slotFileChosen(const QString &) ) ); + connect(m_current, TQT_SIGNAL(fileChosen(const TQString &)), + TQT_SLOT(slotFileChosen(const TQString &) ) ); } if ( imProxy ) { m_contacts = new KIMContactMenu( parent, imProxy ); int item = insertItem( SmallIconSet( "personal" ), i18n( "C&ontact" ), m_contacts ); - connect ( m_contacts, SIGNAL( contactChosen( const QString &) ), SIGNAL( contactChosen( const QString & ) ) ); + connect ( m_contacts, TQT_SIGNAL( contactChosen( const TQString &) ), TQT_SIGNAL( contactChosen( const TQString & ) ) ); if ( !imProxy->initialize() || imProxy->fileTransferContacts().isEmpty() ) setItemEnabled( item, false ); } - m_browse = new KAction(i18n("&Browse..."), 0, this, SLOT(slotBrowse()), this ); + m_browse = new KAction(i18n("&Browse..."), 0, this, TQT_SLOT(slotBrowse()), this ); m_browse->plug(this); // read the last chosen dirs // first set the group according to our parameter @@ -122,18 +122,18 @@ KMetaMenu::KMetaMenu( QWidget *parent, const KURL &url, if ( list.count() > 0 ) insertSeparator(); int i=1; - QStringList::Iterator it = list.begin(); + TQStringList::Iterator it = list.begin(); while( it != list.end() ) { if( i == (recent_no + 1) ) break; - QDir dir( *it ); + TQDir dir( *it ); u.setPath( *it ); if ( !dir.exists() || !kapp->authorizeURLAction("list", u, u) ) { it = list.remove( it ); continue; } - QString escapedDir = *it; - KAction *action = new KAction(escapedDir.replace("&", "&&"), 0, this, SLOT(slotFastPath()), this); + TQString escapedDir = *it; + KAction *action = new KAction(escapedDir.replace("&", "&&"), 0, this, TQT_SLOT(slotFastPath()), this); action->plug(this ); actions.append( action ); ++it; @@ -152,7 +152,7 @@ KMetaMenu::~KMetaMenu(){ delete m_browse; actions.clear(); } -void KMetaMenu::slotFileChosen(const QString &path ){ +void KMetaMenu::slotFileChosen(const TQString &path ){ writeConfig(path ); emit fileChosen(path ); } @@ -160,10 +160,10 @@ void KMetaMenu::slotFileChosen(const QString &path ){ void KMetaMenu::slotFastPath( ) { KAction *action; action = (KAction*) sender(); - QString text = action->plainText( ); + TQString text = action->plainText( ); slotFileChosen( text ); } -void KMetaMenu::writeConfig( const QString &path){ +void KMetaMenu::writeConfig( const TQString &path){ list.remove(path ); list.prepend(path ); conf->setGroup( group ); diff --git a/konq-plugins/kuick/kmetamenu.h b/konq-plugins/kuick/kmetamenu.h index f6670f6..ff33df6 100644 --- a/konq-plugins/kuick/kmetamenu.h +++ b/konq-plugins/kuick/kmetamenu.h @@ -20,8 +20,8 @@ #ifndef _kmetamenu_h #define _kmetamenu_h -#include <qpopupmenu.h> -#include <qptrlist.h> +#include <tqpopupmenu.h> +#include <tqptrlist.h> #include <kaction.h> @@ -33,22 +33,22 @@ class KIMContactMenu; class KIMProxy; class KURL; -class KMetaMenu : public QPopupMenu { +class KMetaMenu : public TQPopupMenu { Q_OBJECT public: - KMetaMenu( QWidget *parent, const KURL &url, const QString &text, - const QString &key, KIMProxy * imProxy = 0L ); + KMetaMenu( TQWidget *parent, const KURL &url, const TQString &text, + const TQString &key, KIMProxy * imProxy = 0L ); KMetaMenu(); ~KMetaMenu(); - void writeConfig( const QString &path ); + void writeConfig( const TQString &path ); public slots: - void slotFileChosen( const QString &path); + void slotFileChosen( const TQString &path); void slotFastPath( ); void slotBrowse( ); signals: - void fileChosen( const QString &path ); - void contactChosen( const QString &uid ); + void fileChosen( const TQString &path ); + void contactChosen( const TQString &uid ); private: KDirMenu *m_root; KDirMenu *m_home; @@ -57,10 +57,10 @@ private: KIMContactMenu *m_contacts; KIMProxy *m_proxy; KAction *m_browse; - QStringList list; + TQStringList list; KConfig *conf; - QString group; - QPtrList<KAction> actions; + TQString group; + TQPtrList<KAction> actions; }; #endif diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp index 80a7cc7..772f169 100644 --- a/konq-plugins/kuick/kuick_plugin.cpp +++ b/konq-plugins/kuick/kuick_plugin.cpp @@ -30,7 +30,7 @@ #include <konq_popupmenu.h> #include <kmessagebox.h> #include <kgenericfactory.h> -#include <qobject.h> +#include <tqobject.h> #include <kio/jobclasses.h> #include <kio/job.h> #include <kurl.h> @@ -38,15 +38,15 @@ typedef KGenericFactory<KTestMenu, KonqPopupMenu> KTestMenuFactory; K_EXPORT_COMPONENT_FACTORY( libkuickplugin, KTestMenuFactory("kuick_plugin") ) -KTestMenu::KTestMenu( KonqPopupMenu *popupmenu, const char *name, const QStringList& /*list*/ ) : KonqPopupMenuPlugin( popupmenu, name) { +KTestMenu::KTestMenu( KonqPopupMenu *popupmenu, const char *name, const TQStringList& /*list*/ ) : KonqPopupMenuPlugin( popupmenu, name) { popup= popupmenu ; meta_copy_mmu = 0L; meta_move_mmu = 0L; - my_action = new KAction( "kuick_plugin", 0, this, SLOT( slotPopupMaeh( ) ), actionCollection( ), "Do some funky stuff" ); + my_action = new KAction( "kuick_plugin", 0, this, TQT_SLOT( slotPopupMaeh( ) ), actionCollection( ), "Do some funky stuff" ); addAction( my_action ); addSeparator(); //popupmenu->addMerge(); - connect( popup, SIGNAL(aboutToShow() ), this, SLOT(slotPrepareMenu( ) ) ); + connect( popup, TQT_SIGNAL(aboutToShow() ), this, TQT_SLOT(slotPrepareMenu( ) ) ); m_imProxy = KIMProxy::instance( kapp->dcopClient() ); } KTestMenu::~KTestMenu( ){ @@ -56,20 +56,20 @@ KTestMenu::~KTestMenu( ){ void KTestMenu::slotPopupMaeh( ){ } -void KTestMenu::slotStartCopyJob( const QString &path ) { +void KTestMenu::slotStartCopyJob( const TQString &path ) { KURL url = KURL::fromPathOrURL( path ); KIO::CopyJob *copy; copy = KIO::copy( popup->popupURLList(), url); copy->setAutoErrorHandlingEnabled( true ); } -void KTestMenu::slotStartMoveJob( const QString &path) { +void KTestMenu::slotStartMoveJob( const TQString &path) { KURL url = KURL::fromPathOrURL( path ); KIO::CopyJob *move; move = KIO::move( popup->popupURLList(), url ); move->setAutoErrorHandlingEnabled( true ); } -void KTestMenu::slotFileTransfer( const QString &uid ) { +void KTestMenu::slotFileTransfer( const TQString &uid ) { m_imProxy->sendFile( uid, popup->popupURLList().first() ); } @@ -77,11 +77,11 @@ void KTestMenu::slotPrepareMenu( ) { // now it's time to set up the menu... // search for the dummy entry 'kuick_plugin' stores it index reomev it plug copy at the position KGlobal::locale()->insertCatalogue("kuick_plugin"); - bool isKDesktop = QCString( kapp->name() ) == "kdesktop"; + bool isKDesktop = TQCString( kapp->name() ) == "kdesktop"; for(int i= popup->count(); i >=1; i--) { int id = popup->idAt( i ); - QString text = popup->text( id ); + TQString text = popup->text( id ); if( text.contains("kuick_plugin") ) { popup->removeItem( id ); if (isKDesktop && !kapp->authorize("editable_desktop_icons")) @@ -95,18 +95,18 @@ void KTestMenu::slotPrepareMenu( ) { // now it's time to set up the menu... meta_copy_mmu = new KMetaMenu(popup, popup->url(), i18n("&Copy Here") , "kuick-copy", m_imProxy ); popup->insertItem(i18n("Copy To"), meta_copy_mmu, -1, i ); - connect( meta_copy_mmu, SIGNAL(fileChosen(const QString &) ), - SLOT(slotStartCopyJob(const QString & )) ); + connect( meta_copy_mmu, TQT_SIGNAL(fileChosen(const TQString &) ), + TQT_SLOT(slotStartCopyJob(const TQString & )) ); - connect( meta_copy_mmu, SIGNAL( contactChosen( const QString & ) ), - SLOT( slotFileTransfer( const QString & )) ); + connect( meta_copy_mmu, TQT_SIGNAL( contactChosen( const TQString & ) ), + TQT_SLOT( slotFileTransfer( const TQString & )) ); if( popup->protocolInfo().supportsMoving() ){ meta_move_mmu = new KMetaMenu(popup, popup->url(), i18n("&Move Here"), "kuick-move"); popup->insertItem(i18n("Move To"), meta_move_mmu, -1, i+1 ); - connect( meta_move_mmu, SIGNAL(fileChosen(const QString &) ), - SLOT(slotStartMoveJob(const QString & )) ); + connect( meta_move_mmu, TQT_SIGNAL(fileChosen(const TQString &) ), + TQT_SLOT(slotStartMoveJob(const TQString & )) ); } break; } diff --git a/konq-plugins/kuick/kuick_plugin.h b/konq-plugins/kuick/kuick_plugin.h index 15ffdcd..8369f7f 100644 --- a/konq-plugins/kuick/kuick_plugin.h +++ b/konq-plugins/kuick/kuick_plugin.h @@ -29,7 +29,7 @@ class KURL; class KTestMenu : public KonqPopupMenuPlugin { Q_OBJECT public: - KTestMenu (KonqPopupMenu *, const char *name, const QStringList &list); + KTestMenu (KonqPopupMenu *, const char *name, const TQStringList &list); virtual ~KTestMenu( ); KMetaMenu *meta_copy_mmu; KMetaMenu *meta_move_mmu; @@ -41,11 +41,11 @@ private: public slots: void slotPopupMaeh( ); - void slotStartCopyJob(const QString &path ); + void slotStartCopyJob(const TQString &path ); //void slotStartCopyJob(const KURL &url ); - void slotStartMoveJob(const QString &path ); + void slotStartMoveJob(const TQString &path ); //void slotStartMoveJob(const KURL &url ); - void slotFileTransfer( const QString &uid ); + void slotFileTransfer( const TQString &uid ); void slotPrepareMenu( ); }; |