summaryrefslogtreecommitdiffstats
path: root/konqueror/sidebar
diff options
context:
space:
mode:
Diffstat (limited to 'konqueror/sidebar')
-rw-r--r--konqueror/sidebar/konqsidebar.cpp2
-rw-r--r--konqueror/sidebar/sidebar_widget.cpp30
-rw-r--r--konqueror/sidebar/sidebar_widget.h2
-rw-r--r--konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp4
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp2
-rw-r--r--konqueror/sidebar/trees/history_module/history_dlg.ui6
-rw-r--r--konqueror/sidebar/trees/history_module/history_item.cpp2
-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/konq_sidebartree.cpp10
10 files changed, 36 insertions, 36 deletions
diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp
index 271150338..29f8de794 100644
--- a/konqueror/sidebar/konqsidebar.cpp
+++ b/konqueror/sidebar/konqsidebar.cpp
@@ -30,7 +30,7 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName,
setInstance( KonqSidebarFactory::instance() );
m_extension = 0;
// this should be your custom internal widget
- m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->tqtopLevelWidget()->property("currentProfile").toString() );
+ m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->topLevelWidget()->property("currentProfile").toString() );
m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" );
connect(m_widget,TQT_SIGNAL(started(KIO::Job *)),
this, TQT_SIGNAL(started(KIO::Job*)));
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index e97c42c3f..6f178543a 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -252,7 +252,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
m_buttons.setAutoDelete(true);
m_hasStoredUrl = false;
m_latestViewed = -1;
- tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+ setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
TQSplitter *splitterWidget = splitter();
if (splitterWidget) {
@@ -262,7 +262,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
}
m_area = new KDockArea(this);
- m_area->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+ m_area->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
m_mainDockWidget = m_area->createDockWidget("free", 0);
m_mainDockWidget->setWidget(new TQWidget(m_mainDockWidget));
m_area->setMainDockWidget(m_mainDockWidget);
@@ -675,7 +675,7 @@ void Sidebar_Widget::stdAction(const char *handlestd)
kdDebug() << "Try calling >active< module's (" << mod->module->className() << ") slot " << handlestd << endl;
- int id = mod->module->tqmetaObject()->findSlot( handlestd );
+ int id = mod->module->metaObject()->findSlot( handlestd );
if ( id == -1 )
return;
kdDebug() << "Action slot was found, it will be called now" << endl;
@@ -1049,7 +1049,7 @@ void Sidebar_Widget::collapseExpandSidebar()
if (m_visibleViews.count()==0)
{
m_somethingVisible = false;
- parentWidget()->setMaximumWidth(tqminimumSizeHint().width());
+ parentWidget()->setMaximumWidth(minimumSizeHint().width());
updateGeometry();
emit panelHasBeenExpanded(false);
} else {
@@ -1060,11 +1060,11 @@ void Sidebar_Widget::collapseExpandSidebar()
}
}
-TQSize Sidebar_Widget::tqsizeHint() const
+TQSize Sidebar_Widget::sizeHint() const
{
if (m_somethingVisible)
return TQSize(m_savedWidth,200);
- return tqminimumSizeHint();
+ return minimumSizeHint();
}
void Sidebar_Widget::dockWidgetHasUndocked(KDockWidget* wid)
@@ -1195,50 +1195,50 @@ void Sidebar_Widget::popupMenu( KXMLGUIClient *client,
void Sidebar_Widget::connectModule(TQObject *mod)
{
- if (mod->tqmetaObject()->findSignal("started(KIO::Job*)") != -1) {
+ if (mod->metaObject()->findSignal("started(KIO::Job*)") != -1) {
connect(mod,TQT_SIGNAL(started(KIO::Job *)),this, TQT_SIGNAL(started(KIO::Job*)));
}
- if (mod->tqmetaObject()->findSignal("completed()") != -1) {
+ if (mod->metaObject()->findSignal("completed()") != -1) {
connect(mod,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed()));
}
- if (mod->tqmetaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) {
+ if (mod->metaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) {
connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &,
const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const
TQPoint &, const KURL&, const TQString &, mode_t)));
}
- if (mod->tqmetaObject()->findSignal("popupMenu(KXMLGUIClient*,const " TQPOINT_OBJECT_NAME_STRING " &,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) {
+ if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const " TQPOINT_OBJECT_NAME_STRING " &,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) {
connect(mod,TQT_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &,
const KURL &,const TQString &, mode_t)),this,
TQT_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &,
const KURL &,const TQString &, mode_t)));
}
- if (mod->tqmetaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KFileItemList&)") != -1) {
+ if (mod->metaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KFileItemList&)") != -1) {
connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )),
this,TQT_SLOT(popupMenu( const TQPoint &, const KFileItemList & )));
}
- if (mod->tqmetaObject()->findSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) {
+ if (mod->metaObject()->findSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) {
connect(mod,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)),
this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
}
- if (mod->tqmetaObject()->findSignal("submitFormRequest(const char*,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQBYTEARRAY_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&)") != -1) {
+ if (mod->metaObject()->findSignal("submitFormRequest(const char*,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQBYTEARRAY_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&)") != -1) {
connect(mod,
TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
this,
TQT_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)));
}
- if (mod->tqmetaObject()->findSignal("enableAction(const char*,bool)") != -1) {
+ if (mod->metaObject()->findSignal("enableAction(const char*,bool)") != -1) {
connect(mod,TQT_SIGNAL(enableAction( const char *, bool)),
this,TQT_SLOT(enableAction(const char *, bool)));
}
- if (mod->tqmetaObject()->findSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) {
+ if (mod->metaObject()->findSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) {
connect(mod,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
this,TQT_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &)));
}
diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h
index dd7182a35..75975f35e 100644
--- a/konqueror/sidebar/sidebar_widget.h
+++ b/konqueror/sidebar/sidebar_widget.h
@@ -107,7 +107,7 @@ public:
void stdAction(const char *handlestd);
//virtual KParts::ReadOnlyPart *getPart();
KParts::BrowserExtension *getExtension();
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
public slots:
void addWebSideBar(const KURL& url, const TQString& name);
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index d1b5cc16e..c55e71d7b 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -387,7 +387,7 @@ void KonqSidebarBookmarkModule::slotOpenTab()
else
return;
- DCOPRef ref(kapp->dcopClient()->appId(), tree()->tqtopLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), tree()->topLevelWidget()->name());
if (bookmark.isGroup()) {
KBookmarkGroup group = bookmark.toGroup();
@@ -490,7 +490,7 @@ void KonqSidebarBookmarkModule::fillGroup( KonqSidebarTreeItem * parentItem, KBo
item->setOpen(false);
}
else if ( bk.isSeparator() )
- item->tqsetVisible( false );
+ item->setVisible( 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 989ef2a70..0ceb93d13 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
@@ -163,7 +163,7 @@ void KonqSidebarDirTreeItem::itemSelected()
bInTrash = true;
TQMimeSource *data = TQApplication::tqclipboard()->data();
- bool paste = ( data->tqencodedData( data->format() ).size() != 0 );
+ bool paste = ( data->encodedData( data->format() ).size() != 0 );
tree()->enableActions( true, true, paste, true && !bInTrash, true, true );
}
diff --git a/konqueror/sidebar/trees/history_module/history_dlg.ui b/konqueror/sidebar/trees/history_module/history_dlg.ui
index a90c1c49e..225920387 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="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>240</width>
<height>16</height>
@@ -193,7 +193,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>418</width>
<height>0</height>
@@ -212,7 +212,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<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 02e77c526..ad2d2a7e2 100644
--- a/konqueror/sidebar/trees/history_module/history_item.cpp
+++ b/konqueror/sidebar/trees/history_module/history_item.cpp
@@ -129,7 +129,7 @@ void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg,
int column, int width, int tqalignment )
{
TQDateTime dt;
- TQDateTime current = TQDateTime::tqcurrentDateTime();
+ TQDateTime current = TQDateTime::currentDateTime();
if ( s_settings->m_metricYoungerThan == KonqSidebarHistorySettings::DAYS )
dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueYoungerThan ));
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index a29a2fe0c..a7fd943ca 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::tqcurrentDateTime();
+ m_currentTime = TQDateTime::currentDateTime();
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::tqcurrentDateTime();
+ m_currentTime = TQDateTime::currentDateTime();
// 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::tqcurrentDateTime();
+ m_currentTime = TQDateTime::currentDateTime();
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 20ca214d4..6871415a0 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::tqfromLatin1("minutes");
- TQString days = TQString::tqfromLatin1("days");
+ TQString minutes = TQString::fromLatin1("minutes");
+ TQString days = TQString::fromLatin1("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::tqfromLatin1("minutes");
- TQString days = TQString::tqfromLatin1("days");
+ TQString minutes = TQString::fromLatin1("minutes");
+ TQString days = TQString::fromLatin1("days");
config->writeEntry("Metric youngerThan", m_metricYoungerThan == DAYS ?
days : minutes );
config->writeEntry("Metric olderThan", m_metricOlderThan == DAYS ?
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index 99c22e148..7755286bc 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -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::tqfromLatin1("X-KDE-DirTreeVersionNumber");
+ TQString key = TQString::fromLatin1("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::tqfromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) );
+ TQString icon = TQString::fromLatin1( 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(), tqtopLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->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(), tqtopLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name());
ref.call( "newTab(TQString)", m_currentTopLevelItem->externalURL().url() );
}
@@ -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->tqitemRect( item ), text );
+ tip ( m_view->itemRect( item ), text );
}
}