diff options
Diffstat (limited to 'src/modules/tip')
| -rw-r--r-- | src/modules/tip/Makefile.am | 2 | ||||
| -rw-r--r-- | src/modules/tip/libkvitip.cpp | 8 | ||||
| -rw-r--r-- | src/modules/tip/libkvitip.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/tip/Makefile.am b/src/modules/tip/Makefile.am index 2a9fbbc..37be4b0 100644 --- a/src/modules/tip/Makefile.am +++ b/src/modules/tip/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvitip.la libkvitip_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvitip_la_SOURCES = libkvitip.cpp -libkvitip_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitip_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvitip.h diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp index 911a3f9..c69992a 100644 --- a/src/modules/tip/libkvitip.cpp +++ b/src/modules/tip/libkvitip.cpp @@ -148,7 +148,7 @@ KviTipWindow::~KviTipWindow() if(m_pConfig)closeConfig(); } -bool KviTipWindow::openConfig(const char * filename,bool bEnsureExists) +bool KviTipWindow::openConfig(const KviStr &filename,bool bEnsureExists) { if(m_pConfig)closeConfig(); @@ -184,13 +184,13 @@ void KviTipWindow::nextTip() KviStr szLocale = KviLocale::localeName(); KviStr szFile; szFile.sprintf("libkvitip_%s.kvc",szLocale.ptr()); - if(!openConfig(szFile.ptr(),true)) + if(!openConfig(szFile,true)) { szLocale.cutFromFirst('.'); szLocale.cutFromFirst('_'); szLocale.cutFromFirst('@'); szFile.sprintf("libkvitip_%s.kvc",szLocale.ptr()); - if(!openConfig(szFile.ptr(),true)) + if(!openConfig(szFile,true)) { openConfig("libkvitip.kvc",false); } @@ -204,7 +204,7 @@ void KviTipWindow::nextTip() KviStr tmp(KviStr::Format,"%u",uNextTip); TQString szTip = m_pConfig->readEntry(tmp.ptr(),__tr2qs("<b>Can't find any tip... :(</b>")); - //tqDebug("REDECODED=%s",szTip.utf8().data()); + //tqDebug("REDECODED=%s",szTip.local8Bit().data()); uNextTip++; if(uNextTip >= uNumTips)uNextTip = 0; diff --git a/src/modules/tip/libkvitip.h b/src/modules/tip/libkvitip.h index a95ccb2..9a361a4 100644 --- a/src/modules/tip/libkvitip.h +++ b/src/modules/tip/libkvitip.h @@ -64,7 +64,7 @@ protected: virtual void showEvent(TQShowEvent *e); virtual void closeEvent(TQCloseEvent *e); public: - bool openConfig(const char * filename,bool bEnsureExists = true); + bool openConfig(const KviStr &filename,bool bEnsureExists = true); void closeConfig(); public slots: void nextTip(); |
