summaryrefslogtreecommitdiffstats
path: root/konqueror
diff options
context:
space:
mode:
Diffstat (limited to 'konqueror')
-rw-r--r--konqueror/client/kfmclient.cpp2
-rw-r--r--konqueror/keditbookmarks/main.cpp2
-rw-r--r--konqueror/konq_main.cpp2
-rw-r--r--konqueror/konq_mainwindow.cpp16
-rw-r--r--konqueror/konq_view.cpp21
-rw-r--r--konqueror/preloader/preloader.cpp2
-rw-r--r--konqueror/sidebar/konqsidebarplugin.h2
-rw-r--r--konqueror/sidebar/sidebar_widget.h2
-rw-r--r--konqueror/sidebar/test/konqsidebartest.cpp2
-rw-r--r--konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp2
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp2
-rw-r--r--konqueror/sidebar/trees/history_module/history_module.cpp2
-rw-r--r--konqueror/sidebar/trees/konqsidebar_tree.cpp4
-rw-r--r--konqueror/sidebar/web_module/web_module.cpp4
14 files changed, 46 insertions, 19 deletions
diff --git a/konqueror/client/kfmclient.cpp b/konqueror/client/kfmclient.cpp
index 001734cdb..db9d40fd3 100644
--- a/konqueror/client/kfmclient.cpp
+++ b/konqueror/client/kfmclient.cpp
@@ -68,7 +68,7 @@ static const TDECmdLineOptions options[] =
TDECmdLineLastOption
};
-extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
+extern "C" TDE_EXPORT int kdemain( int argc, char **argv )
{
TDECmdLineArgs::init(argc, argv, appName, programName, description, version, false);
diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp
index 94e08a357..27c5b2ad5 100644
--- a/konqueror/keditbookmarks/main.cpp
+++ b/konqueror/keditbookmarks/main.cpp
@@ -110,7 +110,7 @@ static int askUser(TDEApplication &app, TQString filename, bool &readonly) {
#include <tdeactioncollection.h>
-extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
+extern "C" TDE_EXPORT int kdemain(int argc, char **argv) {
TDELocale::setMainCatalogue("konqueror");
TDEAboutData aboutData("keditbookmarks", I18N_NOOP("Bookmark Editor"), VERSION,
I18N_NOOP("Konqueror Bookmarks Editor"),
diff --git a/konqueror/konq_main.cpp b/konqueror/konq_main.cpp
index ee1fc71db..0f582d1a0 100644
--- a/konqueror/konq_main.cpp
+++ b/konqueror/konq_main.cpp
@@ -48,7 +48,7 @@ static const TDECmdLineOptions options[] =
TDECmdLineLastOption
};
-extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
+extern "C" TDE_EXPORT int kdemain( int argc, char **argv )
{
TDECmdLineArgs::init( argc, argv, KonqFactory::aboutData() );
diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp
index 01cbf5a52..1905f5771 100644
--- a/konqueror/konq_mainwindow.cpp
+++ b/konqueror/konq_mainwindow.cpp
@@ -3580,6 +3580,22 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
}
}
}
+
+ else if (ev->type() == TQEvent::MouseButtonRelease)
+ {
+ TQMouseEvent *mouseEv = static_cast<TQMouseEvent*>(ev);
+ switch (mouseEv->button())
+ {
+ case TQMouseEvent::HistoryBackButton:
+ slotBack();
+ return true;
+
+ case TQMouseEvent::HistoryForwardButton:
+ slotForward();
+ return true;
+ }
+ }
+
return KParts::MainWindow::eventFilter( obj, ev );
}
diff --git a/konqueror/konq_view.cpp b/konqueror/konq_view.cpp
index 0f809ccd1..c65537382 100644
--- a/konqueror/konq_view.cpp
+++ b/konqueror/konq_view.cpp
@@ -472,7 +472,7 @@ void KonqView::connectPart( )
m_pPart->widget()->installEventFilter( this );
- if (m_bBackRightClick && m_pPart->widget()->inherits("TQScrollView") )
+ if (m_pPart->widget()->inherits("TQScrollView"))
{
(static_cast<TQScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this );
}
@@ -1220,10 +1220,6 @@ void KonqView::reparseConfiguration()
bool b = KonqSettings::backRightClick();
if ( m_bBackRightClick != b )
{
- if (m_bBackRightClick && m_pPart->widget()->inherits("TQScrollView") )
- {
- (static_cast<TQScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this );
- }
enableBackRightClick( b );
}
}
@@ -1289,6 +1285,21 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
emit ext->openURLRequest( lstDragURLs.first() ); // this will call m_pMainWindow::slotOpenURLRequest delayed
}
+ else if (e->type() == TQEvent::MouseButtonRelease)
+ {
+ TQMouseEvent *mouseEvent = static_cast<TQMouseEvent*>(e);
+ switch (mouseEvent->button())
+ {
+ case TQMouseEvent::HistoryBackButton:
+ go(-1);
+ return true;
+
+ case TQMouseEvent::HistoryForwardButton:
+ go(1);
+ return true;
+ }
+ }
+
if ( m_bBackRightClick )
{
if ( e->type() == TQEvent::ContextMenu )
diff --git a/konqueror/preloader/preloader.cpp b/konqueror/preloader/preloader.cpp
index ecc6691da..fcfa4b4d0 100644
--- a/konqueror/preloader/preloader.cpp
+++ b/konqueror/preloader/preloader.cpp
@@ -143,7 +143,7 @@ void KonqyPreloader::unloadAllPreloaded()
}
extern "C"
-KDE_EXPORT KDEDModule *create_konqy_preloader( const TQCString& obj )
+TDE_EXPORT KDEDModule *create_konqy_preloader( const TQCString& obj )
{
return new KonqyPreloader( obj );
}
diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h
index 367e7324d..7941fb1c9 100644
--- a/konqueror/sidebar/konqsidebarplugin.h
+++ b/konqueror/sidebar/konqsidebarplugin.h
@@ -30,7 +30,7 @@
class KonqSidebarPluginPrivate;
-class KDE_EXPORT KonqSidebarPlugin : public TQObject
+class TDE_EXPORT KonqSidebarPlugin : public TQObject
{
TQ_OBJECT
public:
diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h
index 391db5101..7e31004ad 100644
--- a/konqueror/sidebar/sidebar_widget.h
+++ b/konqueror/sidebar/sidebar_widget.h
@@ -93,7 +93,7 @@ private:
TQWidget *m_parent;
};
-class KDE_EXPORT Sidebar_Widget: public TQWidget
+class TDE_EXPORT Sidebar_Widget: public TQWidget
{
TQ_OBJECT
public:
diff --git a/konqueror/sidebar/test/konqsidebartest.cpp b/konqueror/sidebar/test/konqsidebartest.cpp
index 2032fe202..3c979d5fc 100644
--- a/konqueror/sidebar/test/konqsidebartest.cpp
+++ b/konqueror/sidebar/test/konqsidebartest.cpp
@@ -19,7 +19,7 @@
extern "C"
{
- KDE_EXPORT void* create_konq_sidebartest(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
+ TDE_EXPORT void* create_konq_sidebartest(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
{
return new SidebarTest(instance,par,widp,desktopname,name);
}
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index f1dd0b953..fa4b2b4f6 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -574,7 +574,7 @@ TQString BookmarkEditDialog::finalTitle() const
extern "C"
{
- KDE_EXPORT KonqSidebarTreeModule* create_konq_sidebartree_bookmarks(KonqSidebarTree* par,const bool)
+ TDE_EXPORT KonqSidebarTreeModule* create_konq_sidebartree_bookmarks(KonqSidebarTree* par,const bool)
{
return new KonqSidebarBookmarkModule(par);
}
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
index e6e4a0af3..7592c5479 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
@@ -624,7 +624,7 @@ void KonqSidebarDirTreeModule::followURL( const KURL & url )
extern "C"
{
- KDE_EXPORT KonqSidebarTreeModule *create_konq_sidebartree_dirtree(KonqSidebarTree* par,const bool showHidden)
+ TDE_EXPORT KonqSidebarTreeModule *create_konq_sidebartree_dirtree(KonqSidebarTree* par,const bool showHidden)
{
return new KonqSidebarDirTreeModule(par,showHidden);
}
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index 416054cf1..f941bd0f7 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -358,7 +358,7 @@ void KonqSidebarHistoryModule::slotClearHistory()
extern "C"
{
- KDE_EXPORT KonqSidebarTreeModule* create_konq_sidebartree_history(KonqSidebarTree* par, const bool)
+ TDE_EXPORT KonqSidebarTreeModule* create_konq_sidebartree_history(KonqSidebarTree* par, const bool)
{
return new KonqSidebarHistoryModule(par);
}
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index 4bd91f9f3..293616f21 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -124,7 +124,7 @@ void KonqSidebar_Tree::rename()
extern "C"
{
- KDE_EXPORT void* create_konqsidebar_tree(TDEInstance *inst,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
+ TDE_EXPORT void* create_konqsidebar_tree(TDEInstance *inst,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
{
return new KonqSidebar_Tree(inst,par,widp,desktopname,name);
}
@@ -132,7 +132,7 @@ extern "C"
extern "C"
{
- KDE_EXPORT bool add_konqsidebar_tree(TQString* fn, TQString*, TQMap<TQString,TQString> *map)
+ TDE_EXPORT bool add_konqsidebar_tree(TQString* fn, TQString*, TQMap<TQString,TQString> *map)
{
TDEStandardDirs *dirs=TDEGlobal::dirs();
TQStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true);
diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp
index feb1a6692..02543b652 100644
--- a/konqueror/sidebar/web_module/web_module.cpp
+++ b/konqueror/sidebar/web_module/web_module.cpp
@@ -182,14 +182,14 @@ void KonqSideBarWebModule::pageLoaded() {
extern "C" {
- KDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(TDEInstance *instance, TQObject *parent, TQWidget *widget, TQString &desktopName, const char *name) {
+ TDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(TDEInstance *instance, TQObject *parent, TQWidget *widget, TQString &desktopName, const char *name) {
return new KonqSideBarWebModule(instance, parent, widget, desktopName, name);
}
}
extern "C" {
- KDE_EXPORT bool add_konqsidebar_web(TQString* fn, TQString* param, TQMap<TQString,TQString> *map) {
+ TDE_EXPORT bool add_konqsidebar_web(TQString* fn, TQString* param, TQMap<TQString,TQString> *map) {
Q_UNUSED(param);
TDEGlobal::dirs()->addResourceType("websidebardata", TDEStandardDirs::kde_default("data") + "konqsidebartng/websidebar");
KURL url;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 16:41:51 +0000