diff options
| author |  Noldor | 2008-05-15 17:35:44 +0000 |
|---|---|---|
| committer | Noldor | 2008-05-15 17:35:44 +0000 |
| commit | b2caa0ba0c49ea8c1909d9929e39727a43448f1c (patch) | |
| tree | 1bd0dadec55ddedba2f0ec01d5566f0fe52d472a /src/modules/spaste | |
| parent | fix (diff) | |
| download | KVIrc-b2caa0ba0c49ea8c1909d9929e39727a43448f1c.tar.gz KVIrc-b2caa0ba0c49ea8c1909d9929e39727a43448f1c.tar.bz2 KVIrc-b2caa0ba0c49ea8c1909d9929e39727a43448f1c.zip | |
QT4 port commit :) (modules) (wip)
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1786 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/spaste')
| -rw-r--r-- | src/modules/spaste/controller.cpp | 8 | ||||
| -rw-r--r-- | src/modules/spaste/libkvispaste.cpp | 8 | ||||
| -rw-r--r-- | src/modules/spaste/spaste_QT4_vc05.vcproj | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/modules/spaste/controller.cpp b/src/modules/spaste/controller.cpp index 438b82938..15a054697 100644 --- a/src/modules/spaste/controller.cpp +++ b/src/modules/spaste/controller.cpp @@ -64,7 +64,7 @@ bool SPasteController::pasteFileInit(QString &fileName) if(m_pClipBuff)return false; // can't paste a file while pasting the clipboard if(m_pFile)return false; // can't paste two files at a time m_pFile = new QFile(fileName); - if(!m_pFile->open(IO_ReadOnly))return false; + if(!m_pFile->open(QIODevice::ReadOnly))return false; connect(m_pTimer,SIGNAL(timeout()),this,SLOT(pasteFile())); m_pTimer->start(KVI_OPTION_UINT(KviOption_uintPasteDelay)); return true; @@ -76,9 +76,9 @@ bool SPasteController::pasteClipboardInit(void) QString tmp(g_pApp->clipboard()->text()); if(m_pClipBuff) { - (*m_pClipBuff) += QStringList::split("\n",tmp,true); + (*m_pClipBuff) += tmp.isEmpty()?QStringList():tmp.split("\n",QString::KeepEmptyParts); } else { - m_pClipBuff = new QStringList(QStringList::split("\n",tmp,true)); + m_pClipBuff = new QStringList(tmp.isEmpty()?QStringList():tmp.split("\n",QString::KeepEmptyParts)); m_clipBuffIterator = m_pClipBuff->begin(); } connect(m_pTimer,SIGNAL(timeout()),this,SLOT(pasteClipboard())); @@ -99,7 +99,7 @@ void SPasteController::pasteClipboard(void) delete this; else { if((*m_clipBuffIterator).isEmpty())(*m_clipBuffIterator) = QChar(KVI_TEXT_RESET); - m_pWindow->ownMessage((*m_clipBuffIterator).ascii()); // <-- not good :/ + m_pWindow->ownMessage((*m_clipBuffIterator).toAscii()); // <-- not good :/ ++m_clipBuffIterator; } } else delete this;//Clipboard finished diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp index 41fcf2023..5e5beb32b 100644 --- a/src/modules/spaste/libkvispaste.cpp +++ b/src/modules/spaste/libkvispaste.cpp @@ -101,15 +101,17 @@ static bool spaste_kvs_cmd_file(KviKvsModuleCommandCall * c) KviWindow * window = spaste_kvs_find_window(szWindow,c); if( (!window) || window->console()->isNotConnected())return false; - - if(szFile.isEmpty() || (!KviFileUtils::fileExists(szFile.ascii()))) + + // FIXME + //if(szFile.isEmpty() || (!KviFileUtils::fileExists(szFile.toAscii()))) + if(szFile.isEmpty() || (!KviFileUtils::fileExists(szFile))) { c->warning(__tr2qs("File not found or empty")); return false; } QFile tmp(szFile); - if(!tmp.open(IO_ReadOnly)) { + if(!tmp.open(QIODevice::ReadOnly)) { c->warning(__tr2qs("I can't open that file")); return false; } diff --git a/src/modules/spaste/spaste_QT4_vc05.vcproj b/src/modules/spaste/spaste_QT4_vc05.vcproj index 8c874b9d6..724003628 100644 --- a/src/modules/spaste/spaste_QT4_vc05.vcproj +++ b/src/modules/spaste/spaste_QT4_vc05.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\file";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvilib\net";"$(ProjectDir)\..\..\kvilib\core\wstring";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\config";"$(SSLINCDIR)";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvirc\uparser\scripttoolbar";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvirc\ui";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SPASTE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SPASTE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
|