Set COMPILE_TDE_SUPPORT instead of COMPILE_KDE_SUPPORT

pull/1/head
Timothy Pearson 12 years ago
parent 2b0f7501a0
commit b7d96aa82b

@ -2523,7 +2523,7 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
SS_RPATH="$SS_RPATH -rpath $SS_KDE_LIBDIR"
SS_LIBDIRS="$SS_LIBDIRS -L$SS_KDE_LIBDIR"
SS_LIBLINK="-ltdecore -ltdeui -lkparts $SS_LIBLINK"
AC_DEFINE([COMPILE_KDE_SUPPORT], 1, [define if you want to compile the KDE 3.x support])
AC_DEFINE([COMPILE_TDE_SUPPORT], 1, [define if you want to compile the TDE support])
SS_BUILD_FLAGS="k$SS_BUILD_FLAGS"
fi

@ -2550,7 +2550,7 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
SS_RPATH="$SS_RPATH -rpath $SS_KDE_LIBDIR"
SS_LIBDIRS="$SS_LIBDIRS -L$SS_KDE_LIBDIR"
SS_LIBLINK="-ltdecore -ltdeui -lkparts $SS_LIBLINK"
AC_DEFINE([COMPILE_KDE_SUPPORT], 1, [define if you want to compile the KDE 3.x support])
AC_DEFINE([COMPILE_TDE_SUPPORT], 1, [define if you want to compile the TDE support])
SS_BUILD_FLAGS="k$SS_BUILD_FLAGS"
fi

@ -378,7 +378,7 @@ Coding tips
or in kvilib.
- Windows compilation has COMPILE_ON_WINDOWS #defined and a KDE compilation
has COMPILE_KDE_SUPPORT #defined.
has COMPILE_TDE_SUPPORT #defined.
- Modularize, abstract, modularize, abstract ...

@ -39,8 +39,8 @@
/* define if you want the IpV6 support */
#undef COMPILE_IPV6_SUPPORT
/* define if you want to compile the KDE 3.x support */
#undef COMPILE_KDE_SUPPORT
/* define if you want to compile the TDE support */
#undef COMPILE_TDE_SUPPORT
/* define if you want the memory checks */
#undef COMPILE_MEMORY_CHECKS

@ -40,8 +40,8 @@
/* define if you want the IpV6 support */
#define COMPILE_IPV6_SUPPORT 1
/* define if you want to compile the KDE 3.x support */
/* #undef COMPILE_KDE_SUPPORT */
/* define if you want to compile the TDE support */
/* #undef COMPILE_TDE_SUPPORT */
/* define if you want the memory checks */
/* #undef COMPILE_MEMORY_CHECKS */

@ -50,7 +50,7 @@
#define COMPILE_INFO_TIPS 1
/* define if you want to compile the KDE 2.x support */
/* #undef COMPILE_KDE_SUPPORT */
/* #undef COMPILE_TDE_SUPPORT */
/* define if you want the gcc memory profile */
/* #undef COMPILE_MEMORY_PROFILE */

@ -26,7 +26,7 @@
#define __KVILIB__
#include "kvi_dcophelper.h"
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include "dcopclient.h"
@ -354,4 +354,4 @@ bool KviDCOPHelper::startApp(const TQString &szApp,int iWaitMSecs)
}
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT

@ -30,7 +30,7 @@
#include "kvi_qcstring.h"
#include "kvi_valuelist.h"
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
typedef KviValueList<KviTQCString> KviQCStringList;
@ -77,6 +77,6 @@ protected:
bool qcstringListRetVoidDCOPCall(const KviTQCString &szObj,const KviTQCString &szFunc,KviQCStringList &ret);
};
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
#endif // _KVI_DCOPHELPER_H_

@ -25,7 +25,7 @@
#include "kvi_tal_application.h"
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
// The constructor below triggers a warning
// ../tal/kvi_tal_application.cpp: In constructor

@ -25,7 +25,7 @@
#include "kvi_settings.h"
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include "kvi_tal_application_kde.h"
#else
#include "kvi_tal_application_qt.h"

@ -76,7 +76,7 @@
#else
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *parent,const char *name,bool modal)
: KFileDialog(dirName,filter,parent,name,modal)

@ -30,7 +30,7 @@
#ifdef COMPILE_USE_QT4
#include "kvi_tal_filedialog_qt4.h"
#else
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include "kvi_tal_filedialog_kde.h"
#else
#include "kvi_tal_filedialog_qt.h"

@ -25,7 +25,7 @@
#include "kvi_tal_mainwindow.h"
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
KviTalMainWindow::KviTalMainWindow(TQWidget * par,const char * nam)
: KMainWindow(par,nam)

@ -25,7 +25,7 @@
#include "kvi_settings.h"
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include "kvi_tal_mainwindow_kde.h"
#else
#ifdef COMPILE_USE_QT4

@ -25,7 +25,7 @@
#include "kvi_tal_menubar.h"
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
KviTalMenuBar::KviTalMenuBar(TQWidget * par,const char * nam)
: KMenuBar(par,nam)

@ -24,7 +24,7 @@
#include "kvi_settings.h"
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include "kvi_tal_menubar_kde.h"
#else
#include "kvi_tal_menubar_qt.h"

@ -25,7 +25,7 @@
#include "kvi_tal_toolbar.h"
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
KviTalToolBar::KviTalToolBar(const TQString &label,TQMainWindow *w,TQT_TOOLBARDOCK_TYPE dock,bool bNewLine,const char * nam)
: KToolBar(w,dock,bNewLine,nam)

@ -24,7 +24,7 @@
#include "kvi_settings.h"
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include "kvi_tal_toolbar_kde.h"
#else
#ifdef COMPILE_USE_QT4

@ -153,7 +153,7 @@ TQPixmap * g_pActivityMeterPixmap = 0;
#ifdef COMPILE_PSEUDO_TRANSPARENCY
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include <ksharedpixmap.h>
#include <netwm.h>
#include <kimageeffect.h>
@ -1091,7 +1091,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co
#ifdef COMPILE_PSEUDO_TRANSPARENCY
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include <netwm.h>
@ -1151,11 +1151,11 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co
//}
}
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
void KviApp::destroyPseudoTransparency()
{
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
if(g_pKdeDesktopBackground)
{
delete g_pKdeDesktopBackground;
@ -1163,7 +1163,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co
}
// forget the backgroundChanged signal (will do nothing if it is not connected)
disconnect(this,TQT_SIGNAL(backgroundChanged(int)),this,TQT_SLOT(kdeRootPixmapChanged(int)));
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
if(g_pShadedParentGlobalDesktopBackground)
{
delete g_pShadedParentGlobalDesktopBackground;
@ -1183,11 +1183,11 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co
TQTimer::singleShot(0,this,TQT_SLOT(updatePseudoTransparency()));
}
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#define kimageeffect_fade KImageEffect::fade
#else //!COMPILE_KDE_SUPPORT
#else //!COMPILE_TDE_SUPPORT
//
// This function is taken from the KDE kimageeffect.cpp
@ -1252,7 +1252,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co
return img;
}
#endif //!COMPILE_KDE_SUPPORT
#endif //!COMPILE_TDE_SUPPORT
void KviApp::createGlobalBackgrounds(TQPixmap * pix)
{
@ -1287,7 +1287,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co
void KviApp::kdeRootPixmapChanged(int iDesktop)
{
#ifdef COMPILE_PSEUDO_TRANSPARENCY
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
if(!KVI_OPTION_BOOL(KviOption_boolUpdateKdeBackgroundOnChange))return;
NETRootInfo rinfo(qt_xdisplay(),NET::CurrentDesktop);
rinfo.activate();
@ -1300,7 +1300,7 @@ void KviApp::kdeRootPixmapChanged(int iDesktop)
void KviApp::kdeRootPixmapDownloadComplete(bool bSuccess)
{
#ifdef COMPILE_PSEUDO_TRANSPARENCY
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
if(!bSuccess)
{
debug("Failed to download the KDE root background image...");
@ -1315,7 +1315,7 @@ void KviApp::kdeRootPixmapDownloadComplete(bool bSuccess)
}
delete g_pKdeDesktopBackground;
g_pKdeDesktopBackground = 0;
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
#endif //COMPILE_PSEUDO_TRANSPARENCY
}
@ -1326,12 +1326,12 @@ void KviApp::updatePseudoTransparency()
m_bUpdatePseudoTransparencyPending = false;
if(KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency))
{
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
if(KVI_OPTION_BOOL(KviOption_boolObtainGlobalBackgroundFromKde))
{
downloadKdeRootPixmap();
} else {
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
if(KVI_OPTION_PIXMAP(KviOption_pixmapGlobalTransparencyBackground).pixmap())
{
createGlobalBackgrounds(KVI_OPTION_PIXMAP(KviOption_pixmapGlobalTransparencyBackground).pixmap());
@ -1339,9 +1339,9 @@ void KviApp::updatePseudoTransparency()
destroyPseudoTransparency();
KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) = false;
}
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
}
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
} else {
destroyPseudoTransparency();
if(g_pFrame)g_pFrame->updatePseudoTransparency();

@ -320,9 +320,9 @@ private:
#ifdef COMPILE_PSEUDO_TRANSPARENCY
void createGlobalBackgrounds(TQPixmap * pix);
void destroyPseudoTransparency();
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
void downloadKdeRootPixmap();
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
#endif //COMPILE_PSEUDO_TRANSPARENCY
private:
// kvi_app.cpp : parts of setup()

@ -50,7 +50,7 @@
#include <stdlib.h> // for getenv()
#include <unistd.h> // for symlink() <-- unused ?
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include <kconfig.h>
#include <kstddirs.h>
#endif
@ -548,7 +548,7 @@ void KviApp::findGlobalKvircDirectory()
// Since I had many problems with it
// because of strange distributions or TDEDIRS
// I do it in that way...
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
// KDE compilation ...
// The things usually go installed into $TDEDIR/share/apps/kvirc/$KVI_VERSION_BRANCH
// Look in the main KDE directory
@ -595,7 +595,7 @@ void KviApp::findGlobalKvircDirectory()
if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
}
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
for(int k=0;usualKvircGlobalDir[k] != 0;k++){
m_szGlobalKvircDir = TQDir::homeDirPath();
m_szGlobalKvircDir+= "/.kde";
@ -603,7 +603,7 @@ void KviApp::findGlobalKvircDirectory()
m_szGlobalKvircDir+= KVI_VERSION_BRANCH;
if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
}
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
m_szGlobalKvircDir="";
@ -611,7 +611,7 @@ void KviApp::findGlobalKvircDirectory()
// THE TRANSLATION DIRECTORY WAS NOT FOUND YET
// AND THE LOCALE IS NOT INITIALIZED AT ALL
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
KviMessageBox::warning("Unable to find the shared Kvirc directory.\n"\
"The usual path for this directory is $TDEDIR/share/apps/kvirc.\n"\
"Are you sure that 'make install' worked correctly ?\n"\
@ -626,7 +626,7 @@ void KviApp::findGlobalKvircDirectory()
"Something went wrong during the bundle creation.\n"\
"Please read the documentation and make sure to set proper paths for --prefix, -bindir, -libdir and --datadir during the configure run.\n"\
"Trying to run anyway...\n");
#else //!defined(COMPILE_KDE_SUPPORT) && !defined(Q_OS_MACX)
#else //!defined(COMPILE_TDE_SUPPORT) && !defined(Q_OS_MACX)
KviMessageBox::warning("Unable to find the shared Kvirc directory.\n"\
"The usual path for this directory is /usr/local/share/kvirc.\n"\
"Are you sure that 'make install' worked correctly ?\n"\
@ -644,7 +644,7 @@ bool KviApp::findLocalKvircDirectory()
{
// Here we check if we already did the setup
// and we have the kvirc local directory saved somewhere
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
if(m_szConfigFile.isEmpty())
{ // don't do that if user supplied a config file :)
KConfig * cfg = config();
@ -664,7 +664,7 @@ bool KviApp::findLocalKvircDirectory()
}
}
}
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
#ifdef COMPILE_ON_WINDOWS
if(KviFileUtils::fileExists(g_pApp->applicationDirPath()+KVI_PATH_SEPARATOR_CHAR+"portable")) {
@ -819,7 +819,7 @@ void KviApp::saveKvircDirectory()
#else //!COMPILE_ON_WINDOWS
*/
// Here we save the local directory path
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
// In KDE we use the application config file
if(m_szConfigFile.isEmpty())
{ // not if user supplied a config file
@ -836,7 +836,7 @@ void KviApp::saveKvircDirectory()
}
}
}
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
// In NON-KDE we use $HOME/.kvirc.rc or $HOME/kvirc.ini
TQString szF = TQDir::homeDirPath();

@ -316,7 +316,7 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]=
#ifdef COMPILE_ON_WINDOWS
#define RUN_THE_BROWSER "run \"cmd.exe /c start \\\"\\\" \\\"$0\\\"\""
#else
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#define RUN_THE_BROWSER "run kfmclient openURL $0"
#else
#ifdef Q_OS_MACX

@ -923,7 +923,7 @@ namespace KviKvsCoreFunctions
#ifndef COMPILE_NO_IPC
"IPC",
#endif
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
"KDE",
#endif
#ifdef COMPILE_OSS_SUPPORT

@ -291,7 +291,7 @@ void KviCustomToolBar::dragEnterEvent(TQDragEnterEvent *e)
#else
boxLayout()->remove(m_pDraggedChild); // in case it was already added
boxLayout()->insertWidget(idx,m_pDraggedChild);
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
// bleah ://///
insertWidget(-1,m_pDraggedChild->sizeHint().width(),m_pDraggedChild,idx);
#endif
@ -506,7 +506,7 @@ void KviCustomToolBar::drag(TQWidget * child,const TQPoint &pnt)
#else
boxLayout()->remove(child);
boxLayout()->insertWidget(idx,child);
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
// bleah ://///
insertWidget(-1,child->width(),child,idx);
#endif
@ -645,7 +645,7 @@ bool KviCustomToolBar::eventFilter(TQObject *o,TQEvent *e)
#else
boxLayout()->insertWidget(0,m_pMovedChild);
m_pMovedChild->show();
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
// bleah ://///
insertWidget(-1,m_pMovedChild->width(),m_pMovedChild,0);
#endif

@ -176,7 +176,7 @@ bool KviFileDialog::askForDirectoryName(TQString &buffer,const TQString & captio
return !buffer.isEmpty();
}
#else
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
// the KDE based dir selection dialog is now quite nice
buffer = KFileDialog::getExistingDirectory(initial,parent,caption);
return !buffer.isEmpty();

@ -303,7 +303,7 @@ void KviMenuBar::setupToolsPopup()
// moved the old tools here
m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ICONMANAGER)),__tr2qs("Show &Icon Table"),g_pIconManager,TQT_SLOT(showIconWidget()));
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
int id;
id = m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),__tr2qs("Open &Terminal"),m_pFrm,TQT_SLOT(executeInternalCommand(int)));
m->setItemParameter(id,KVI_INTERNALCOMMAND_TERM_OPEN);

@ -24,7 +24,7 @@
// FIXME: #warning "This should go into TAL as layer ...then maybe a wrapper in KviApp!"
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include <kmessagebox.h>
#else
#include <tqmessagebox.h>
@ -45,7 +45,7 @@ namespace KviMessageBox
TQString s;
KviTQString::vsprintf(s,fmt,list);
kvi_va_end(list);
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
KMessageBox::error(0,s,"KVIrc");
#else
TQMessageBox::warning(0,"KVIrc",s);
@ -59,7 +59,7 @@ namespace KviMessageBox
TQString s;
KviTQString::vsprintf(s,fmt,list);
kvi_va_end(list);
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
KMessageBox::information(0,s,"KVIrc");
#else
TQMessageBox::information(0,"KVIrc",s);
@ -74,7 +74,7 @@ namespace KviMessageBox
KviTQString::vsprintf(s,fmt,list);
kvi_va_end(list);
bool bRet;
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
bRet = (KMessageBox::questionYesNo(0,s,caption) == KMessageBox::Yes);
#else
bRet = (TQMessageBox::information(0,caption,s,

@ -82,7 +82,7 @@
#include "kvi_cryptcontroller.h"
#endif
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include <twin.h>
#include <tdeversion.h>
#endif
@ -257,7 +257,7 @@ void KviWindow::demandAttention()
fwi.dwTimeout = 500;
FlashWindowEx(&fwi);
#else
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#if (TDE_VERSION_MAJOR >= 3) && (TDE_VERSION_MINOR >= 2)
KWin::demandAttention(frame()->winId(),true);
#endif
@ -274,7 +274,7 @@ void KviWindow::demandAttention()
fwi.dwTimeout = 500;
FlashWindowEx(&fwi);
#else
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#if (TDE_VERSION_MAJOR >= 3) && (TDE_VERSION_MINOR >= 2)
KWin::demandAttention(winId(),true);
#endif

@ -505,7 +505,7 @@ void KviKvsCallbackFileDialog::done(int code)
if(code == TQDialog::Accepted)
{
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
if(mode() == KFile::ExistingOnly)
#else
if(mode() == TQFileDialog::ExistingFiles)

@ -42,7 +42,7 @@
#include "libkvidockwidget.h"
#include "kvi_doublebuffer.h"
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include <twin.h>
#include <kpopupmenu.h>
#else
@ -126,7 +126,7 @@ KviDockWidget::KviDockWidget(KviFrame * frm,const char * name)
#ifndef COMPILE_USE_QT4
setBackgroundMode(X11ParentRelative);
#endif
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
KWin::setSystemTrayWindowFor(winId(),frm->winId());
#endif
#endif //!COMPILE_ON_WINDOWS
@ -140,7 +140,7 @@ KviDockWidget::KviDockWidget(KviFrame * frm,const char * name)
m_pAwayPopup = new KviTalPopupMenu(this);
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
m_pContextPopup = new KPopupMenu(this);
m_pContextPopup->insertTitle(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)),__tr2qs("KVIrc"));
#else
@ -301,13 +301,13 @@ static const char * idlemsgs[NIDLEMSGS]=
__tr("idle idle idle idle!")
};
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
extern Time qt_x_time;
#endif
void KviDockWidget::enterEvent( TQEvent* )
{
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
if(!g_pApp->focusWidget())
{
XEvent ev;

@ -23,7 +23,7 @@
#include "kvi_frame.h"
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
class KPopupMenu;
#else
class KviTalPopupMenu;
@ -48,7 +48,7 @@ public:
protected:
KviFrame * m_pFrm;
KviDynamicToolTip * m_pTip;
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
KPopupMenu * m_pContextPopup;
#else
KviTalPopupMenu * m_pContextPopup;

@ -53,12 +53,12 @@
#include <tqfontmetrics.h>
#include <tqevent.h>
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include <kurl.h>
#include <krun.h>
#include <kuserprofile.h>
#include <kmimetype.h>
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
extern KviFileTransferWindow * g_pFileTransferWindow;
@ -317,17 +317,17 @@ void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const TQPo
tmp += "</nobr><br>";
}
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
tmp += "<nobr>Mime: ";
tmp += KMimeType::findByPath(szFile)->name();
tmp += "</nobr>";
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
TQLabel * l = new TQLabel(tmp,m_pLocalFilePopup);
l->setFrameStyle(TQFrame::Raised | TQFrame::Panel);
m_pLocalFilePopup->insertItem(l);
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
TQString mimetype = KMimeType::findByPath(szFile)->name();
KServiceTypeProfile::OfferList offers = KServiceTypeProfile::offers(mimetype,"Application");
@ -357,7 +357,7 @@ void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const TQPo
m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &Location","filetransferwindow"),this,TQT_SLOT(openLocalFileFolder()));
m_pLocalFilePopup->insertItem(__tr2qs_ctx("Terminal at Location","filetransferwindow"),this,TQT_SLOT(openLocalFileTerminal()));
m_pLocalFilePopup->insertSeparator();
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
//-| Grifisx & Noldor |-
#ifdef COMPILE_ON_WINDOWS
@ -423,7 +423,7 @@ KviFileTransfer * KviFileTransferWindow::selectedTransfer()
void KviFileTransferWindow::openFilePopupActivated(int id)
{
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
int ip = m_pOpenFilePopup->itemParameter(id);
if(ip < 0)return;
TQString txt = m_pOpenFilePopup->text(id);
@ -449,7 +449,7 @@ void KviFileTransferWindow::openFilePopupActivated(int id)
break;
}
}
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
}
void KviFileTransferWindow::openLocalFileTerminal()
@ -470,7 +470,7 @@ void KviFileTransferWindow::openLocalFileTerminal()
system(tmp.local8Bit().data());
#else //COMPILE_ON_WINDOWS
// G&N end
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
KviFileTransfer * t = selectedTransfer();
if(!t)return;
TQString tmp = t->localFileName();
@ -484,7 +484,7 @@ void KviFileTransferWindow::openLocalFileTerminal()
tmp.append("\"");
KRun::runCommand(tmp);
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
#endif //!COMPILE_ON_WINDOWS
}
@ -522,7 +522,7 @@ void KviFileTransferWindow::openLocalFile()
ShellExecute(0,"open",tmp.local8Bit().data(),NULL,NULL,SW_SHOWNORMAL); //You have to link the shell32.lib
#else //!COMPILE_ON_WINDOWS
// G&N end
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
KviFileTransfer * t = selectedTransfer();
if(!t)return;
TQString tmp = t->localFileName();
@ -541,7 +541,7 @@ void KviFileTransferWindow::openLocalFile()
url.setPath(tmp);
lst.append(url);
KRun::run(*offer, lst);
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
#endif //!COMPILE_ON_WINDOWS
}
@ -558,7 +558,7 @@ void KviFileTransferWindow::openLocalFileWith()
WinExec(tmp.local8Bit().data(),SW_SHOWNORMAL);
#else //!COMPILE_ON_WINDOWS
// G&N end
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
KviFileTransfer * t = selectedTransfer();
if(!t)return;
TQString tmp = t->localFileName();
@ -569,7 +569,7 @@ void KviFileTransferWindow::openLocalFileWith()
url.setPath(tmp);
lst.append(url);
KRun::displayOpenWithDialog(lst);
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
#endif //!COMPILE_ON_WINDOWS
}
@ -603,7 +603,7 @@ void KviFileTransferWindow::openLocalFileFolder()
WinExec(tmp.local8Bit().data(), SW_MAXIMIZE);
#else //!COMPILE_ON_WINDOWS
// G&N end
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
KviFileTransfer * t = selectedTransfer();
if(!t)return;
TQString tmp = t->localFileName();
@ -622,7 +622,7 @@ void KviFileTransferWindow::openLocalFileFolder()
url.setPath(tmp);
lst.append(url);
KRun::run(*offer, lst);
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
#endif //!COMPILE_ON_WINDOWS
}

@ -1615,7 +1615,7 @@ static bool mediaplayer_module_init( KviModule * m )
g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviWinampInterface));
#endif
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviAmarokInterface));
g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviJukInterface));
#endif

@ -24,7 +24,7 @@
#include "mp_amarokinterface.h"
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include "kvi_app.h"
@ -186,4 +186,4 @@ bool KviAmarokInterface::playMrl(const TQString &mrl)
}
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT

@ -27,7 +27,7 @@
#include "kvi_settings.h"
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include "kvi_dcophelper.h"
#include "mp_interface.h"
@ -71,6 +71,6 @@
MP_DECLARE_DESCRIPTOR(KviAmarokInterface)
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
#endif //!_MP_AMAROKINTERFACE_H_

@ -24,7 +24,7 @@
#include "mp_dcopinterface.h"
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include "dcopclient.h"
@ -221,4 +221,4 @@ bool KviMediaPlayerDCOPInterface::startApp(const TQString &szApp,int iWaitMSecs)
}
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT

@ -26,7 +26,7 @@
#include "kvi_settings.h"
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include "mp_interface.h"
@ -52,6 +52,6 @@ protected:
bool boolRetDCOPCall(const KviTQCString &szObj,const KviTQCString &szFunc,bool &ret);
};
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
#endif //!_MP_DCOPINTERFACE_H_

@ -24,7 +24,7 @@
#include "mp_jukinterface.h"
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include "kvi_app.h"
@ -182,4 +182,4 @@ bool KviJukInterface::playMrl(const TQString &mrl)
}
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT

@ -27,7 +27,7 @@
#include "kvi_settings.h"
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include "kvi_dcophelper.h"
#include "mp_interface.h"
@ -72,6 +72,6 @@
MP_DECLARE_DESCRIPTOR(KviJukInterface)
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
#endif //!_MP_JUKINTERFACE_H_

@ -40,7 +40,7 @@
#include <windows.h>
#endif
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include <netwm.h>
#endif
*/

@ -58,7 +58,7 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget *
{
#ifdef COMPILE_PSEUDO_TRANSPARENCY
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
createLayout(7,2);
#else
createLayout(5,2);
@ -66,7 +66,7 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget *
m_pUseTransparencyBoolSelector = addBoolSelector(0,0,1,0,__tr2qs_ctx("Enable fake transparency","options"),KviOption_boolUseGlobalPseudoTransparency);
#ifdef COMPILE_INFO_TIPS
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
mergeTip(m_pUseTransparencyBoolSelector,
__tr2qs_ctx("<center>This option makes all KVIrc windows look " \
"transparent.<br>You must choose a blending " \
@ -93,7 +93,7 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget *
connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),c,TQT_SLOT(setEnabled(bool)));
// addRowSpacer(0,13,0,13);
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
m_pObtainBackgroundFromKdeBoolSelector = addBoolSelector(0,4,1,4,__tr2qs_ctx("Use KDE desktop for transparency","options"),KviOption_boolObtainGlobalBackgroundFromKde,
KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),m_pObtainBackgroundFromKdeBoolSelector,TQT_SLOT(setEnabled(bool)));
@ -107,11 +107,11 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget *
layout()->setRowStretch(6,1);
connect(m_pObtainBackgroundFromKdeBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool)));
#else //!COMPILE_KDE_SUPPORT
#else //!COMPILE_TDE_SUPPORT
m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,4,1,4,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground,
KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
layout()->setRowStretch(4,1);
#endif //!COMPILE_KDE_SUPPORT
#endif //!COMPILE_TDE_SUPPORT
connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool)));
connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableUpdateKdeBackgroundBoolSelector(bool)));
#else
@ -127,7 +127,7 @@ KviThemeTransparencyOptionsWidget::~KviThemeTransparencyOptionsWidget()
void KviThemeTransparencyOptionsWidget::enableGlobalBackgroundPixmapSelector(bool)
{
#ifdef COMPILE_PSEUDO_TRANSPARENCY
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
m_pGlobalBackgroundPixmapSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked() && !(m_pObtainBackgroundFromKdeBoolSelector->isChecked()));
#else
m_pGlobalBackgroundPixmapSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked());
@ -138,7 +138,7 @@ void KviThemeTransparencyOptionsWidget::enableGlobalBackgroundPixmapSelector(boo
void KviThemeTransparencyOptionsWidget::enableUpdateKdeBackgroundBoolSelector(bool)
{
#ifdef COMPILE_PSEUDO_TRANSPARENCY
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
m_pUpdateKdeBackgroundOnChangeBoolSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked() && m_pObtainBackgroundFromKdeBoolSelector->isChecked());
#endif
#endif

@ -61,7 +61,7 @@ protected:
#ifdef COMPILE_PSEUDO_TRANSPARENCY
KviPixmapSelector * m_pGlobalBackgroundPixmapSelector;
KviBoolSelector * m_pUseTransparencyBoolSelector;
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
KviBoolSelector * m_pObtainBackgroundFromKdeBoolSelector;
KviBoolSelector * m_pUpdateKdeBackgroundOnChangeBoolSelector;
#endif

@ -30,7 +30,7 @@
#include "kvi_settings.h"
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include <tdeversion.h>
#endif
@ -79,7 +79,7 @@ KviQueryOptionsWidget::KviQueryOptionsWidget(TQWidget * parent)
"will be displayed in the window.<br></center>","options"));
#endif
#if defined(COMPILE_ON_WINDOWS) || (defined(COMPILE_KDE_SUPPORT) && (TDE_VERSION_MAJOR >= 3) && (TDE_VERSION_MINOR >= 2))
#if defined(COMPILE_ON_WINDOWS) || (defined(COMPILE_TDE_SUPPORT) && (TDE_VERSION_MAJOR >= 3) && (TDE_VERSION_MINOR >= 2))
b = addBoolSelector(0,3,0,3,__tr2qs_ctx("Flash system taskbar on new query message","options"),KviOption_boolFlashQueryWindowOnNewMessages);
#ifdef COMPILE_INFO_TIPS
mergeTip(b,

@ -504,7 +504,7 @@ KviSetupWizard::KviSetupWizard()
m_pCreateUrlHandlers = new TQCheckBox(__tr2qs("Make KVIrc default IRC client"),m_pDesktopIntegration->m_pVBox);
m_pCreateUrlHandlers->setChecked(true);
#endif
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
m_pCreateDesktopShortcut = new TQCheckBox(__tr2qs("Create desktop shortcut"),m_pDesktopIntegration->m_pVBox);
m_pCreateDesktopShortcut->setChecked(true);
#endif
@ -845,7 +845,7 @@ void KviSetupWizard::makeLink()
CoUninitialize();
#endif //COMPILE_ON_WINDOWS
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
TQString tmp = TQDir::homeDirPath();
KviTQString::ensureLastCharIs(tmp,KVI_PATH_SEPARATOR_CHAR);
tmp.append("Desktop");
@ -864,7 +864,7 @@ void KviSetupWizard::makeLink()
"X-KDE-SubstituteUID=false\n";
KviFileUtils::writeFile(tmp,contents,false);
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
}
@ -1010,7 +1010,7 @@ void KviSetupWizard::accept()
symlink(TQTextCodec::codecForLocale()->fromUnicode(g_pApp->m_szGlobalKvircDir).data(),TQTextCodec::codecForLocale()->fromUnicode(localPath).data());
#endif
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
if(m_pCreateDesktopShortcut->isChecked())
makeLink();
#endif

@ -415,17 +415,17 @@ void KviSharedFilesWindow::rightButtonPressed(KviTalListViewItem *it,const TQPoi
tmp += "</nobr><br>";
}
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
tmp += "<nobr>Mime: ";
tmp += KMimeType::findByPath(szFile)->name();
tmp += "</nobr>";
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
TQLabel * l = new TQLabel(tmp,m_pLocalFilePopup);
l->setFrameStyle(TQFrame::Raised | TQFrame::Panel);
m_pLocalFilePopup->insertItem(l);
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
TQString mimetype = KMimeType::findByPath(szFile)->name();
KServiceTypeProfile::OfferList offers = KServiceTypeProfile::offers(mimetype,"Application");
@ -454,7 +454,7 @@ void KviSharedFilesWindow::rightButtonPressed(KviTalListViewItem *it,const TQPoi
m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open folder","filetransferwindow"),this,TQT_SLOT(openLocalFileFolder()));
m_pLocalFilePopup->insertItem(__tr2qs_ctx("Reach in terminal","filetransferwindow"),this,TQT_SLOT(openLocalFileTerminal()));
m_pLocalFilePopup->insertSeparator();
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
m_pLocalFilePopup->insertItem(__tr2qs_ctx("Copy path to clipboard","filetransferwindow"),this,TQT_SLOT(copyLocalFileToClipboard()));
m_pContextPopup->insertItem(__tr2qs_ctx("Local file","filetransferwindow"),m_pLocalFilePopup);
@ -498,7 +498,7 @@ KviSharedFiles * KviSharedFilesWindow::selectedTransfer()
void KviSharedFilesWindow::openFilePopupActivated(int id)
{
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
int ip = m_pOpenFilePopup->itemParameter(id);
if(ip < 0)return;
TQString txt = m_pOpenFilePopup->text(id);
@ -524,12 +524,12 @@ void KviSharedFilesWindow::openFilePopupActivated(int id)
break;
}
}
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
}
void KviSharedFilesWindow::openLocalFileTerminal()
{
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
KviSharedFiles * t = selectedTransfer();
if(!t)return;
TQString tmp = t->localFileName();
@ -543,12 +543,12 @@ void KviSharedFilesWindow::openLocalFileTerminal()
tmp.append("\"");
KRun::runCommand(tmp);
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
}
void KviSharedFilesWindow::openLocalFile()
{
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
KviSharedFiles * t = selectedTransfer();
if(!t)return;
TQString tmp = t->localFileName();
@ -567,12 +567,12 @@ void KviSharedFilesWindow::openLocalFile()
url.setPath(tmp);
lst.append(url);
KRun::run(*offer, lst);
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
}
void KviSharedFilesWindow::openLocalFileWith()
{
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
KviSharedFiles * t = selectedTransfer();
if(!t)return;
TQString tmp = t->localFileName();
@ -583,7 +583,7 @@ void KviSharedFilesWindow::openLocalFileWith()
url.setPath(tmp);
lst.append(url);
KRun::displayOpenWithDialog(lst);
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
}
void KviSharedFilesWindow::copyLocalFileToClipboard()
@ -600,7 +600,7 @@ void KviSharedFilesWindow::copyLocalFileToClipboard()
void KviSharedFilesWindow::openLocalFileFolder()
{
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
KviSharedFiles * t = selectedTransfer();
if(!t)return;
TQString tmp = t->localFileName();
@ -619,7 +619,7 @@ void KviSharedFilesWindow::openLocalFileFolder()
url.setPath(tmp);
lst.append(url);
KRun::run(*offer, lst);
#endif //COMPILE_KDE_SUPPORT
#endif //COMPILE_TDE_SUPPORT
}
void KviSharedFilesWindow::heartbeat()

@ -43,7 +43,7 @@
#include <unistd.h>
#endif
#ifdef COMPILE_KDE_SUPPORT
#ifdef COMPILE_TDE_SUPPORT
#include <dcopclient.h>
#endif