aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/system/libkvisystem.cpp24
-rw-r--r--src/modules/system/plugin.cpp7
-rw-r--r--src/modules/term/libkviterm.cpp14
-rw-r--r--src/modules/term/termwidget.cpp262
-rw-r--r--src/modules/term/termwidget.h80
-rw-r--r--src/modules/term/termwindow.cpp111
-rw-r--r--src/modules/term/termwindow.h44
-rw-r--r--src/modules/tip/libkvitip.cpp32
-rw-r--r--src/modules/tip/libkvitip.h11
9 files changed, 266 insertions, 319 deletions
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index ddbf25980..e65817b94 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -22,20 +22,22 @@
//
//=============================================================================
+#include "plugin.h"
+
#include "kvi_settings.h"
#include "kvi_module.h"
#include "kvi_string.h"
#include "kvi_library.h"
#include "kvi_thread.h"
-
#include "kvi_locale.h"
#include "kvi_qcstring.h"
#include "kvi_app.h"
#include "kvi_env.h"
#include "kvi_osinfo.h"
#include "kvi_qcstring.h"
+#include "kvi_modulemanager.h"
-#include <qclipboard.h>
+#include <QClipboard>
#ifndef COMPILE_ON_WINDOWS
#include <sys/utsname.h>
@@ -47,10 +49,6 @@
#include <dcopclient.h>
#endif
-#include "kvi_modulemanager.h"
-
-#include "plugin.h"
-
KviPluginManager * g_pPluginManager;
/*
@@ -565,18 +563,6 @@ static bool system_kvs_fnc_dcop(KviKvsModuleFunctionCall *c)
c->returnValue()->setInteger(iii);
} else if(szRetType == "QCStringList")
{
-#ifndef COMPILE_USE_QT4
- QCStringList csl;
- ret >> csl;
- KviKvsArray * arry = new KviKvsArray();
- int idx = 0;
- for(QCStringList::Iterator iter = csl.begin();iter != csl.end();++iter)
- {
- arry->set(idx,new KviKvsVariant(QString(*iter)));
- idx++;
- }
- c->returnValue()->setArray(arry);
-#endif
} else if(szRetType == "QStringList")
{
QStringList csl;
@@ -737,7 +723,7 @@ static bool system_module_can_unload(KviModule *m)
KVIRC_MODULE(
"System", // module name
- "1.0.0", // module version
+ "4.0.0", // module version
"Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net)" \
" (C) 2005 Tonino Imbesi (grifisx at barmes dot org)"\
" (C) 2005 Alessandro Carbone (noldor at barmes dot org)",// author & (C)
diff --git a/src/modules/system/plugin.cpp b/src/modules/system/plugin.cpp
index 7c888f7fe..0b47e5872 100644
--- a/src/modules/system/plugin.cpp
+++ b/src/modules/system/plugin.cpp
@@ -32,8 +32,8 @@
#include "kvi_app.h"
#include "kvi_fileutils.h"
-#include <qdir.h>
-#include <qfileinfo.h>
+#include <QDir>
+#include <QFileInfo>
/*
@doc: easyplugins
@type:
@@ -209,7 +209,6 @@ void KviPlugin::setName(const QString& Name)
m_szName = Name;
}
-
KviPluginManager::KviPluginManager()
{
m_pPluginDict = new KviPointerHashTable<QString,KviPlugin>(5,false);
@@ -328,8 +327,6 @@ bool KviPluginManager::pluginCall(KviKvsModuleFunctionCall *c)
}
}
-
-
return true;
}
diff --git a/src/modules/term/libkviterm.cpp b/src/modules/term/libkviterm.cpp
index a81a394f7..9cd217c18 100644
--- a/src/modules/term/libkviterm.cpp
+++ b/src/modules/term/libkviterm.cpp
@@ -21,27 +21,21 @@
//
#include "kvi_settings.h"
-
#include "kvi_module.h"
-
#include "kvi_window.h"
-
#include "kvi_frame.h"
-
-#include <qsplitter.h>
#include "kvi_pointerlist.h"
-#ifdef COMPILE_KDE_SUPPORT
+#include <QSplitter>
+#ifdef COMPILE_KDE_SUPPORT
#include "termwidget.h"
#include "termwindow.h"
#include "ktrader.h"
-
// #include "kparts/part.h"
// #include "kparts/factory.h"
// #include "klibloader.h"
-
#endif
KviModule * g_pTermModule = 0;
@@ -136,9 +130,7 @@ static bool term_module_init(KviModule * m)
#endif
// m->registerCommand("open",term_module_cmd_open);
-#ifdef COMPILE_NEW_KVS
KVSM_REGISTER_SIMPLE_COMMAND(m,"open",term_kvs_cmd_open);
-#endif
return true;
}
@@ -157,7 +149,7 @@ static bool term_module_cleanup(KviModule *m)
KVIRC_MODULE(
"Term", // module name
- "1.0.0", // module version
+ "4.0.0", // module version
"Copyright (C) 2000 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
"Terminal emulator extension based on the KonsolePart KDE class",
term_module_init,
diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/termwidget.cpp
index 26ed7c3af..a972f0cc6 100644
--- a/src/modules/term/termwidget.cpp
+++ b/src/modules/term/termwidget.cpp
@@ -27,153 +27,153 @@
#include "kvi_frame.h"
#include "kvi_iconmanager.h"
#include "kvi_locale.h"
-
-#include <qlabel.h>
#include "kvi_pointerlist.h"
-#include <qtooltip.h>
-#include <qtimer.h>
-
-#ifdef COMPILE_KDE_SUPPORT
-
-#include "klibloader.h"
-#include "kparts/part.h"
-#include "kparts/factory.h"
-
-extern KviModule * g_pTermModule;
-extern KviPointerList<KviTermWidget> * g_pTermWidgetList;
-extern KviPointerList<KviTermWindow> * g_pTermWindowList;
-extern KviStr g_szKonsoleLibraryName;
-KviTermWidget::KviTermWidget(QWidget * par,KviFrame * lpFrm,bool bIsStandalone)
-: QFrame(par,"term_widget")
-{
- if(bIsStandalone)g_pTermWidgetList->append(this);
- m_bIsStandalone = bIsStandalone;
-
- m_pKonsolePart = 0;
- m_pKonsoleWidget = 0;
-
- if(bIsStandalone)
- {
- m_pHBox = new KviTalHBox(this);
- m_pTitleLabel = new QLabel(__tr2qs("Terminal emulator"),m_pHBox);
- m_pTitleLabel->setFrameStyle(QFrame::Raised | QFrame::WinPanel);
- m_pCloseButton = new QPushButton("",m_pHBox);
- m_pCloseButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)));
- QToolTip::add(m_pCloseButton,__tr2qs("Close this window"));
- m_pHBox->setStretchFactor(m_pTitleLabel,2);
- connect(m_pCloseButton,SIGNAL(clicked()),this,SLOT(closeClicked()));
- } else {
- m_pHBox = 0;
- m_pTitleLabel = 0;
- m_pCloseButton = 0;
- }
+#include <QLabel>
+#include <QToolTip>
+#include <QTimer>
- setFrameStyle(QFrame::Sunken | QFrame::Panel);
-
- KParts::Factory * pKonsoleFactory = static_cast<KParts::Factory *>(
- KLibLoader::self()->factory(g_szKonsoleLibraryName.ptr()));
+#ifdef COMPILE_KDE_SUPPORT
- if(pKonsoleFactory)
+ #include "klibloader.h"
+ #include "kparts/part.h"
+ #include "kparts/factory.h"
+
+ extern KviModule * g_pTermModule;
+ extern KviPointerList<KviTermWidget> * g_pTermWidgetList;
+ extern KviPointerList<KviTermWindow> * g_pTermWindowList;
+ extern KviStr g_szKonsoleLibraryName;
+
+ KviTermWidget::KviTermWidget(QWidget * par,KviFrame * lpFrm,bool bIsStandalone)
+ : QFrame(par,"term_widget")
{
-// debug("FACTORY %d",pKonsoleFactory);
- m_pKonsolePart = static_cast<KParts::Part *>(pKonsoleFactory->createPart(
- this,"terminal emulator",this,"the konsole part"));
-
- if(m_pKonsolePart)
+ if(bIsStandalone)g_pTermWidgetList->append(this);
+ m_bIsStandalone = bIsStandalone;
+
+ m_pKonsolePart = 0;
+ m_pKonsoleWidget = 0;
+
+ if(bIsStandalone)
+ {
+ m_pHBox = new KviTalHBox(this);
+ m_pTitleLabel = new QLabel(__tr2qs("Terminal emulator"),m_pHBox);
+ m_pTitleLabel->setFrameStyle(QFrame::Raised | QFrame::WinPanel);
+ m_pCloseButton = new QPushButton("",m_pHBox);
+ m_pCloseButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)));
+ QToolTip::add(m_pCloseButton,__tr2qs("Close this window"));
+ m_pHBox->setStretchFactor(m_pTitleLabel,2);
+ connect(m_pCloseButton,SIGNAL(clicked()),this,SLOT(closeClicked()));
+ } else {
+ m_pHBox = 0;
+ m_pTitleLabel = 0;
+ m_pCloseButton = 0;
+ }
+
+ setFrameStyle(QFrame::Sunken | QFrame::Panel);
+
+ KParts::Factory * pKonsoleFactory = static_cast<KParts::Factory *>(
+ KLibLoader::self()->factory(g_szKonsoleLibraryName.ptr()));
+
+ if(pKonsoleFactory)
{
-// debug("PART %d",m_pKonsolePart);
- m_pKonsoleWidget = m_pKonsolePart->widget();
- connect(m_pKonsoleWidget,SIGNAL(destroyed()),this,SLOT(konsoleDestroyed()));
-// debug("Widget %d",m_pKonsoleWidget);
+ // debug("FACTORY %d",pKonsoleFactory);
+ m_pKonsolePart = static_cast<KParts::Part *>(pKonsoleFactory->createPart(
+ this,"terminal emulator",this,"the konsole part"));
+
+ if(m_pKonsolePart)
+ {
+ // debug("PART %d",m_pKonsolePart);
+ m_pKonsoleWidget = m_pKonsolePart->widget();
+ connect(m_pKonsoleWidget,SIGNAL(destroyed()),this,SLOT(konsoleDestroyed()));
+ // debug("Widget %d",m_pKonsoleWidget);
+ } else {
+ m_pKonsoleWidget = new QLabel(this,
+ __tr2qs("Can't create the terminal emulation part"));
+ }
+
} else {
m_pKonsoleWidget = new QLabel(this,
- __tr2qs("Can't create the terminal emulation part"));
+ __tr2qs("Can't retrieve the terminal emulation factory"));
}
-
- } else {
- m_pKonsoleWidget = new QLabel(this,
- __tr2qs("Can't retrieve the terminal emulation factory"));
}
-}
-
-KviTermWidget::~KviTermWidget()
-{
- if(m_pKonsoleWidget)
- disconnect(m_pKonsoleWidget,SIGNAL(destroyed()),this,SLOT(konsoleDestroyed()));
-
- if(m_bIsStandalone)g_pTermWidgetList->removeRef(this);
- if(g_pTermWindowList->isEmpty() && g_pTermWidgetList->isEmpty())g_pTermModule->unlock();
-
-// debug("DELETING KONSOLE WIDGET");
-// if(m_pKonsoleWidget)delete m_pKonsoleWidget; <--// Qt will delete it
-// debug("DELETING KONSOLE PART");
-// if(m_pKonsolePart)delete m_pKonsolePart; <--// the part will delete self when the widget will die
-// debug("KONSOLE PART DELETED");
-}
-
-void KviTermWidget::resizeEvent(QResizeEvent *e)
-{
- int hght = 0;
- if(m_bIsStandalone)
+
+ KviTermWidget::~KviTermWidget()
{
- hght = m_pCloseButton->sizeHint().height();
- m_pHBox->setGeometry(1,1,width() - 2,hght + 1);
-
+ if(m_pKonsoleWidget)
+ disconnect(m_pKonsoleWidget,SIGNAL(destroyed()),this,SLOT(konsoleDestroyed()));
+
+ if(m_bIsStandalone)g_pTermWidgetList->removeRef(this);
+ if(g_pTermWindowList->isEmpty() && g_pTermWidgetList->isEmpty())g_pTermModule->unlock();
+
+ // debug("DELETING KONSOLE WIDGET");
+ // if(m_pKonsoleWidget)delete m_pKonsoleWidget; <--// Qt will delete it
+ // debug("DELETING KONSOLE PART");
+ // if(m_pKonsolePart)delete m_pKonsolePart; <--// the part will delete self when the widget will die
+ // debug("KONSOLE PART DELETED");
}
- if(m_pKonsoleWidget)m_pKonsoleWidget->setGeometry(1,hght + 1,width() - 2,height() - (hght + 2));
-}
-
-void KviTermWidget::closeClicked()
-{
- // this is called only in standalone mode
- delete this;
-}
-
-void KviTermWidget::konsoleDestroyed()
-{
- m_pKonsoleWidget = 0;
- m_pKonsolePart = 0;
- hide();
- QTimer::singleShot(0,this,SLOT(autoClose()));
-}
-
-void KviTermWidget::autoClose()
-{
- if(m_bIsStandalone)delete this;
- else ((KviWindow *)parent())->close();
-}
-
-void KviTermWidget::changeTitle(int i,const QString& str)
-{
- if(m_bIsStandalone)m_pTitleLabel->setText(str);
-}
-
-void KviTermWidget::notifySize(int,int)
-{
-}
-
-void KviTermWidget::changeColumns(int)
-{
-}
-
-QSize KviTermWidget::sizeHint() const
-{
- int hght = 0;
- int wdth = 0;
- if(m_pKonsoleWidget)
+
+ void KviTermWidget::resizeEvent(QResizeEvent *e)
{
- hght += m_pKonsoleWidget->sizeHint().height();
- wdth = m_pKonsoleWidget->sizeHint().width();
+ int hght = 0;
+ if(m_bIsStandalone)
+ {
+ hght = m_pCloseButton->sizeHint().height();
+ m_pHBox->setGeometry(1,1,width() - 2,hght + 1);
+
+ }
+ if(m_pKonsoleWidget)m_pKonsoleWidget->setGeometry(1,hght + 1,width() - 2,height() - (hght + 2));
}
- if(m_pCloseButton)
+
+ void KviTermWidget::closeClicked()
{
- hght += m_pCloseButton->sizeHint().height();
+ // this is called only in standalone mode
+ delete this;
}
- return QSize(wdth + 2,hght + 2);
-}
-
-#include "termwidget.moc"
+ void KviTermWidget::konsoleDestroyed()
+ {
+ m_pKonsoleWidget = 0;
+ m_pKonsolePart = 0;
+ hide();
+ QTimer::singleShot(0,this,SLOT(autoClose()));
+ }
+
+ void KviTermWidget::autoClose()
+ {
+ if(m_bIsStandalone)delete this;
+ else ((KviWindow *)parent())->close();
+ }
+
+ void KviTermWidget::changeTitle(int i,const QString& str)
+ {
+ if(m_bIsStandalone)m_pTitleLabel->setText(str);
+ }
+
+ void KviTermWidget::notifySize(int,int)
+ {
+ }
+
+ void KviTermWidget::changeColumns(int)
+ {
+ }
+
+ QSize KviTermWidget::sizeHint() const
+ {
+ int hght = 0;
+ int wdth = 0;
+ if(m_pKonsoleWidget)
+ {
+ hght += m_pKonsoleWidget->sizeHint().height();
+ wdth = m_pKonsoleWidget->sizeHint().width();
+ }
+ if(m_pCloseButton)
+ {
+ hght += m_pCloseButton->sizeHint().height();
+ }
+
+ return QSize(wdth + 2,hght + 2);
+ }
+
+ #include "termwidget.moc"
#endif //COMPILE_KDE_SUPPORT
diff --git a/src/modules/term/termwidget.h b/src/modules/term/termwidget.h
index 37e29b9f6..3ea54023f 100644
--- a/src/modules/term/termwidget.h
+++ b/src/modules/term/termwidget.h
@@ -25,48 +25,44 @@
#include "kvi_settings.h"
#ifdef COMPILE_KDE_SUPPORT
-
-#include <qframe.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include "kvi_tal_hbox.h"
-
-#include "kparts/part.h"
-
-
-class KviFrame;
-
-class KviTermWidget : public QFrame
-{
- Q_OBJECT
- Q_PROPERTY( int KviProperty_ChildFocusOwner READ dummy )
-public:
- KviTermWidget(QWidget * par,KviFrame * lpFrm,bool bIsStandalone = false);
- ~KviTermWidget();
-private:
- KviTalHBox * m_pHBox;
- QLabel * m_pTitleLabel;
- QPushButton * m_pCloseButton;
- KParts::Part * m_pKonsolePart;
- bool m_bIsStandalone;
- QWidget * m_pKonsoleWidget;
-protected:
- virtual void resizeEvent(QResizeEvent *e);
-protected slots:
- void closeClicked();
- void changeTitle(int i,const QString& str);
- void notifySize(int,int);
- void changeColumns(int);
-public:
- QWidget * konsoleWidget(){ return m_pKonsoleWidget ? m_pKonsoleWidget : this; };
- virtual QSize sizeHint() const;
- int dummy() const { return 0; };
-protected slots:
- void konsoleDestroyed();
- void autoClose();
-};
-
+ #include <QFrame>
+ #include <QLabel>
+ #include <QPushButton>
+ #include "kvi_tal_hbox.h"
+
+ #include "kparts/part.h"
+
+ class KviFrame;
+
+ class KviTermWidget : public QFrame
+ {
+ Q_OBJECT
+ Q_PROPERTY( int KviProperty_ChildFocusOwner READ dummy )
+ public:
+ KviTermWidget(QWidget * par,KviFrame * lpFrm,bool bIsStandalone = false);
+ ~KviTermWidget();
+ private:
+ KviTalHBox * m_pHBox;
+ QLabel * m_pTitleLabel;
+ QPushButton * m_pCloseButton;
+ KParts::Part * m_pKonsolePart;
+ bool m_bIsStandalone;
+ QWidget * m_pKonsoleWidget;
+ protected:
+ virtual void resizeEvent(QResizeEvent *e);
+ protected slots:
+ void closeClicked();
+ void changeTitle(int i,const QString& str);
+ void notifySize(int,int);
+ void changeColumns(int);
+ public:
+ QWidget * konsoleWidget(){ return m_pKonsoleWidget ? m_pKonsoleWidget : this; };
+ virtual QSize sizeHint() const;
+ int dummy() const { return 0; };
+ protected slots:
+ void konsoleDestroyed();
+ void autoClose();
+ };
#endif
-
#endif //_HELPWIDGET_H_
diff --git a/src/modules/term/termwindow.cpp b/src/modules/term/termwindow.cpp
index 04ab34643..0b8d08215 100644
--- a/src/modules/term/termwindow.cpp
+++ b/src/modules/term/termwindow.cpp
@@ -23,62 +23,59 @@
#include "termwidget.h"
#ifdef COMPILE_KDE_SUPPORT
+ #include "kvi_iconmanager.h"
+ #include "kvi_options.h"
+ #include "kvi_locale.h"
+ #include "kvi_module.h"
+
+ extern KviModule * g_pTermModule;
+ extern KviPointerList<KviTermWindow> * g_pTermWindowList;
+ extern KviPointerList<KviTermWidget> * g_pTermWidgetList;
+
+ KviTermWindow::KviTermWindow(KviFrame * lpFrm,const char * name)
+ : KviWindow(KVI_WINDOW_TYPE_TERM,lpFrm,name)
+ {
+ g_pTermWindowList->append(this);
+ m_pTermWidget = 0;
+ m_pTermWidget = new KviTermWidget(this,lpFrm);
+ // Ensure proper focusing
+ // setFocusHandler(m_pTermWidget->konsoleWidget(),this);
+ }
+
+ KviTermWindow::~KviTermWindow()
+ {
+ g_pTermWindowList->removeRef(this);
+ if(g_pTermWindowList->isEmpty() && g_pTermWidgetList->isEmpty())g_pTermModule->unlock();
+ }
+
+ QPixmap * KviTermWindow::myIconPtr()
+ {
+ return g_pIconManager->getSmallIcon(KVI_SMALLICON_RAW);
+ }
+
+ void KviTermWindow::resizeEvent(QResizeEvent *e)
+ {
+ if(m_pTermWidget)m_pTermWidget->setGeometry(0,0,width(),height());
+ }
+
+ QSize KviTermWindow::sizeHint() const
+ {
+ return m_pTermWidget ? m_pTermWidget->sizeHint() : KviWindow::sizeHint();
+ }
+
+ void KviTermWindow::fillCaptionBuffers()
+ {
+ m_szPlainTextCaption.sprintf(__tr("Terminal"));
+
+ m_szHtmlActiveCaption.sprintf(
+ __tr("<nobr><font color=\"%s\"><b>Terminal</b></font></nobr>"),
+ KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().ascii(),
+ KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name().ascii());
+ m_szHtmlInactiveCaption.sprintf(
+ __tr("<nobr><font color=\"%s\"><b>Terminal</b></font></nobr>"),
+ KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().ascii(),
+ KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().ascii());
+ }
-
-#include "kvi_iconmanager.h"
-#include "kvi_options.h"
-#include "kvi_locale.h"
-#include "kvi_module.h"
-
-extern KviModule * g_pTermModule;
-extern KviPointerList<KviTermWindow> * g_pTermWindowList;
-extern KviPointerList<KviTermWidget> * g_pTermWidgetList;
-
-KviTermWindow::KviTermWindow(KviFrame * lpFrm,const char * name)
-: KviWindow(KVI_WINDOW_TYPE_TERM,lpFrm,name)
-{
- g_pTermWindowList->append(this);
- m_pTermWidget = 0;
- m_pTermWidget = new KviTermWidget(this,lpFrm);
- // Ensure proper focusing
-// setFocusHandler(m_pTermWidget->konsoleWidget(),this);
-}
-
-KviTermWindow::~KviTermWindow()
-{
- g_pTermWindowList->removeRef(this);
- if(g_pTermWindowList->isEmpty() && g_pTermWidgetList->isEmpty())g_pTermModule->unlock();
-}
-
-QPixmap * KviTermWindow::myIconPtr()
-{
- return g_pIconManager->getSmallIcon(KVI_SMALLICON_RAW);
-}
-
-void KviTermWindow::resizeEvent(QResizeEvent *e)
-{
- if(m_pTermWidget)m_pTermWidget->setGeometry(0,0,width(),height());
-}
-
-QSize KviTermWindow::sizeHint() const
-{
- return m_pTermWidget ? m_pTermWidget->sizeHint() : KviWindow::sizeHint();
-}
-
-void KviTermWindow::fillCaptionBuffers()
-{
- m_szPlainTextCaption.sprintf(__tr("Terminal"));
-
- m_szHtmlActiveCaption.sprintf(
- __tr("<nobr><font color=\"%s\"><b>Terminal</b></font></nobr>"),
- KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().ascii(),
- KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name().ascii());
- m_szHtmlInactiveCaption.sprintf(
- __tr("<nobr><font color=\"%s\"><b>Terminal</b></font></nobr>"),
- KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().ascii(),
- KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().ascii());
-}
-
-#include "termwindow.moc"
-
+ #include "termwindow.moc"
#endif
diff --git a/src/modules/term/termwindow.h b/src/modules/term/termwindow.h
index 3b46d47b4..ec71c6b65 100644
--- a/src/modules/term/termwindow.h
+++ b/src/modules/term/termwindow.h
@@ -25,30 +25,26 @@
#include "kvi_settings.h"
#ifdef COMPILE_KDE_SUPPORT
-
-
-#include "kvi_window.h"
-#include "kvi_string.h"
-
-class KviTermWidget;
-
-class KviTermWindow : public KviWindow
-{
- Q_OBJECT
-public:
- KviTermWindow(KviFrame * lpFrm,const char * name);
- ~KviTermWindow();
-protected:
- KviTermWidget * m_pTermWidget;
-protected:
- virtual QPixmap * myIconPtr();
- virtual void fillCaptionBuffers();
- virtual void resizeEvent(QResizeEvent *e);
-public:
- virtual QSize sizeHint() const;
-};
-
-
+ #include "kvi_window.h"
+ #include "kvi_string.h"
+
+ class KviTermWidget;
+
+ class KviTermWindow : public KviWindow
+ {
+ Q_OBJECT
+ public:
+ KviTermWindow(KviFrame * lpFrm,const char * name);
+ ~KviTermWindow();
+ protected:
+ KviTermWidget * m_pTermWidget;
+ protected:
+ virtual QPixmap * myIconPtr();
+ virtual void fillCaptionBuffers();
+ virtual void resizeEvent(QResizeEvent *e);
+ public:
+ virtual QSize sizeHint() const;
+ };
#endif
#endif //_KVI_HELPWINDOW_H_
diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp
index 7450dec35..11a9d1f49 100644
--- a/src/modules/tip/libkvitip.cpp
+++ b/src/modules/tip/libkvitip.cpp
@@ -21,31 +21,24 @@
//
#include "libkvitip.h"
+
#include "kvi_module.h"
#include "kvi_styled_controls.h"
-
#include "kvi_locale.h"
#include "kvi_app.h"
-
#include "kvi_iconmanager.h"
#include "kvi_options.h"
#include "kvi_fileutils.h"
-#include <qpushbutton.h>
-
-#ifdef COMPILE_USE_QT4
-#include <q3simplerichtext.h>
+#include <QPushButton>
+#include <QFont>
+#include <QTextCodec>
+#include <QPainter>
#include <QDesktopWidget>
#include <QCloseEvent>
+#include <q3simplerichtext.h>
#define KviTalSimpleRichText Q3SimpleRichText
-#else
-#include <qsimplerichtext.h>
-#define KviTalSimpleRichText QSimpleRichText
-#endif
-#include <qfont.h>
-#include <qtextcodec.h>
-#include <qpainter.h>
KviTipWindow * g_pTipWindow = 0;
@@ -64,11 +57,7 @@ KviTipFrame::KviTipFrame(QWidget * par)
KviStr buffer;
g_pApp->findImage(buffer,"kvi_tip.png");
m_pTipPixmap = new QPixmap(buffer.ptr());
-#ifdef COMPILE_USE_QT4
setBackgroundMode(Qt::NoBackground);
-#else
- setBackgroundMode(QWidget::NoBackground);
-#endif
setFrameStyle(QFrame::Sunken | QFrame::WinPanel);
}
@@ -99,11 +88,7 @@ void KviTipFrame::drawContents(QPainter *p)
QRegion reg(0,0,1000,20000);
-#if QT_VERSION >= 300
doc.draw(p,70,10,reg,colorGroup());
-#else
- doc.draw(p,70,10,reg,palette());
-#endif
}
KviTipWindow::KviTipWindow()
@@ -111,7 +96,6 @@ KviTipWindow::KviTipWindow()
{
m_pConfig = 0;
-
m_pTipFrame = new KviTipFrame(this);
m_pTipFrame->setGeometry(
KVI_TIP_WINDOW_BORDER,
@@ -264,7 +248,6 @@ void KviTipWindow::closeEvent(QCloseEvent *e)
This command works even if the tip window is already opened.<br>
*/
-
static bool tip_kvs_cmd_open(KviKvsModuleCommandCall * c)
{
QString szTipfilename;
@@ -297,7 +280,7 @@ static bool tip_module_can_unload(KviModule *m)
KVIRC_MODULE(
"Tip", // module name
- "1.0.0", // module version
+ "4.0.0", // module version
"Copyright (C) 2000 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
"\"Did you know...\" tip",
tip_module_init,
@@ -309,4 +292,3 @@ KVIRC_MODULE(
#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
#include "libkvitip.moc"
#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-
diff --git a/src/modules/tip/libkvitip.h b/src/modules/tip/libkvitip.h
index 03dfc586f..ffa9f5566 100644
--- a/src/modules/tip/libkvitip.h
+++ b/src/modules/tip/libkvitip.h
@@ -23,15 +23,16 @@
// Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//
-#include <qwidget.h>
-#include <qframe.h>
-#include <qpixmap.h>
-#include <qcheckbox.h>
-
#include "kvi_styled_controls.h"
#include "kvi_string.h"
#include "kvi_config.h"
+#include <QWidget>
+#include <QFrame>
+#include <QPixmap>
+#include <QCheckBox>
+
+
class KviTipFrame : public QFrame
{
Q_OBJECT
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 07:13:46 +0000