summaryrefslogtreecommitdiffstats
path: root/kicker/menuext/konsole
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:33:34 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:33:34 +0000
commitc663b6440964f6ac48027143ac9e63298991f9d0 (patch)
tree6d8b0c5a5f9db1ee16acf98b1397cea9126b281d /kicker/menuext/konsole
parenta061f7191beebb0e4a3b0c0a7c534ec5f22f2dc7 (diff)
downloadtdebase-c663b6440964f6ac48027143ac9e63298991f9d0.tar.gz
tdebase-c663b6440964f6ac48027143ac9e63298991f9d0.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/menuext/konsole')
-rw-r--r--kicker/menuext/konsole/konsole_mnu.cpp68
-rw-r--r--kicker/menuext/konsole/konsole_mnu.h12
-rw-r--r--kicker/menuext/konsole/konsolebookmarkhandler.cpp48
-rw-r--r--kicker/menuext/konsole/konsolebookmarkhandler.h24
-rw-r--r--kicker/menuext/konsole/konsolebookmarkmenu.cpp38
-rw-r--r--kicker/menuext/konsole/konsolebookmarkmenu.h8
6 files changed, 99 insertions, 99 deletions
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index 87df6f268..afd1127f6 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -27,8 +27,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <unistd.h>
#include <sys/stat.h>
-#include <qdir.h>
-#include <qfileinfo.h>
+#include <tqdir.h>
+#include <tqfileinfo.h>
#include <kapplication.h>
#include <kglobal.h>
@@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
K_EXPORT_KICKER_MENUEXT(konsole, KonsoleMenu)
-KonsoleMenu::KonsoleMenu(QWidget *parent, const char *name, const QStringList& /* args */)
+KonsoleMenu::KonsoleMenu(TQWidget *parent, const char *name, const TQStringList& /* args */)
: KPanelMenu("", parent, name),
m_profileMenu(0),
m_bookmarksSession(0),
@@ -58,8 +58,8 @@ KonsoleMenu::~KonsoleMenu()
}
static void insertItemSorted(KPopupMenu *menu,
- const QIconSet &iconSet,
- const QString &txt, int id)
+ const TQIconSet &iconSet,
+ const TQString &txt, int id)
{
const int defaultId = 1; // The id of the 'new' item.
int index = menu->indexOf(defaultId);
@@ -96,17 +96,17 @@ void KonsoleMenu::initialize()
setInitialized(true);
- QStringList list = KGlobal::dirs()->findAllResources("data",
+ TQStringList list = KGlobal::dirs()->findAllResources("data",
"konsole/*.desktop",
false, true);
- QString defaultShell = locate("data", "konsole/shell.desktop");
+ TQString defaultShell = locate("data", "konsole/shell.desktop");
list.prepend(defaultShell);
int id = 1;
sessionList.clear();
- for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
+ for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
{
if ((*it == defaultShell) && (id != 1))
{
@@ -115,10 +115,10 @@ void KonsoleMenu::initialize()
KSimpleConfig conf(*it, true /* read only */);
conf.setDesktopGroup();
- QString text = conf.readEntry("Name");
+ TQString text = conf.readEntry("Name");
// try to locate the binary
- QString exec= conf.readPathEntry("Exec");
+ TQString exec= conf.readPathEntry("Exec");
if (exec.startsWith("su -c \'"))
{
exec = exec.mid(7,exec.length()-8);
@@ -126,7 +126,7 @@ void KonsoleMenu::initialize()
exec = KRun::binaryName(exec, false);
exec = KShell::tildeExpand(exec);
- QString pexec = KGlobal::dirs()->findExe(exec);
+ TQString pexec = KGlobal::dirs()->findExe(exec);
if (text.isEmpty() ||
conf.readEntry("Type") != "KonsoleApplication" ||
(!exec.isEmpty() && pexec.isEmpty()))
@@ -135,7 +135,7 @@ void KonsoleMenu::initialize()
}
insertItemSorted(this, SmallIconSet(conf.readEntry("Icon", "konsole")),
text, id++);
- QFileInfo fi(*it);
+ TQFileInfo fi(*it);
sessionList.append(fi.baseName(true));
if (id == 2)
@@ -150,27 +150,27 @@ void KonsoleMenu::initialize()
insertItem(SmallIconSet("keditbookmarks"),
i18n("New Session at Bookmark"), m_bookmarksSession);
connect(m_bookmarkHandlerSession,
- SIGNAL(openURL(const QString&, const QString&)),
- SLOT(newSession(const QString&, const QString&)));
+ TQT_SIGNAL(openURL(const TQString&, const TQString&)),
+ TQT_SLOT(newSession(const TQString&, const TQString&)));
screenList.clear();
- QCString screenDir = getenv("SCREENDIR");
+ TQCString screenDir = getenv("SCREENDIR");
if (screenDir.isEmpty())
{
- screenDir = QFile::encodeName(QDir::homeDirPath()) + "/.screen/";
+ screenDir = TQFile::encodeName(TQDir::homeDirPath()) + "/.screen/";
}
- QStringList sessions;
- // Can't use QDir as it doesn't support FIFOs :(
+ TQStringList sessions;
+ // Can't use TQDir as it doesn't support FIFOs :(
DIR *dir = opendir(screenDir);
if (dir)
{
struct dirent *entry;
while ((entry = readdir(dir)))
{
- QCString path = screenDir + "/" + entry->d_name;
+ TQCString path = screenDir + "/" + entry->d_name;
struct stat st;
if (stat(path, &st) != 0)
{
@@ -182,7 +182,7 @@ void KonsoleMenu::initialize()
(fd = open(path, O_WRONLY | O_NONBLOCK)) != -1)
{
::close(fd);
- screenList.append(QFile::decodeName(entry->d_name));
+ screenList.append(TQFile::decodeName(entry->d_name));
insertItem(SmallIconSet("konsole"),
i18n("Screen is a program controlling screens!",
"Screen at %1").arg(entry->d_name), id);
@@ -197,16 +197,16 @@ void KonsoleMenu::initialize()
delete m_profileMenu;
m_profileMenu = new KPopupMenu(this);
- QStringList profiles = KGlobal::dirs()->findAllResources("data",
+ TQStringList profiles = KGlobal::dirs()->findAllResources("data",
"konsole/profiles/*",
false, true );
m_profiles.resize(profiles.count());
- QStringList::ConstIterator pEnd = profiles.end();
- for (QStringList::ConstIterator pIt = profiles.begin(); pIt != pEnd; ++pIt)
+ TQStringList::ConstIterator pEnd = profiles.end();
+ for (TQStringList::ConstIterator pIt = profiles.begin(); pIt != pEnd; ++pIt)
{
- QFileInfo info(*pIt);
- QString profileName = KIO::decodeFileName(info.baseName());
- QString niceName = profileName;
+ TQFileInfo info(*pIt);
+ TQString profileName = KIO::decodeFileName(info.baseName());
+ TQString niceName = profileName;
KSimpleConfig cfg(*pIt, true);
if (cfg.hasGroup("Profile"))
{
@@ -229,11 +229,11 @@ void KonsoleMenu::initialize()
// we don't have any profiles, disable the menu
setItemEnabled(profileID, false);
}
- connect(m_profileMenu, SIGNAL(activated(int)), SLOT(launchProfile(int)));
+ connect(m_profileMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(launchProfile(int)));
insertSeparator();
insertItem(SmallIconSet("reload"),
- i18n("Reload Sessions"), this, SLOT(reinitialize()));
+ i18n("Reload Sessions"), this, TQT_SLOT(reinitialize()));
}
void KonsoleMenu::slotExec(int id)
@@ -245,7 +245,7 @@ void KonsoleMenu::slotExec(int id)
--id;
kapp->propagateSessionManager();
- QStringList args;
+ TQStringList args;
if (static_cast<unsigned int>(id) < sessionList.count())
{
args << "--type";
@@ -271,7 +271,7 @@ void KonsoleMenu::launchProfile(int id)
--id;
// this is a session, not a bookmark, so execute that instead
- QStringList args;
+ TQStringList args;
args << "--profile" << m_profiles[id];
kapp->kdeinitExec("konsole", args);
}
@@ -283,9 +283,9 @@ KURL KonsoleMenu::baseURL() const
return url;
}
-void KonsoleMenu::newSession(const QString& sURL, const QString& title)
+void KonsoleMenu::newSession(const TQString& sURL, const TQString& title)
{
- QStringList args;
+ TQStringList args;
KURL url = KURL(sURL);
if ((url.protocol() == "file") && (url.hasPath()))
@@ -297,8 +297,8 @@ void KonsoleMenu::newSession(const QString& sURL, const QString& title)
}
else if ((!url.protocol().isEmpty()) && (url.hasHost()))
{
- QString protocol = url.protocol();
- QString host = url.host();
+ TQString protocol = url.protocol();
+ TQString host = url.host();
args << "-T" << title;
args << "-e" << protocol.latin1(); /* argv[0] == command to run. */
if (url.hasUser()) {
diff --git a/kicker/menuext/konsole/konsole_mnu.h b/kicker/menuext/konsole/konsole_mnu.h
index 988764124..e64c53212 100644
--- a/kicker/menuext/konsole/konsole_mnu.h
+++ b/kicker/menuext/konsole/konsole_mnu.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef _konsole_mnu_h_
#define _konsole_mnu_h_
-#include <qvaluevector.h>
+#include <tqvaluevector.h>
#include <kpanelmenu.h>
#include <klibloader.h>
@@ -38,7 +38,7 @@ class KonsoleMenu : public KPanelMenu/*, public KPReloadObject*/
Q_OBJECT
public:
- KonsoleMenu(QWidget *parent, const char *name, const QStringList& /* args */);
+ KonsoleMenu(TQWidget *parent, const char *name, const TQStringList& /* args */);
~KonsoleMenu();
KURL baseURL() const;
@@ -47,13 +47,13 @@ protected slots:
void slotExec(int id);
void launchProfile(int id);
void initialize();
- void newSession(const QString& sURL, const QString& title);
+ void newSession(const TQString& sURL, const TQString& title);
private:
- QStringList sessionList;
- QStringList screenList;
- QValueVector<QString> m_profiles;
+ TQStringList sessionList;
+ TQStringList screenList;
+ TQValueVector<TQString> m_profiles;
KPopupMenu* m_profileMenu;
KPopupMenu* m_bookmarksSession;
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
index c9f8e2806..46967b54c 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
@@ -3,7 +3,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <qtextstream.h>
+#include <tqtextstream.h>
#include <kbookmarkimporter.h>
#include <kmimetype.h>
@@ -16,20 +16,20 @@
#include "konsolebookmarkhandler.h"
KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool )
- : QObject( konsole, "KonsoleBookmarkHandler" ),
+ : TQObject( konsole, "KonsoleBookmarkHandler" ),
KBookmarkOwner(),
m_konsole( konsole ),
m_importStream( 0L )
{
m_menu = new KPopupMenu( konsole, "bookmark menu" );
- QString file = locate( "data", "konsole/bookmarks.xml" );
+ TQString file = locate( "data", "konsole/bookmarks.xml" );
if ( file.isEmpty() )
file = locateLocal( "data", "konsole/bookmarks.xml" );
// import old bookmarks
if ( !KStandardDirs::exists( file ) ) {
- QString oldFile = locate( "data", "kfile/bookmarks.html" );
+ TQString oldFile = locate( "data", "kfile/bookmarks.html" );
if ( !oldFile.isEmpty() )
importOldBookmarks( oldFile, file );
}
@@ -38,20 +38,20 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool )
manager->setUpdate( true );
manager->setShowNSBookmarks( false );
- connect( manager, SIGNAL( changed(const QString &, const QString &) ),
- SLOT( slotBookmarksChanged(const QString &, const QString &) ) );
+ connect( manager, TQT_SIGNAL( changed(const TQString &, const TQString &) ),
+ TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) );
m_bookmarkMenu = new KonsoleBookmarkMenu( manager, this, m_menu,
NULL, false, /*Not toplevel*/
false /*No 'Add Bookmark'*/ );
}
-QString KonsoleBookmarkHandler::currentURL() const
+TQString KonsoleBookmarkHandler::currentURL() const
{
return m_konsole->baseURL().url();
}
-void KonsoleBookmarkHandler::importOldBookmarks( const QString& path,
- const QString& destinationPath )
+void KonsoleBookmarkHandler::importOldBookmarks( const TQString& path,
+ const TQString& destinationPath )
{
KSaveFile file( destinationPath );
if ( file.status() != 0 )
@@ -62,13 +62,13 @@ void KonsoleBookmarkHandler::importOldBookmarks( const QString& path,
KNSBookmarkImporter importer( path );
connect( &importer,
- SIGNAL( newBookmark( const QString&, const QCString&, const QString& )),
- SLOT( slotNewBookmark( const QString&, const QCString&, const QString& )));
+ TQT_SIGNAL( newBookmark( const TQString&, const TQCString&, const TQString& )),
+ TQT_SLOT( slotNewBookmark( const TQString&, const TQCString&, const TQString& )));
connect( &importer,
- SIGNAL( newFolder( const QString&, bool, const QString& )),
- SLOT( slotNewFolder( const QString&, bool, const QString& )));
- connect( &importer, SIGNAL( newSeparator() ), SLOT( newSeparator() ));
- connect( &importer, SIGNAL( endMenu() ), SLOT( endMenu() ));
+ TQT_SIGNAL( newFolder( const TQString&, bool, const TQString& )),
+ TQT_SLOT( slotNewFolder( const TQString&, bool, const TQString& )));
+ connect( &importer, TQT_SIGNAL( newSeparator() ), TQT_SLOT( newSeparator() ));
+ connect( &importer, TQT_SIGNAL( endMenu() ), TQT_SLOT( endMenu() ));
importer.parseNSBookmarks( false );
@@ -78,24 +78,24 @@ void KonsoleBookmarkHandler::importOldBookmarks( const QString& path,
m_importStream = 0L;
}
-void KonsoleBookmarkHandler::slotNewBookmark( const QString& /*text*/,
- const QCString& url,
- const QString& additionalInfo )
+void KonsoleBookmarkHandler::slotNewBookmark( const TQString& /*text*/,
+ const TQCString& url,
+ const TQString& additionalInfo )
{
*m_importStream << "<bookmark icon=\"" << KMimeType::iconForURL( KURL( url ) );
- *m_importStream << "\" href=\"" << QString::fromUtf8(url) << "\">\n";
- *m_importStream << "<title>" << (additionalInfo.isEmpty() ? QString::fromUtf8(url) : additionalInfo) << "</title>\n</bookmark>\n";
+ *m_importStream << "\" href=\"" << TQString::fromUtf8(url) << "\">\n";
+ *m_importStream << "<title>" << (additionalInfo.isEmpty() ? TQString::fromUtf8(url) : additionalInfo) << "</title>\n</bookmark>\n";
}
-void KonsoleBookmarkHandler::slotNewFolder( const QString& text, bool /*open*/,
- const QString& /*additionalInfo*/ )
+void KonsoleBookmarkHandler::slotNewFolder( const TQString& text, bool /*open*/,
+ const TQString& /*additionalInfo*/ )
{
*m_importStream << "<folder icon=\"bookmark_folder\">\n<title=\"";
*m_importStream << text << "\">\n";
}
-void KonsoleBookmarkHandler::slotBookmarksChanged( const QString &,
- const QString & )
+void KonsoleBookmarkHandler::slotBookmarksChanged( const TQString &,
+ const TQString & )
{
// This is called when someone changes bookmarks in konsole....
m_bookmarkMenu->slotBookmarksChanged("");
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.h b/kicker/menuext/konsole/konsolebookmarkhandler.h
index b22f0d03d..eed2c00d6 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.h
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.h
@@ -12,42 +12,42 @@ class KPopupMenu;
class KonsoleBookmarkMenu;
class KonsoleMenu;
-class KonsoleBookmarkHandler : public QObject, public KBookmarkOwner
+class KonsoleBookmarkHandler : public TQObject, public KBookmarkOwner
{
Q_OBJECT
public:
KonsoleBookmarkHandler( KonsoleMenu *konsole, bool toplevel );
- QPopupMenu * popupMenu();
+ TQPopupMenu * popupMenu();
// KBookmarkOwner interface:
- virtual void openBookmarkURL( const QString& url, const QString& title )
+ virtual void openBookmarkURL( const TQString& url, const TQString& title )
{ emit openURL( url, title ); }
- virtual QString currentURL() const;
+ virtual TQString currentURL() const;
KPopupMenu *menu() const { return m_menu; }
signals:
- void openURL( const QString& url, const QString& title );
+ void openURL( const TQString& url, const TQString& title );
private slots:
// for importing
- void slotNewBookmark( const QString& text, const QCString& url,
- const QString& additionalInfo );
- void slotNewFolder( const QString& text, bool open,
- const QString& additionalInfo );
- void slotBookmarksChanged( const QString &, const QString & caller );
+ void slotNewBookmark( const TQString& text, const TQCString& url,
+ const TQString& additionalInfo );
+ void slotNewFolder( const TQString& text, bool open,
+ const TQString& additionalInfo );
+ void slotBookmarksChanged( const TQString &, const TQString & caller );
void newSeparator();
void endFolder();
private:
- void importOldBookmarks( const QString& path, const QString& destinationPath );
+ void importOldBookmarks( const TQString& path, const TQString& destinationPath );
KonsoleMenu *m_konsole;
KPopupMenu *m_menu;
KonsoleBookmarkMenu *m_bookmarkMenu;
- QTextStream *m_importStream;
+ TQTextStream *m_importStream;
protected:
virtual void virtual_hook( int id, void* data );
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
index b10d26c40..1a31fe55c 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
@@ -1,7 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <qtextstream.h>
+#include <tqtextstream.h>
#include <kbookmarkimporter.h>
#include <kmimetype.h>
@@ -14,7 +14,7 @@
#include "konsolebookmarkmenu.h"
#include "konsolebookmarkhandler.h"
-#include <qfile.h>
+#include <tqfile.h>
#include <kaction.h>
#include <klocale.h>
@@ -23,7 +23,7 @@
KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr,
KonsoleBookmarkHandler * _owner, KPopupMenu * _parentMenu,
KActionCollection *collec, bool _isRoot, bool _add,
- const QString & parentAddress )
+ const TQString & parentAddress )
: KBookmarkMenu( mgr, _owner, _parentMenu, collec, _isRoot, _add,
parentAddress),
m_kOwner(_owner)
@@ -31,14 +31,14 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr,
/*
* First, we disconnect KBookmarkMenu::slotAboutToShow()
* Then, we connect KonsoleBookmarkMenu::slotAboutToShow().
- * They are named differently because the SLOT() macro thinks we want
+ * They are named differently because the TQT_SLOT() macro thinks we want
* KonsoleBookmarkMenu::KBookmarkMenu::slotAboutToShow()
* Could this be solved if slotAboutToShow() is virtual in KBookmarMenu?
*/
- disconnect( _parentMenu, SIGNAL( aboutToShow() ), this,
- SLOT( slotAboutToShow() ) );
- connect( _parentMenu, SIGNAL( aboutToShow() ),
- SLOT( slotAboutToShow2() ) );
+ disconnect( _parentMenu, TQT_SIGNAL( aboutToShow() ), this,
+ TQT_SLOT( slotAboutToShow() ) );
+ connect( _parentMenu, TQT_SIGNAL( aboutToShow() ),
+ TQT_SLOT( slotAboutToShow2() ) );
}
/*
@@ -64,7 +64,7 @@ void KonsoleBookmarkMenu::refill()
{
//kdDebug(1203) << "KBookmarkMenu::refill()" << endl;
m_lstSubMenus.clear();
- QPtrListIterator<KAction> it( m_actions );
+ TQPtrListIterator<KAction> it( m_actions );
for (; it.current(); ++it )
it.current()->unplug( m_parentMenu );
m_parentMenu->clear();
@@ -86,7 +86,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
addNewFolder();
if ( m_pManager->showNSBookmarks()
- && QFile::exists( KNSBookmarkImporter::netscapeBookmarksFile() ) )
+ && TQFile::exists( KNSBookmarkImporter::netscapeBookmarksFile() ) )
{
m_parentMenu->insertSeparator();
@@ -98,10 +98,10 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
KonsoleBookmarkMenu *subMenu = new KonsoleBookmarkMenu( m_pManager,
m_kOwner, actionMenu->popupMenu(),
m_actionCollection, false,
- m_bAddBookmark, QString::null );
+ m_bAddBookmark, TQString::null );
m_lstSubMenus.append(subMenu);
- connect( actionMenu->popupMenu(), SIGNAL(aboutToShow()), subMenu,
- SLOT(slotNSLoad()));
+ connect( actionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), subMenu,
+ TQT_SLOT(slotNSLoad()));
}
}
@@ -111,7 +111,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
for ( KBookmark bm = parentBookmark.first(); !bm.isNull();
bm = parentBookmark.next(bm) )
{
- QString text = bm.text();
+ TQString text = bm.text();
text.replace( '&', "&&" );
if ( !separatorInserted && m_bIsRoot) { // inserted before the first konq bookmark, to avoid the separator if no konq bookmark
m_parentMenu->insertSeparator();
@@ -128,7 +128,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
// kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl;
// create a normal URL item, with ID as a name
KAction * action = new KAction( text, bm.icon(), 0,
- this, SLOT( slotBookmarkSelected() ),
+ this, TQT_SLOT( slotBookmarkSelected() ),
m_actionCollection, bm.url().url().utf8() );
action->setStatusText( bm.url().prettyURL() );
@@ -163,21 +163,21 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
void KonsoleBookmarkMenu::slotBookmarkSelected()
{
KAction * a;
- QString b;
+ TQString b;
if ( !m_pOwner ) return; // this view doesn't handle bookmarks...
a = (KAction*)sender();
b = a->text();
- m_kOwner->openBookmarkURL( QString::fromUtf8(sender()->name()), /* URL */
+ m_kOwner->openBookmarkURL( TQString::fromUtf8(sender()->name()), /* URL */
( (KAction *)sender() )->text() /* Title */ );
}
void KonsoleBookmarkMenu::slotNSBookmarkSelected()
{
KAction *a;
- QString b;
+ TQString b;
- QString link(sender()->name()+8);
+ TQString link(sender()->name()+8);
a = (KAction*)sender();
b = a->text();
m_kOwner->openBookmarkURL( link, /*URL */
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.h b/kicker/menuext/konsole/konsolebookmarkmenu.h
index 65e87f0f5..681236708 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.h
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.h
@@ -1,9 +1,9 @@
#ifndef KONSOLEBOOKMARKMENU_H
#define KONSOLEBOOKMARKMENU_H
-#include <qptrlist.h>
-#include <qptrstack.h>
-#include <qobject.h>
+#include <tqptrlist.h>
+#include <tqptrstack.h>
+#include <tqobject.h>
#include <sys/types.h>
#include <kbookmark.h>
#include <kbookmarkmenu.h>
@@ -29,7 +29,7 @@ public:
KonsoleBookmarkMenu( KBookmarkManager* mgr,
KonsoleBookmarkHandler * _owner, KPopupMenu * _parentMenu,
KActionCollection *collec, bool _isRoot,
- bool _add = true, const QString & parentAddress = "");
+ bool _add = true, const TQString & parentAddress = "");
void fillBookmarkMenu();