summaryrefslogtreecommitdiffstats
path: root/konqueror/sidebar/trees
diff options
context:
space:
mode:
Diffstat (limited to 'konqueror/sidebar/trees')
-rw-r--r--konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp10
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp12
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_item.h2
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp4
-rw-r--r--konqueror/sidebar/trees/history_module/history_dlg.ui6
-rw-r--r--konqueror/sidebar/trees/history_module/history_item.cpp6
-rw-r--r--konqueror/sidebar/trees/history_module/history_item.h2
-rw-r--r--konqueror/sidebar/trees/history_module/history_module.cpp6
-rw-r--r--konqueror/sidebar/trees/history_module/history_settings.cpp8
-rw-r--r--konqueror/sidebar/trees/history_module/kcmhistory.cpp2
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.cpp18
-rw-r--r--konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp6
-rw-r--r--konqueror/sidebar/trees/konqsidebar_tree.cpp8
-rw-r--r--konqueror/sidebar/trees/konqsidebar_tree.h2
14 files changed, 46 insertions, 46 deletions
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index ce7940517..d1b5cc16e 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -16,7 +16,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqcursor.h>
#include <tqpopupmenu.h>
@@ -387,7 +387,7 @@ void KonqSidebarBookmarkModule::slotOpenTab()
else
return;
- DCOPRef ref(kapp->dcopClient()->appId(), tree()->topLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), tree()->tqtopLevelWidget()->name());
if (bookmark.isGroup()) {
KBookmarkGroup group = bookmark.toGroup();
@@ -412,9 +412,9 @@ void KonqSidebarBookmarkModule::slotCopyLocation()
if ( !bookmark.isGroup() )
{
- kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
+ kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
TQClipboard::Selection );
- kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
+ kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
TQClipboard::Clipboard );
}
}
@@ -490,7 +490,7 @@ void KonqSidebarBookmarkModule::fillGroup( KonqSidebarTreeItem * parentItem, KBo
item->setOpen(false);
}
else if ( bk.isSeparator() )
- item->setVisible( false );
+ item->tqsetVisible( false );
else
item->setExpandable( false );
}
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
index 7be8abbcd..989ef2a70 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
@@ -26,7 +26,7 @@
#include <kglobalsettings.h>
#include <kuserprofile.h>
#include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <kio/paste.h>
#include <tqfile.h>
#include <tqpainter.h>
@@ -108,7 +108,7 @@ bool KonqSidebarDirTreeItem::hasStandardIcon()
return m_fileItem->iconName() == "folder";
}
-void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
+void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment )
{
if (m_fileItem->isLink())
{
@@ -116,7 +116,7 @@ void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup
f.setItalic( TRUE );
_painter->setFont( f );
}
- TQListViewItem::paintCell( _painter, _cg, _column, _width, _alignment );
+ TQListViewItem::paintCell( _painter, _cg, _column, _width, _tqalignment );
}
KURL KonqSidebarDirTreeItem::externalURL() const
@@ -162,8 +162,8 @@ void KonqSidebarDirTreeItem::itemSelected()
if ( m_fileItem->url().directory(false) == KGlobalSettings::trashPath() )
bInTrash = true;
- TQMimeSource *data = TQApplication::clipboard()->data();
- bool paste = ( data->encodedData( data->format() ).size() != 0 );
+ TQMimeSource *data = TQApplication::tqclipboard()->data();
+ bool paste = ( data->tqencodedData( data->format() ).size() != 0 );
tree()->enableActions( true, true, paste, true && !bInTrash, true, true );
}
@@ -197,7 +197,7 @@ void KonqSidebarDirTreeItem::paste()
{
// move or not move ?
bool move = false;
- TQMimeSource *data = TQApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::tqclipboard()->data();
if ( data->provides( "application/x-kde-cutselection" ) ) {
move = KonqDrag::decodeIsCutSelection( data );
kdDebug(1201) << "move (from clipboard data) = " << move << endl;
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
index 050f19424..3a599c7e9 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
@@ -36,7 +36,7 @@ public:
virtual void setOpen( bool open );
- virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment );
+ virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment );
virtual bool acceptsDrops( const TQStrList & formats );
virtual void drop( TQDropEvent * ev );
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
index ac26b1285..b83926e21 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
@@ -357,7 +357,7 @@ void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item )
if (openItem)
{
// We have this directory listed already, just copy the entries as we
- // can't use the dirlister, it would invalidate the old entries
+ // can't use the dirlister, it would tqinvalidate the old entries
int size = KGlobal::iconLoader()->currentSize( KIcon::Small );
KonqSidebarTreeItem * parentItem = item;
KonqSidebarDirTreeItem *oldItem = static_cast<KonqSidebarDirTreeItem *> (openItem->firstChild());
@@ -574,7 +574,7 @@ void KonqSidebarDirTreeModule::slotListingStopped( const KURL & url )
if ( item->childCount() == 0 )
{
item->setExpandable( false );
- item->repaint();
+ item->tqrepaint();
}
m_pTree->stopAnimation( item );
diff --git a/konqueror/sidebar/trees/history_module/history_dlg.ui b/konqueror/sidebar/trees/history_module/history_dlg.ui
index 225920387..a90c1c49e 100644
--- a/konqueror/sidebar/trees/history_module/history_dlg.ui
+++ b/konqueror/sidebar/trees/history_module/history_dlg.ui
@@ -40,7 +40,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>240</width>
<height>16</height>
@@ -193,7 +193,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>418</width>
<height>0</height>
@@ -212,7 +212,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>30</height>
diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp
index 0d31551f9..02e77c526 100644
--- a/konqueror/sidebar/trees/history_module/history_item.cpp
+++ b/konqueror/sidebar/trees/history_module/history_item.cpp
@@ -126,10 +126,10 @@ TQString KonqSidebarHistoryItem::toolTipText() const
}
void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg,
- int column, int width, int alignment )
+ int column, int width, int tqalignment )
{
TQDateTime dt;
- TQDateTime current = TQDateTime::currentDateTime();
+ TQDateTime current = TQDateTime::tqcurrentDateTime();
if ( s_settings->m_metricYoungerThan == KonqSidebarHistorySettings::DAYS )
dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueYoungerThan ));
@@ -149,7 +149,7 @@ void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg,
p->setFont( s_settings->m_fontOlderThan );
}
- KonqSidebarTreeItem::paintCell( p, cg, column, width, alignment );
+ KonqSidebarTreeItem::paintCell( p, cg, column, width, tqalignment );
}
///////////////////////////////////////////////////////////////////
diff --git a/konqueror/sidebar/trees/history_module/history_item.h b/konqueror/sidebar/trees/history_module/history_item.h
index 1c6c7c4c4..0ddc7ae4e 100644
--- a/konqueror/sidebar/trees/history_module/history_item.h
+++ b/konqueror/sidebar/trees/history_module/history_item.h
@@ -60,7 +60,7 @@ public:
static void setSettings( KonqSidebarHistorySettings *s ) { s_settings = s; }
virtual void paintCell( TQPainter *, const TQColorGroup & cg, int column,
- int width, int alignment );
+ int width, int tqalignment );
private:
const KonqHistoryEntry *m_entry;
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index a7fd943ca..a29a2fe0c 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -54,7 +54,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
connect( s_settings, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( slotSettingsChanged() ));
m_dict.setAutoDelete( true );
- m_currentTime = TQDateTime::currentDateTime();
+ m_currentTime = TQDateTime::tqcurrentDateTime();
KConfig *kc = KGlobal::config();
KConfigGroupSaver cs( kc, "HistorySettings" );
@@ -132,7 +132,7 @@ void KonqSidebarHistoryModule::slotCreateItems()
KonqHistoryEntry *entry;
KonqHistoryList entries( KonqHistoryManager::kself()->entries() );
KonqHistoryIterator it( entries );
- m_currentTime = TQDateTime::currentDateTime();
+ m_currentTime = TQDateTime::tqcurrentDateTime();
// the group item and the item of the serverroot '/' get a fav-icon
// if available. All others get the protocol icon.
@@ -171,7 +171,7 @@ void KonqSidebarHistoryModule::slotEntryAdded( const KonqHistoryEntry *entry )
if ( !m_initialized )
return;
- m_currentTime = TQDateTime::currentDateTime();
+ m_currentTime = TQDateTime::tqcurrentDateTime();
KonqSidebarHistoryGroupItem *group = getGroupItem( entry->url );
KonqSidebarHistoryItem *item = group->findChild( entry );
if ( !item )
diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp
index 6871415a0..20ca214d4 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.cpp
+++ b/konqueror/sidebar/trees/history_module/history_settings.cpp
@@ -56,8 +56,8 @@ void KonqSidebarHistorySettings::readSettings(bool global)
m_valueYoungerThan = config->readNumEntry("Value youngerThan", 1 );
m_valueOlderThan = config->readNumEntry("Value olderThan", 2 );
- TQString minutes = TQString::fromLatin1("minutes");
- TQString days = TQString::fromLatin1("days");
+ TQString minutes = TQString::tqfromLatin1("minutes");
+ TQString days = TQString::tqfromLatin1("days");
TQString metric = config->readEntry("Metric youngerThan", days );
m_metricYoungerThan = (metric == days) ? DAYS : MINUTES;
metric = config->readEntry("Metric olderThan", days );
@@ -83,8 +83,8 @@ void KonqSidebarHistorySettings::applySettings()
config->writeEntry("Value youngerThan", m_valueYoungerThan );
config->writeEntry("Value olderThan", m_valueOlderThan );
- TQString minutes = TQString::fromLatin1("minutes");
- TQString days = TQString::fromLatin1("days");
+ TQString minutes = TQString::tqfromLatin1("minutes");
+ TQString days = TQString::tqfromLatin1("days");
config->writeEntry("Metric youngerThan", m_metricYoungerThan == DAYS ?
days : minutes );
config->writeEntry("Metric olderThan", m_metricOlderThan == DAYS ?
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index ef2466111..532e3a164 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -22,7 +22,7 @@
#include <tqcheckbox.h>
#include <tqcombobox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqradiobutton.h>
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index 2eb2c31cd..99c22e148 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -20,7 +20,7 @@
#include "konq_sidebartreemodule.h"
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqcursor.h>
#include <tqdir.h>
#include <tqheader.h>
@@ -516,7 +516,7 @@ void KonqSidebarTree::slotAutoOpenFolder()
return;
m_dropItem->setOpen( true );
- m_dropItem->repaint();
+ m_dropItem->tqrepaint();
}
void KonqSidebarTree::rescanConfiguration()
@@ -606,7 +606,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path
// Version 5 includes the audiocd browser
// Version 6 includes the printmanager and lan browser
const int currentVersion = 6;
- TQString key = TQString::fromLatin1("X-KDE-DirTreeVersionNumber");
+ TQString key = TQString::tqfromLatin1("X-KDE-DirTreeVersionNumber");
KSimpleConfig versionCfg( path + "/.directory" );
int versionNumber = versionCfg.readNumEntry( key, 1 );
kdDebug(1201) << "KonqSidebarTree::scanDir found version " << versionNumber << endl;
@@ -813,7 +813,7 @@ void KonqSidebarTree::slotAnimation()
for (; it != end; ++it )
{
uint & iconNumber = it.data().iconNumber;
- TQString icon = TQString::fromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) );
+ TQString icon = TQString::tqfromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) );
it.key()->setPixmap( 0, SmallIcon( icon));
iconNumber++;
@@ -882,7 +882,7 @@ void KonqSidebarTree::enableActions( bool copy, bool cut, bool paste,
bool KonqSidebarTree::tabSupport()
{
// see if the newTab() dcop function is available (i.e. the sidebar is embedded into konqueror)
- DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), tqtopLevelWidget()->name());
DCOPReply reply = ref.call("functions()");
if (reply.isValid()) {
QCStringList funcs;
@@ -1023,7 +1023,7 @@ void KonqSidebarTree::slotOpenNewWindow()
void KonqSidebarTree::slotOpenTab()
{
if (!m_currentTopLevelItem) return;
- DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), tqtopLevelWidget()->name());
ref.call( "newTab(TQString)", m_currentTopLevelItem->externalURL().url() );
}
@@ -1031,8 +1031,8 @@ void KonqSidebarTree::slotCopyLocation()
{
if (!m_currentTopLevelItem) return;
KURL url = m_currentTopLevelItem->externalURL();
- kapp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Selection );
- kapp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Clipboard );
+ kapp->tqclipboard()->setData( new KURLDrag(url, 0), TQClipboard::Selection );
+ kapp->tqclipboard()->setData( new KURLDrag(url, 0), TQClipboard::Clipboard );
}
///////////////////////////////////////////////////////////////////
@@ -1045,7 +1045,7 @@ void KonqSidebarTreeToolTip::maybeTip( const TQPoint &point )
if ( item ) {
TQString text = static_cast<KonqSidebarTreeItem*>( item )->toolTipText();
if ( !text.isEmpty() )
- tip ( m_view->itemRect( item ), text );
+ tip ( m_view->tqitemRect( item ), text );
}
}
diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
index 2be917f63..70e3d0df0 100644
--- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
@@ -26,7 +26,7 @@
#include <kurldrag.h>
#include <kmimetype.h>
#include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqcursor.h>
#include <konq_drag.h>
@@ -50,7 +50,7 @@ void KonqSidebarTreeTopLevelItem::setOpen( bool open )
void KonqSidebarTreeTopLevelItem::itemSelected()
{
kdDebug() << "KonqSidebarTreeTopLevelItem::itemSelected" << endl;
- TQMimeSource *data = TQApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::tqclipboard()->data();
bool paste = m_bTopLevelGroup && data->provides("text/uri-list");
tree()->enableActions( true, true, paste, true, true, true /*rename*/ );
}
@@ -157,7 +157,7 @@ void KonqSidebarTreeTopLevelItem::paste()
{
// move or not move ?
bool move = false;
- TQMimeSource *data = TQApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::tqclipboard()->data();
if ( data->provides( "application/x-kde-cutselection" ) ) {
move = KonqDrag::decodeIsCutSelection( data );
kdDebug(1201) << "move (from clipboard data) = " << move << endl;
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index 96de18f99..3e18366ab 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -8,7 +8,7 @@
#include <kiconloader.h>
#include <klistviewsearchline.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqdragobject.h>
#include <tqtoolbutton.h>
#include <tqvbox.h>
@@ -76,14 +76,14 @@ void KonqSidebar_Tree::cut()
{
TQDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L, true );
if (drag)
- TQApplication::clipboard()->setData( drag );
+ TQApplication::tqclipboard()->setData( drag );
}
void KonqSidebar_Tree::copy()
{
TQDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L );
if (drag)
- TQApplication::clipboard()->setData( drag );
+ TQApplication::tqclipboard()->setData( drag );
}
void KonqSidebar_Tree::paste()
@@ -150,7 +150,7 @@ extern "C"
{
int id=names.findIndex( item );
if (id==-1) return false;
- KSimpleConfig ksc2(*list.at(id));
+ KSimpleConfig ksc2(*list.tqat(id));
ksc2.setGroup("Desktop Entry");
map->insert("Type","Link");
map->insert("Icon",ksc2.readEntry("Icon"));
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.h b/konqueror/sidebar/trees/konqsidebar_tree.h
index 03d473a86..06f6b16b5 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.h
+++ b/konqueror/sidebar/trees/konqsidebar_tree.h
@@ -2,7 +2,7 @@
#define _konq_sidebar_test_h_
#include <konqsidebarplugin.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <kparts/part.h>
#include <kparts/factory.h>
#include <kparts/browserextension.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 19:58:48 +0000